From f3067cd8c88ed0b732ecc1059f6ccacebe80581e Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Fri, 14 Dec 2012 16:17:03 -0500
Subject: [PATCH 001/541] restyling of dashboard with pearson exam
 notifications

---
 lms/static/sass/multicourse/_dashboard.scss | 220 ++++++++------------
 lms/templates/dashboard.html                | 162 +++++++-------
 2 files changed, 176 insertions(+), 206 deletions(-)

diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss
index 458888b658..249e8a0513 100644
--- a/lms/static/sass/multicourse/_dashboard.scss
+++ b/lms/static/sass/multicourse/_dashboard.scss
@@ -267,13 +267,12 @@
     }
 
     .my-course {
-      @include border-radius(3px);
-      @include box-shadow(0 1px 8px 0 rgba(0,0,0, 0.1), inset 0 -1px 0 0 rgba(255,255,255, 0.8), inset 0 1px 0 0 rgba(255,255,255, 0.8));
+      clear: both;
       @include clearfix;
-      height: 120px;
       margin-right: flex-gutter();
-      margin-bottom: 10px;
-      overflow: hidden;
+      margin-bottom: 50px;
+      padding-bottom: 50px;
+      border-bottom: 1px solid $light-gray;
       position: relative;
       width: flex-grid(12);
       z-index: 20;
@@ -283,13 +282,7 @@
         margin-bottom: none;
       }
 
-      .cover {
-        background: rgb(225,225,225);
-        background-size: cover;
-        background-position: center center;
-        border: 1px solid rgb(120,120,120);
-        @include border-left-radius(3px);
-        @include box-shadow(inset 0 0 0 1px rgba(255,255,255, 0.6), 1px 0 0 0 rgba(255,255,255, 0.8));
+      .cover {        
         @include box-sizing(border-box);
         float: left;
         height: 100%;
@@ -299,100 +292,51 @@
         position: relative;
         @include transition(all, 0.15s, linear);
         width: 200px;
+        height: 120px;
 
-        .shade {
-          @include background-image(linear-gradient(-90deg, rgba(255,255,255, 0.3) 0%,
-                                                            rgba(0,0,0, 0.3) 100%));
-          bottom: 0px;
-          content: "";
-          display: block;
-          left: 0px;
-          position: absolute;
-          z-index: 50;
-          top: 0px;
-          @include transition(all, 0.15s, linear);
-          right: 0px;
-        }
-
-        .arrow {
-          position: absolute;
-          z-index: 100;
+        img {
           width: 100%;
-          font-size: 70px;
-          line-height: 110px;
-          text-align: center;
-          text-decoration: none;
-          color: rgba(0, 0, 0, .7);
-          opacity: 0;
-          @include transition(all, 0.15s, linear);
-        }
-
-        &:hover {
-          .shade {
-            background: rgba(255,255,255, 0.3);
-            @include background-image(linear-gradient(-90deg, rgba(255,255,255, 0.3) 0%,
-                                                              rgba(0,0,0, 0.3) 100%));
-          }
         }
       }
 
       .info {
-        background: rgb(250,250,250);
-        @include background-image(linear-gradient(-90deg, rgb(253,253,253), rgb(240,240,240)));
-        @include box-sizing(border-box);
-        border: 1px solid rgb(190,190,190);
-        border-left: none;
-        @include border-right-radius(3px);
-        left: 201px;
-        height: 100%;
-        max-height: 100%;
-        padding: 0px 10px;
-        position: absolute;
-        right: 0px;
-        top: 0px;
-        z-index: 2;
+        @include clearfix;
+        padding: 0 10px 0 230px;
 
         > hgroup {
-          @include clearfix;
-          border-bottom: 1px solid rgb(210,210,210);
-          @include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6));
-          padding: 12px 0px;
+          padding: 0;
           width: 100%;
 
           .university {
-            background: rgba(255,255,255, 1);
-            border: 1px solid rgb(180,180,180);
-            @include border-radius(3px);
-            @include box-shadow(inset 0 0 3px 0 rgba(0,0,0, 0.2), 0 1px 0 0 rgba(255,255,255, 0.6));
             color: $lighter-base-font-color;
-            display: block;
-            font-style: italic;
             font-family: $sans-serif;
             font-size: 16px;
-            font-weight: 800;
-            @include inline-block;
-            margin-right: 10px;
-            margin-bottom: 0;
-            padding: 5px 10px;
-            float: left;
+            font-weight: 400;
+            margin: 0 0 6px;
+            text-transform: none;
+            letter-spacing: 0;
           }
 
-          h3 {
+          .date-block {
+            position: absolute;
+            top: 0;
+            right: 0;
+            font-family: $sans-serif;
+            font-size: 13px;
+            font-style: italic;
+            color: $lighter-base-font-color;
+          }
+
+          h3 a {
             display: block;
-            margin-bottom: 0px;
-            overflow: hidden;
-            padding-top: 2px;
-            text-overflow: ellipsis;
-            white-space: nowrap;
+            margin-bottom: 10px;
+            font-family: $sans-serif;
+            font-size: 34px;
+            line-height: 42px;
+            font-weight: 300;
 
-            a {
-              color: $base-font-color;
-              font-weight: 700;
-              text-shadow: 0 1px rgba(255,255,255, 0.6);
-
-              &:hover {
-                text-decoration: underline;
-              }
+            &:hover {
+              text-decoration: none;
             }
           }
         }
@@ -430,71 +374,52 @@
         }
 
         .enter-course {
-          @include button(shiny, $blue);
+          @include button(simple, $blue);
           @include box-sizing(border-box);
           @include border-radius(3px);
           display: block;
           float: left;
-          font: normal 1rem/1.6rem $sans-serif;
-          letter-spacing: 1px;
-          padding: 6px 0px;
-          text-transform: uppercase;
+          font: normal 15px/1.6rem $sans-serif;
+          letter-spacing: 0;
+          padding: 6px 32px 7px;
           text-align: center;
           margin-top: 16px;
-          width: flex-grid(4);
-        }
-      }
 
-      > a:hover {
-        .cover {
-          .shade {
-            background: rgba(255,255,255, 0.1);
-            @include background-image(linear-gradient(-90deg, rgba(255,255,255, 0.3) 0%,
-            rgba(0,0,0, 0.3) 100%));
+          &.archived {
+            @include button(simple, #eee);
+            font: normal 15px/1.6rem $sans-serif;
+            padding: 6px 32px 7px;
+
+            &:hover {
+              text-decoration: none;
+            }
           }
 
-          .arrow {
-            opacity: 1;
-          }
-        }
-
-        .info {
-          background: darken(rgb(250,250,250), 5%);
-          @include background-image(linear-gradient(-90deg, darken(rgb(253,253,253), 3%), darken(rgb(240,240,240), 5%)));
-          border-color: darken(rgb(190,190,190), 10%);
-
-          .course-status {
-            background: darken($yellow, 3%);
-            border-color: darken(rgb(200,200,200), 3%);
-            @include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6));
-          }
-
-          .course-status-completed {
-            background: #888;
-            color: #fff;
+          &:hover {
+            text-decoration: none;
           }
         }
       }
     }
 
     .message-status {
+      @include clearfix;
       @include border-radius(3px);
-      @include box-shadow(0 1px 4px 0 rgba(0,0,0, 0.1), inset 0 -1px 0 0 rgba(255,255,255, 0.8), inset 0 1px 0 0 rgba(255,255,255, 0.8));
       display: none;
-      position: relative;
-      top: -15px;
       z-index: 10;
-      margin: 0 0 20px 0;
+      margin: 20px 0 10px;
       padding: 15px 20px;
-      font-family: "Open Sans", Verdana, Geneva, sans-serif;
+      font-family: $sans-serif;
       background: #fffcf0;
       border: 1px solid #ccc;
 
       .message-copy {
+        font-family: $sans-serif;
+        font-size: 13px;
         margin: 0;
 
         .grade-value {
-          font-size: 1.4rem;
+          font-size: 1.2rem;
           font-weight: bold;
         }
       }
@@ -502,19 +427,18 @@
       .actions {
          @include clearfix;
         list-style: none;
-        margin: 15px 0 0 0;
+        margin: 0;
         padding: 0;
 
         .action {
           float: left;
-          margin:0 15px 10px 0;
+          margin: 0 15px 0 0;
 
           .btn, .cta {
             display: inline-block;
           }
 
           .btn {
-            @include button(shiny, $blue);
             @include box-sizing(border-box);
             @include border-radius(3px);
             float: left;
@@ -524,7 +448,6 @@
             text-align: center;
 
             &.disabled {
-              @include button(shiny, #eee);
               cursor: default !important;
 
               &:hover {
@@ -539,7 +462,6 @@
           }
 
           .cta {
-            @include button(shiny, #666);
             float: left;
             font: normal 0.8rem/1.2rem $sans-serif;
             letter-spacing: 1px;
@@ -549,6 +471,35 @@
         }
       }
 
+      .exam-registration-number {
+        font-family: $sans-serif;
+        font-size: 18px;
+      }
+
+      &.exam-register {
+        .message-copy {
+          margin-top: 5px;
+        }
+      }
+
+      &.exam-schedule {
+        .exam-button {
+          margin-top: 5px;
+        }
+      }
+
+      .exam-button {
+        @include button(simple, $pink);
+        float: right;
+        padding: 9px 18px 10px;
+        font-size: 13px;
+        font-weight: 400;
+
+        &:hover {
+          text-decoration: none;
+        }
+      }
+
       &.is-shown {
         display: block;
       }
@@ -577,17 +528,16 @@
 
     a.unenroll {
       float: right;
+      display: block;
       font-style: italic;
       color: #a0a0a0;
       text-decoration: underline;
       font-size: .8em;
-      @include inline-block;
-      margin-bottom: 40px;
+      margin-top: 32px;
 
       &:hover {
         color: #333;
       }
     }
-
   }
 }
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index d9b57ac044..0c920afbed 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -198,87 +198,107 @@
             course_target = reverse('about_course', args=[course.id])
           %>
 
-          <a href="${course_target}">
-            <section class="cover" style="background-image: url('${course_image_url(course)}')">
-              <div class="shade"></div>
-              <div class="arrow">&#10095;</div>
-            </section>
 
-            <section class="info">
-              <hgroup>
-                <h2 class="university">${get_course_about_section(course, 'university')}</h2>
-                <h3>${course.number} ${course.title}</h3>
-              </hgroup>
-              <section class="course-status course-status-completed">
-              <p>
+          
+          <a href="${course_target}" class="cover">
+            <img src="${course_image_url(course)}" />
+          </a>
+
+          <section class="info">
+            <hgroup>
+              <p class="date-block">
               % if course.has_ended():
-              Course Completed - <span>${course.end_date_text}</span>
+              Course Completed - ${course.end_date_text}
               % elif course.has_started():
-              Course Started - <span>${course.start_date_text}</span>
+              Course Started - ${course.start_date_text}
               % else:   # hasn't started yet
-              Course Starts - <span>${course.start_date_text}</span>
+              Course Starts - ${course.start_date_text}
               % endif
               </p>
-              </section>
-              % if course.id in show_courseware_links_for:
-                <p class="enter-course">View Courseware</p>
-              % endif
-            </section>
-          </a>
-        </article>
+              <h2 class="university">${get_course_about_section(course, 'university')}</h2>
+              <h3><a href="${course_target}">${course.number} ${course.title}</a></h3>
+            </hgroup>
 
-        <%
-        cert_status = cert_statuses.get(course.id)
-        %>
-        % if course.has_ended() and cert_status:
-            <%
-            if cert_status['status'] == 'generating':
-                status_css_class = 'course-status-certrendering'
-            elif cert_status['status'] == 'ready':
-                status_css_class = 'course-status-certavailable'
-            elif cert_status['status'] == 'notpassing':
-                status_css_class = 'course-status-certnotavailable'
-            else:
-                status_css_class = 'course-status-processing'
-            %>
-            <div class="message message-status ${status_css_class} is-shown">
-
-            % if cert_status['status'] == 'processing':
-                  <p class="message-copy">Final course details are being wrapped up at
-                  this time. Your final standing will be available shortly.</p>
-            % elif cert_status['status'] in ('generating', 'ready', 'notpassing'):
-                  <p class="message-copy">Your final grade:
-                  <span class="grade-value">${"{0:.0f}%".format(float(cert_status['grade'])*100)}</span>.
-                  % if cert_status['status'] == 'notpassing':
-                     Grade required for a certificate: <span class="grade-value">
-                       ${"{0:.0f}%".format(float(course.lowest_passing_grade)*100)}</span>.
-                  % endif
-                  </p>
-            % endif
-
-            % if cert_status['show_disabled_download_button'] or cert_status['show_download_url'] or cert_status['show_survey_button']:
-              <ul class="actions">
-                % if cert_status['show_disabled_download_button']:
-                  <li class="action"><span class="btn disabled" href="">
-                      Your Certificate is Generating</span></li>
-                % elif cert_status['show_download_url']:
-                  <li class="action">
-                  <a class="btn" href="${cert_status['download_url']}"
-                     title="This link will open/download a PDF document">
-                     Download Your PDF Certificate</a></li>
-                % endif
-
-                % if cert_status['show_survey_button']:
-                  <li class="action"><a class="cta" href="${cert_status['survey_url']}">
-                         Complete our course feedback survey</a></li>
-                % endif
-              </ul>
-            % endif
+            <div class="message message-status is-shown exam-register">
+              <a href="#" class="exam-button">Register for Pearson exam</a>
+              <p class="message-copy">Registration for the Pearson exam is now open.</p>
             </div>
 
-        % endif
+            <div class="message message-status is-shown">
+              <p class="message-copy">Your registration for the Pearson exam is pending. Within a few days, you should receive a confirmation number, which can be used to schedule your exam.</p>
+            </div>
 
-        <a href="#unenroll-modal" class="unenroll" rel="leanModal" data-course-id="${course.id}" data-course-number="${course.number}">Unregister</a>
+            <div class="message message-status is-shown exam-schedule">
+              <a href="#" class="exam-button">Schedule Pearson exam</a>
+              <p class="exam-registration-number">Registration number: <strong>edx00015879548</strong></p>
+              <p class="message-copy">Write this down! You’ll need it to schedule your exam.</p>
+            </div>
+
+            
+
+            <%
+            cert_status = cert_statuses.get(course.id)
+            %>
+            % if course.has_ended() and cert_status:
+                <%
+                if cert_status['status'] == 'generating':
+                    status_css_class = 'course-status-certrendering'
+                elif cert_status['status'] == 'ready':
+                    status_css_class = 'course-status-certavailable'
+                elif cert_status['status'] == 'notpassing':
+                    status_css_class = 'course-status-certnotavailable'
+                else:
+                    status_css_class = 'course-status-processing'
+                %>
+                <div class="message message-status ${status_css_class} is-shown">
+
+                % if cert_status['status'] == 'processing':
+                      <p class="message-copy">Final course details are being wrapped up at
+                      this time. Your final standing will be available shortly.</p>
+                % elif cert_status['status'] in ('generating', 'ready', 'notpassing'):
+                      <p class="message-copy">Your final grade:
+                      <span class="grade-value">${"{0:.0f}%".format(float(cert_status['grade'])*100)}</span>.
+                      % if cert_status['status'] == 'notpassing':
+                         Grade required for a certificate: <span class="grade-value">
+                           ${"{0:.0f}%".format(float(course.lowest_passing_grade)*100)}</span>.
+                      % endif
+                      </p>
+                % endif
+
+                % if cert_status['show_disabled_download_button'] or cert_status['show_download_url'] or cert_status['show_survey_button']:
+                  <ul class="actions">
+                    % if cert_status['show_disabled_download_button']:
+                      <li class="action"><span class="disabled">
+                          Your Certificate is Generating</span></li>
+                    % elif cert_status['show_download_url']:
+                      <li class="action">
+                      <a class="btn" href="${cert_status['download_url']}"
+                         title="This link will open/download a PDF document">
+                         Download Your PDF Certificate</a></li>
+                    % endif
+
+                    % if cert_status['show_survey_button']:
+                      <li class="action"><a class="cta" href="${cert_status['survey_url']}">
+                             Complete our course feedback survey</a></li>
+                    % endif
+                  </ul>
+                % endif
+                </div>
+
+            % endif
+
+            % if course.id in show_courseware_links_for:
+              % if course.has_ended():
+                <a href="${course_target}" class="enter-course archived">View Archived Course</a>
+              % else:
+                <a href="${course_target}" class="enter-course">View Course</a>
+              % endif              
+            % endif
+            <a href="#unenroll-modal" class="unenroll" rel="leanModal" data-course-id="${course.id}" data-course-number="${course.number}">Unregister</a>
+          </section>
+        </article>
+
+        
 
       % endfor
     % else:

From b2117c1194b7a19c023a68ee1242876fd10639d6 Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Mon, 17 Dec 2012 17:59:44 -0500
Subject: [PATCH 002/541] first dialogs

---
 lms/templates/dashboard.html                  |   3 +-
 lms/templates/test_center_register_modal.html | 105 ++++++++++++++++++
 2 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 lms/templates/test_center_register_modal.html

diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index 0c920afbed..85106ee1c2 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -219,8 +219,9 @@
               <h3><a href="${course_target}">${course.number} ${course.title}</a></h3>
             </hgroup>
 
+	    <!-- TODO: need to add logic to select which of the following to display.  Like certs? -->
             <div class="message message-status is-shown exam-register">
-              <a href="#" class="exam-button">Register for Pearson exam</a>
+              <a href="#exam_register" rel="leanModal" class="exam-button" id="exam_register_button">Register for Pearson exam</a>
               <p class="message-copy">Registration for the Pearson exam is now open.</p>
             </div>
 
diff --git a/lms/templates/test_center_register_modal.html b/lms/templates/test_center_register_modal.html
new file mode 100644
index 0000000000..84db6dd09b
--- /dev/null
+++ b/lms/templates/test_center_register_modal.html
@@ -0,0 +1,105 @@
+<%namespace name='static' file='static_content.html'/>
+<%! from django.core.urlresolvers import reverse %>
+<%! from django_countries.countries import COUNTRIES %>
+<%! from student.models import UserProfile %>
+<%! from datetime import date %>
+<%! import calendar %>
+
+<section id="testcenter-register-modal" class="modal testcenter-register-modal">
+  <div class="inner-wrapper">
+    <div id="register">
+      <header>
+        <h2>Sign Up for Pearson VUE Test Center Proctoring</h2>
+        <hr>
+      </header>
+
+      <form id="test_register_form" class="test_register_form" method="post" data-remote="true" action="/create_test_registration">
+        <div class="notice"></div>
+        <div id="register_error" class="modal-form-error" name="register_error"></div>
+        <div id="register_error" name="register_error"></div>
+
+	<!-- we should first start with information that we already know about the user,
+	     though we should also give them the option to fix it. 
+	     Some things don't change, once assigned, like client_candidate_id
+	     or candidate_id. 
+	  -->
+        <div class="input-group">
+          <label data-field="firstname">First Name*</label>
+          <input name="firstname" type="text" value="${firstname}" placeholder="e.g. Jane">
+          <label data-field="lastname">Last Name*</label>
+          <input name="lastname" type="text" value="${lastname}" placeholder="e.g. Smith">
+          <label data-field="middlename">Middle Name</label>
+          <input name="middlename" type="text" value="${middlename}" placeholder="e.g. Michael">
+          <label data-field="suffix">Suffix</label>
+          <input name="suffix" type="text" value="${suffix}" placeholder="e.g. Jr.">
+          <label data-field="salutation">Salutation</label>
+          <input name="salutation" type="text" value="${salutation}" placeholder="e.g. Dr.">
+        </div>
+
+        <div class="input-group">
+          <label data-field="address1">Address1*</label>
+          <input name="address1" type="text" value="${address1}" placeholder="123 Main St.">
+          <label data-field="address2">Address2</label>
+          <input name="address2" type="text" value="${address2}" placeholder="Apartment 2B.">
+          <label data-field="address3">Address3</label>
+          <input name="address3" type="text" value="${address3}" placeholder="Attention: John Smith">
+
+          <label data-field="city">City</label>
+          <input name="city" type="text" value="${city}" placeholder="Our Fair City">
+          <label data-field="state">State/Province</label>
+          <input name="state" type="text" value="${state}" placeholder="MA">
+          <label data-field="postal_code">Postal Code</label>
+          <input name="postal_code" type="text" value="${postal_code}" placeholder="02138">
+          <label data-field="country">Country Code*</label>
+          <input name="country" type="text" value="${country}" placeholder="USA">
+        </div>
+
+	<!-- for now, just leave off the phone and company information -->
+        <div class="input-group">
+          <label data-field="phone">Phone*</label>
+          <input name="phone" type="text" value="${phone}" placeholder="1-23-456-7890">
+          <label data-field="phone">Extension</label>
+          <input name="extension" type="text" value="${extension}" placeholder="x123">
+          <label data-field="phone-country">Phone Country Code*</label>
+          <input name="phone-country" type="text" value="${phone_country}" placeholder="ABC">
+          <label data-field="fax">Fax</label>
+          <input name="fax" type="text" value="${fax}" placeholder="1-23-456-7891">
+          <label data-field="fax-country">Fax Country Code*</label>
+          <input name="fax-country" type="text" value="${fax_country}" placeholder="ABC">
+          <label data-field="company">Company</label>
+          <input name="company" type="text" value="${company}" placeholder="Acme Corporation">
+        </div>
+
+        <div class="input-group">
+          <label data-field="accommodations">Accommodations Requested</label>
+          <textarea name="accommodations"></textarea>
+        </div>
+
+        <div class="submit">
+          <input name="submit" type="submit" value="Register for Test">
+        </div>
+      </form>
+
+    </div>
+
+    <div class="close-modal">
+      <div class="inner">
+        <p>&#10005;</p>
+      </div>
+    </div>
+  </div>
+</section>
+
+<script type="text/javascript">
+  (function() {
+   $(document).delegate('#test_register_form', 'ajax:success', function(data, json, xhr) {
+     if(json.success) {
+       location.href="${reverse('dashboard')}";
+     } else {
+       $(".field-error").removeClass('field-error');
+       $('#register_error').html(json.value).stop().css("display", "block");
+       $("[data-field='"+json.field+"']").addClass('field-error')
+     }
+    });
+  })(this)
+</script>

From c7d379beb672b57293e62b11fe7031c2049d09d9 Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Tue, 18 Dec 2012 03:20:02 -0500
Subject: [PATCH 003/541] add first pass at wiring test registration dialog

---
 common/djangoapps/student/views.py            | 90 ++++++++++++++++++-
 lms/templates/dashboard.html                  |  3 +-
 lms/templates/test_center_register_modal.html | 58 ++++++------
 lms/urls.py                                   |  2 +
 4 files changed, 123 insertions(+), 30 deletions(-)

diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 44877ef597..ad2f810b1f 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -26,7 +26,7 @@ from bs4 import BeautifulSoup
 from django.core.cache import cache
 
 from django_future.csrf import ensure_csrf_cookie, csrf_exempt
-from student.models import (Registration, UserProfile,
+from student.models import (Registration, UserProfile, TestCenterUser,
                             PendingNameChange, PendingEmailChange,
                             CourseEnrollment, unique_id_for_user)
 
@@ -205,6 +205,14 @@ def dashboard(request):
     user = request.user
     enrollments = CourseEnrollment.objects.filter(user=user)
 
+    # we want to populate the registration page with the relevant information,
+    # if it already exists.  Create an empty object otherwise.
+    try:
+        testcenteruser = TestCenterUser.objects.get(user=user)
+    except TestCenterUser.DoesNotExist:
+        testcenteruser = TestCenterUser()
+        testcenteruser.user = user
+    
     # Build our courses list for the user, but ignore any courses that no longer
     # exist (because the course IDs have changed). Still, we don't delete those
     # enrollments, because it could have been a data push snafu.
@@ -244,6 +252,7 @@ def dashboard(request):
                'show_courseware_links_for' : show_courseware_links_for,
                'cert_statuses': cert_statuses,
                'news': top_news,
+               'testcenteruser': testcenteruser,
                }
 
     return render_to_response('dashboard.html', context)
@@ -586,6 +595,83 @@ def create_account(request, post_override=None):
     js = {'success': True}
     return HttpResponse(json.dumps(js), mimetype="application/json")
 
+@ensure_csrf_cookie
+def create_test_registration(request, post_override=None):
+    '''
+    JSON call to create test registration.
+    Used by form in test_center_register_modal.html, which is included 
+    into dashboard.html
+    '''
+    js = {'success': False}
+
+    post_vars = post_override if post_override else request.POST
+
+    # Confirm we have a properly formed request
+    for a in ['first_name', 'last_name', 'address_1', 'city', 'country']:
+        if a not in post_vars:
+            js['value'] = "Error (401 {field}). E-mail us.".format(field=a)
+            js['field'] = a
+            return HttpResponse(json.dumps(js))
+
+    # Confirm appropriate fields are there.
+    for a in ['first_name', 'last_name', 'address_1', 'city', 'country']:
+        if len(post_vars[a]) < 2:
+            error_str = {'first_name': 'First name must be minimum of two characters long.',
+                         'last_name': 'Last name must be minimum of two characters long.',
+                         'address_1': 'Last name must be minimum of two characters long.',
+                         'city': 'Last name must be minimum of two characters long.',
+                         'country': 'Last name must be minimum of two characters long.',
+                         }
+            js['value'] = error_str[a]
+            js['field'] = a
+            return HttpResponse(json.dumps(js))
+
+    # Once the test_center_user information has been validated, create the entries:
+    ret = _do_create_or_update_test_center_user(post_vars)
+    if isinstance(ret,HttpResponse):		# if there was an error then return that
+        return ret
+
+
+    (user, profile, testcenter_user, testcenter_registration) = ret
+
+
+    # only do the following if there is accommodation text to send,
+    # and a destination to which to send it:
+    if 'accommodation' in post_vars and settings.MITX_FEATURES.get('ACCOMMODATION_EMAIL'):
+        d = {'accommodation': post_vars['accommodation']
+             }
+        
+        # composes accommodation email
+        subject = render_to_string('emails/accommodation_email_subject.txt', d)
+        # Email subject *must not* contain newlines
+        subject = ''.join(subject.splitlines())
+        message = render_to_string('emails/accommodation_email.txt', d)
+
+        # skip if destination email address is not specified
+        try:
+            dest_addr = settings.MITX_FEATURES['ACCOMMODATION_EMAIL']
+            send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [dest_addr], fail_silently=False)
+        except:
+            log.exception(sys.exc_info())
+            js['value'] = 'Could not send accommodation e-mail.'
+            return HttpResponse(json.dumps(js))
+
+
+    if DoExternalAuth:
+        eamap.user = login_user
+        eamap.dtsignup = datetime.datetime.now()
+        eamap.save()
+        log.debug('Updated ExternalAuthMap for %s to be %s' % (post_vars['username'],eamap))
+
+        if settings.MITX_FEATURES.get('BYPASS_ACTIVATION_EMAIL_FOR_EXTAUTH'):
+            log.debug('bypassing activation email')
+            login_user.is_active = True
+            login_user.save()
+
+    # statsd.increment("common.student.account_created")
+
+    js = {'success': True}
+    return HttpResponse(json.dumps(js), mimetype="application/json")
 
 def get_random_post_override():
     """
@@ -641,7 +727,7 @@ def password_reset(request):
 
     # By default, Django doesn't allow Users with is_active = False to reset their passwords,
     # but this bites people who signed up a long time ago, never activated, and forgot their
-    # password. So for their sake, we'll auto-activate a user for whome password_reset is called.
+    # password. So for their sake, we'll auto-activate a user for whom password_reset is called.
     try:
         user = User.objects.get(email=request.POST['email'])
         user.is_active = True
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index 85106ee1c2..f8e4b2ab57 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -7,6 +7,7 @@
 <%inherit file="main.html" />
 
 <%namespace name='static' file='static_content.html'/>
+<%include file="test_center_register_modal.html" />
 
 <%block name="title"><title>Dashboard</title></%block>
 
@@ -221,7 +222,7 @@
 
 	    <!-- TODO: need to add logic to select which of the following to display.  Like certs? -->
             <div class="message message-status is-shown exam-register">
-              <a href="#exam_register" rel="leanModal" class="exam-button" id="exam_register_button">Register for Pearson exam</a>
+              <a href="#testcenter-register-modal" rel="leanModal" class="exam-button" id="exam_register_button">Register for Pearson exam</a>
               <p class="message-copy">Registration for the Pearson exam is now open.</p>
             </div>
 
diff --git a/lms/templates/test_center_register_modal.html b/lms/templates/test_center_register_modal.html
index 84db6dd09b..5638d4750b 100644
--- a/lms/templates/test_center_register_modal.html
+++ b/lms/templates/test_center_register_modal.html
@@ -17,6 +17,10 @@
         <div class="notice"></div>
         <div id="register_error" class="modal-form-error" name="register_error"></div>
         <div id="register_error" name="register_error"></div>
+	<!-- include these as pass-throughs -->
+        <input id="id_email" type="hidden" name="email" maxlength="75" value="${user.email}" />
+        <input id="id_username" type="hidden" name="username" maxlength="75" value="${user.username}" />
+	<!-- TODO: add the course somehow... -->
 
 	<!-- we should first start with information that we already know about the user,
 	     though we should also give them the option to fix it. 
@@ -24,50 +28,50 @@
 	     or candidate_id. 
 	  -->
         <div class="input-group">
-          <label data-field="firstname">First Name*</label>
-          <input name="firstname" type="text" value="${firstname}" placeholder="e.g. Jane">
-          <label data-field="lastname">Last Name*</label>
-          <input name="lastname" type="text" value="${lastname}" placeholder="e.g. Smith">
-          <label data-field="middlename">Middle Name</label>
-          <input name="middlename" type="text" value="${middlename}" placeholder="e.g. Michael">
+          <label data-field="first_name">First Name*</label>
+          <input name="first_name" type="text" value="${testcenteruser.first_name}" maxlength="30" placeholder="e.g. Jane">
+          <label data-field="last_name">Last Name*</label>
+          <input name="last_name" type="text" value="${testcenteruser.last_name}" placeholder="e.g. Smith">
+          <label data-field="middle_name">Middle Name</label>
+          <input name="middle_name" type="text" value="${testcenteruser.middle_name}" placeholder="e.g. Michael">
           <label data-field="suffix">Suffix</label>
-          <input name="suffix" type="text" value="${suffix}" placeholder="e.g. Jr.">
+          <input name="suffix" type="text" value="${testcenteruser.suffix}" placeholder="e.g. Jr.">
           <label data-field="salutation">Salutation</label>
-          <input name="salutation" type="text" value="${salutation}" placeholder="e.g. Dr.">
+          <input name="salutation" type="text" value="${testcenteruser.salutation}" placeholder="e.g. Dr.">
         </div>
 
         <div class="input-group">
-          <label data-field="address1">Address1*</label>
-          <input name="address1" type="text" value="${address1}" placeholder="123 Main St.">
-          <label data-field="address2">Address2</label>
-          <input name="address2" type="text" value="${address2}" placeholder="Apartment 2B.">
-          <label data-field="address3">Address3</label>
-          <input name="address3" type="text" value="${address3}" placeholder="Attention: John Smith">
+          <label data-field="address_1">Address1*</label>
+          <input name="address_1" type="text" value="${testcenteruser.address_1}" placeholder="123 Main St.">
+          <label data-field="address_2">Address2</label>
+          <input name="address_2" type="text" value="${testcenteruser.address_2}" placeholder="Apartment 2B.">
+          <label data-field="address_3">Address3</label>
+          <input name="address_3" type="text" value="${testcenteruser.address_3}" placeholder="Attention: John Smith">
 
           <label data-field="city">City</label>
-          <input name="city" type="text" value="${city}" placeholder="Our Fair City">
+          <input name="city" type="text" value="${testcenteruser.city}" placeholder="Our Fair City">
           <label data-field="state">State/Province</label>
-          <input name="state" type="text" value="${state}" placeholder="MA">
+          <input name="state" type="text" value="${testcenteruser.state}" placeholder="MA">
           <label data-field="postal_code">Postal Code</label>
-          <input name="postal_code" type="text" value="${postal_code}" placeholder="02138">
+          <input name="postal_code" type="text" value="${testcenteruser.postal_code}" placeholder="02138">
           <label data-field="country">Country Code*</label>
-          <input name="country" type="text" value="${country}" placeholder="USA">
+          <input name="country" type="text" value="${testcenteruser.country}" placeholder="USA">
         </div>
 
 	<!-- for now, just leave off the phone and company information -->
         <div class="input-group">
           <label data-field="phone">Phone*</label>
-          <input name="phone" type="text" value="${phone}" placeholder="1-23-456-7890">
+          <input name="phone" type="text" value="${testcenteruser.phone}" placeholder="1-23-456-7890">
           <label data-field="phone">Extension</label>
-          <input name="extension" type="text" value="${extension}" placeholder="x123">
-          <label data-field="phone-country">Phone Country Code*</label>
-          <input name="phone-country" type="text" value="${phone_country}" placeholder="ABC">
+          <input name="extension" type="text" value="${testcenteruser.extension}" placeholder="x123">
+          <label data-field="phone_country_code">Phone Country Code*</label>
+          <input name="phone_country_code" type="text" value="${testcenteruser.phone_country_code}" placeholder="ABC">
           <label data-field="fax">Fax</label>
-          <input name="fax" type="text" value="${fax}" placeholder="1-23-456-7891">
-          <label data-field="fax-country">Fax Country Code*</label>
-          <input name="fax-country" type="text" value="${fax_country}" placeholder="ABC">
-          <label data-field="company">Company</label>
-          <input name="company" type="text" value="${company}" placeholder="Acme Corporation">
+          <input name="fax" type="text" value="${testcenteruser.fax}" placeholder="1-23-456-7891">
+          <label data-field="fax_country_code">Fax Country Code*</label>
+          <input name="fax_country_code" type="text" value="${testcenteruser.fax_country_code}" placeholder="ABC">
+          <label data-field="company_name">Company</label>
+          <input name="company_name" type="text" value="${testcenteruser.company_name}" placeholder="Acme Corporation">
         </div>
 
         <div class="input-group">
diff --git a/lms/urls.py b/lms/urls.py
index 0a76907380..97f4613b8f 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -43,6 +43,8 @@ urlpatterns = ('',
     url(r'^create_account$', 'student.views.create_account'),
     url(r'^activate/(?P<key>[^/]*)$', 'student.views.activate_account', name="activate"),
 
+    url(r'^create_test_registration$', 'student.views.create_test_registration'),
+
     url(r'^password_reset/$', 'student.views.password_reset', name='password_reset'),
     ## Obsolete Django views for password resets
     ## TODO: Replace with Mako-ized views

From bc40a7f12719b8a2d6d7164bb8087d2a1ec584be Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Tue, 18 Dec 2012 16:16:55 -0500
Subject: [PATCH 004/541] make test-reg dialog non-modal, and pass course_id in
 URL.  Add to course info.

---
 common/djangoapps/student/views.py          |  88 +++++++++-
 common/lib/xmodule/xmodule/course_module.py |  12 ++
 lms/templates/dashboard.html                |  36 ++--
 lms/templates/test_center_register.html     | 179 ++++++++++++++++++++
 lms/urls.py                                 |   1 +
 5 files changed, 301 insertions(+), 15 deletions(-)
 create mode 100644 lms/templates/test_center_register.html

diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index ad2f810b1f..52fcbb0152 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -304,7 +304,7 @@ def change_enrollment(request):
         try:
             course = course_from_id(course_id)
         except ItemNotFoundError:
-            log.warning("User {0} tried to enroll in non-existant course {1}"
+            log.warning("User {0} tried to enroll in non-existent course {1}"
                       .format(user.username, enrollment.course_id))
             return {'success': False, 'error': 'The course requested does not exist.'}
 
@@ -595,6 +595,92 @@ def create_account(request, post_override=None):
     js = {'success': True}
     return HttpResponse(json.dumps(js), mimetype="application/json")
 
+@login_required
+@ensure_csrf_cookie
+def begin_test_registration(request, course_id):
+    user = request.user    
+    
+    # we want to populate the registration page with the relevant information,
+    # if it already exists.  Create an empty object otherwise.
+    try:
+        testcenteruser = TestCenterUser.objects.get(user=user)
+    except TestCenterUser.DoesNotExist:
+        testcenteruser = TestCenterUser()
+        testcenteruser.user = user
+    
+    try:
+        course = (course_from_id(course_id))
+    except ItemNotFoundError:
+        log.error("User {0} enrolled in non-existent course {1}"
+                      .format(user.username, course_id))
+
+    # placeholder for possible messages...
+    message = ""
+    if not user.is_active:
+        message = render_to_string('registration/activate_account_notice.html', {'email': user.email})
+
+    context = {'course': course,
+               'user': user,
+               'message': message,
+               'testcenteruser': testcenteruser,
+               }
+
+    return render_to_response('test_center_register.html', context)
+
+
+def _do_create_or_update_test_center_user(post_vars):
+    """
+    Given cleaned post variables, create the TestCenterUser and UserProfile objects, as well as the
+    registration for this user.
+
+    Returns a tuple (User, UserProfile, TestCenterUser).
+
+    Note: this function is also used for creating test users.
+    """
+    user = User(username=post_vars['username'],
+             email=post_vars['email'],
+             is_active=False)
+    user.set_password(post_vars['password'])
+    registration = Registration()
+    # TODO: Rearrange so that if part of the process fails, the whole process fails.
+    # Right now, we can have e.g. no registration e-mail sent out and a zombie account
+    try:
+        user.save()
+    except IntegrityError:
+        js = {'success': False}
+        # Figure out the cause of the integrity error
+        if len(User.objects.filter(username=post_vars['username'])) > 0:
+            js['value'] = "An account with this username already exists."
+            js['field'] = 'username'
+            return HttpResponse(json.dumps(js))
+
+        if len(User.objects.filter(email=post_vars['email'])) > 0:
+            js['value'] = "An account with this e-mail already exists."
+            js['field'] = 'email'
+            return HttpResponse(json.dumps(js))
+
+        raise
+
+    registration.register(user)
+
+    profile = UserProfile(user=user)
+    profile.name = post_vars['name']
+    profile.level_of_education = post_vars.get('level_of_education')
+    profile.gender = post_vars.get('gender')
+    profile.mailing_address = post_vars.get('mailing_address')
+    profile.goals = post_vars.get('goals')
+
+    try:
+        profile.year_of_birth = int(post_vars['year_of_birth'])
+    except (ValueError, KeyError):
+        profile.year_of_birth = None  # If they give us garbage, just ignore it instead
+                                # of asking them to put an integer.
+    try:
+        profile.save()
+    except Exception:
+        log.exception("UserProfile creation failed for user {0}.".format(user.id))
+    return (user, profile, registration)
+
 @ensure_csrf_cookie
 def create_test_registration(request, post_override=None):
     '''
diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py
index 3506c72bd7..a4cf87b333 100644
--- a/common/lib/xmodule/xmodule/course_module.py
+++ b/common/lib/xmodule/xmodule/course_module.py
@@ -316,6 +316,18 @@ class CourseDescriptor(SequenceDescriptor):
         """
         return self.metadata.get('end_of_course_survey_url')
 
+    @property
+    def testcenter_info(self):
+        """
+        Pull from policy.
+        
+        TODO: decide if we expect this entry to be a single test, or if multiple tests are possible
+        per course.
+
+        Returns None if no testcenter info specified.
+        """
+        return self.metadata.get('testcenter_info')
+    
     @property
     def title(self):
         return self.display_name
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index f8e4b2ab57..f771f3e098 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -7,7 +7,6 @@
 <%inherit file="main.html" />
 
 <%namespace name='static' file='static_content.html'/>
-<%include file="test_center_register_modal.html" />
 
 <%block name="title"><title>Dashboard</title></%block>
 
@@ -221,22 +220,31 @@
             </hgroup>
 
 	    <!-- TODO: need to add logic to select which of the following to display.  Like certs? -->
-            <div class="message message-status is-shown exam-register">
-              <a href="#testcenter-register-modal" rel="leanModal" class="exam-button" id="exam_register_button">Register for Pearson exam</a>
-              <p class="message-copy">Registration for the Pearson exam is now open.</p>
-            </div>
+            <%
+            testcenter_info = course.testcenter_info
+            %>
+            % if testcenter_info is not None:
+	    
+	           <% 
+	               testcenter_register_target = reverse('begin_test_registration', args=[course.id])
+               %>
+                <div class="message message-status is-shown exam-register">
+<!--                  <a href="#testcenter-register-modal" rel="leanModal" class="exam-button" data-course-id="${course.id}" data-course-number="${course.number}" id="exam_register_button">Register for Pearson exam</a>
+-->                  <a href="${testcenter_register_target}" class="exam-button" id="exam_register_button">Register for Pearson exam</a>
+                      <p class="message-copy">Registration for the Pearson exam is now open.</p>
+                </div>
 
-            <div class="message message-status is-shown">
-              <p class="message-copy">Your registration for the Pearson exam is pending. Within a few days, you should receive a confirmation number, which can be used to schedule your exam.</p>
-            </div>
+                <div class="message message-status is-shown">
+                  <p class="message-copy">Your registration for the Pearson exam is pending. Within a few days, you should receive a confirmation number, which can be used to schedule your exam.</p>
+                </div>
 
-            <div class="message message-status is-shown exam-schedule">
-              <a href="#" class="exam-button">Schedule Pearson exam</a>
-              <p class="exam-registration-number">Registration number: <strong>edx00015879548</strong></p>
-              <p class="message-copy">Write this down! You’ll need it to schedule your exam.</p>
-            </div>
+                <div class="message message-status is-shown exam-schedule">
+                   <a href="#" class="exam-button">Schedule Pearson exam</a>
+                   <p class="exam-registration-number">Registration number: <strong>edx00015879548</strong></p>
+                   <p class="message-copy">Write this down! You’ll need it to schedule your exam.</p>
+                </div>
 
-            
+            % endif   
 
             <%
             cert_status = cert_statuses.get(course.id)
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
new file mode 100644
index 0000000000..c71c40610d
--- /dev/null
+++ b/lms/templates/test_center_register.html
@@ -0,0 +1,179 @@
+<%!
+  from django.core.urlresolvers import reverse
+  from courseware.courses import course_image_url, get_course_about_section
+  from courseware.access import has_access
+  from certificates.models import CertificateStatuses
+%>
+<%inherit file="main.html" />
+
+<%namespace name='static' file='static_content.html'/>
+
+<%block name="title"><title>Sign Up for Pearson VUE Test Center Proctoring</title></%block>
+
+<%block name="js_extra">
+  <script type="text/javascript">
+  (function() {
+
+    $(".unenroll").click(function(event) {
+      $("#unenroll_course_id").val( $(event.target).data("course-id") );
+      $("#unenroll_course_number").text( $(event.target).data("course-number") );
+    });
+
+    $(document).delegate('#unenroll_form', 'ajax:success', function(data, json, xhr) {
+      if(json.success) {
+        location.href="${reverse('dashboard')}";
+      } else {
+        if($('#unenroll_error').length == 0) {
+          $('#unenroll_form').prepend('<div id="unenroll_error" class="modal-form-error"></div>');
+        }
+        $('#unenroll_error').text(json.error).stop().css("display", "block");
+      }
+    });
+
+  })(this)
+  </script>
+</%block>
+
+<section id="testcenter-register" class="">
+    
+    
+  %if message:
+    <section class="dashboard-banner">
+      ${message}
+    </section>
+  %endif
+
+  <div class="inner-wrapper">
+    <div id="register">
+      <header>
+        <h2></h2>
+        <hr>
+      </header>
+
+      <!-- display stuff about the exam and the course for which the user is registering.  
+           If the user has already registered in the past for a test center, then also display
+           their ID. -->
+
+      <section class="info">
+        <hgroup>
+          <p class="date-block">
+              % if course.has_ended():
+              Course Completed - ${course.end_date_text}
+              % elif course.has_started():
+              Course Started - ${course.start_date_text}
+              % else:   # hasn't started yet
+              Course Starts - ${course.start_date_text}
+              % endif
+              </p>
+              <h2 class="university">${get_course_about_section(course, 'university')}</h2>
+              <h3>${course.number} ${course.title}</h3>
+        </hgroup>
+
+        <!-- TODO: need to add logic to select which of the following to display.  Like certs? -->
+            <%
+            testcenter_info = course.testcenter_info
+            %>
+            % if testcenter_info is not None:
+                <%
+                    exam_info = testcenter_info.get('Final_Exam')
+                %>
+                <p>Exam Series Code: ${exam_info.get('Exam_Series_Code')}</p>
+                <p>First Eligible Appointment Date: ${exam_info.get('First_Eligible_Appointment_Date')}</p>
+                <p>Last Eligible Appointment Date: ${exam_info.get('Last_Eligible_Appointment_Date')}</p>
+            % endif
+
+      </section>
+
+
+      <form id="test_register_form" class="test_register_form" method="post" data-remote="true" action="/create_test_registration">
+        <div class="notice"></div>
+        <!-- TODO: why are both of these here? -->
+        <div id="register_error" class="modal-form-error" name="register_error"></div>
+        <div id="register_error" name="register_error"></div>
+
+        <!-- include these as pass-throughs -->
+        <input id="id_email" type="hidden" name="email" maxlength="75" value="${user.email}" />
+        <input id="id_username" type="hidden" name="username" maxlength="75" value="${user.username}" />
+        <!-- TODO: add the course somehow... -->
+        <input id="id_course_id" type="hidden" name="course_id" maxlength="75" value="${course.id}" />
+
+        <div class="input-group">
+          <label data-field="salutation">Salutation</label>
+          <input name="salutation" type="text" value="${testcenteruser.salutation}" placeholder="e.g. Dr.">
+          <br>
+          <label data-field="first_name">First Name*</label>
+          <input name="first_name" type="text" value="${testcenteruser.first_name}" maxlength="30" placeholder="e.g. Jane">
+          <br>
+          <label data-field="middle_name">Middle Name</label>
+          <input name="middle_name" type="text" value="${testcenteruser.middle_name}" placeholder="e.g. Michael">
+          <br>
+          <label data-field="last_name">Last Name*</label>
+          <input name="last_name" type="text" value="${testcenteruser.last_name}" placeholder="e.g. Smith">
+          <br>
+          <label data-field="suffix">Suffix</label>
+          <input name="suffix" type="text" value="${testcenteruser.suffix}" placeholder="e.g. Jr.">
+          <br>
+        </div>
+
+        <div class="input-group">
+          <label data-field="address_1">Address1*</label>
+          <input name="address_1" type="text" value="${testcenteruser.address_1}" placeholder="123 Main St.">
+          <br>
+          <label data-field="address_2">Address2</label>
+          <input name="address_2" type="text" value="${testcenteruser.address_2}" placeholder="Apartment 2B.">
+          <br>
+          <label data-field="address_3">Address3</label>
+          <input name="address_3" type="text" value="${testcenteruser.address_3}" placeholder="Attention: John Smith">
+          <br>
+
+          <label data-field="city">City</label>
+          <input name="city" type="text" value="${testcenteruser.city}" placeholder="Our Fair City">
+          <label data-field="state">State/Province</label>
+          <input name="state" type="text" value="${testcenteruser.state}" placeholder="MA">
+          <br>
+          <label data-field="postal_code">Postal Code</label>
+          <input name="postal_code" type="text" value="${testcenteruser.postal_code}" placeholder="02138">
+          <label data-field="country">Country Code*</label>
+          <input name="country" type="text" value="${testcenteruser.country}" placeholder="USA">
+        </div>
+
+        <div class="input-group">
+          <label data-field="phone">Phone*</label>
+          <input name="phone" type="text" value="${testcenteruser.phone}" placeholder="1-23-456-7890">
+          <label data-field="phone">Extension</label>
+          <input name="extension" type="text" value="${testcenteruser.extension}" placeholder="x123">
+          <label data-field="phone_country_code">Phone Country Code*</label>
+          <input name="phone_country_code" type="text" value="${testcenteruser.phone_country_code}" placeholder="ABC">
+          <br>
+          <label data-field="fax">Fax</label>
+          <input name="fax" type="text" value="${testcenteruser.fax}" placeholder="1-23-456-7891">
+          <label data-field="fax_country_code">Fax Country Code*</label>
+          <input name="fax_country_code" type="text" value="${testcenteruser.fax_country_code}" placeholder="ABC">
+          <br>
+          <label data-field="company_name">Company</label>
+          <input name="company_name" type="text" value="${testcenteruser.company_name}" placeholder="Acme Corporation">
+        </div>
+
+        <div class="input-group">
+          <label data-field="accommodations">Accommodations Requested</label>
+          <textarea name="accommodations"></textarea>
+        </div>
+
+        <div class="submit">
+          <input name="submit" type="submit" value="Register for Test">
+        </div>
+      </form>
+
+    </div>
+<!--
+    <div class="close-modal">
+      <div class="inner">
+        <p>&#10005;</p>
+      </div>
+    </div> -->
+  </div>
+</section>
+
+
+ 
+ 
\ No newline at end of file
diff --git a/lms/urls.py b/lms/urls.py
index 97f4613b8f..e81e25e86a 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -43,6 +43,7 @@ urlpatterns = ('',
     url(r'^create_account$', 'student.views.create_account'),
     url(r'^activate/(?P<key>[^/]*)$', 'student.views.activate_account', name="activate"),
 
+    url(r'^begin_test_registration/(?P<course_id>[^/]+/[^/]+/[^/]+)$', 'student.views.begin_test_registration', name="begin_test_registration"),
     url(r'^create_test_registration$', 'student.views.create_test_registration'),
 
     url(r'^password_reset/$', 'student.views.password_reset', name='password_reset'),

From f912ffe8a2968413b5ffdb61414de9f7cb9d0b70 Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Tue, 18 Dec 2012 18:31:41 -0500
Subject: [PATCH 005/541] add persistence of testcenter_user registration

---
 common/djangoapps/student/models.py |  15 ++++
 common/djangoapps/student/views.py  | 113 +++++++++++++++-------------
 2 files changed, 74 insertions(+), 54 deletions(-)

diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index 2f5bc3ac04..89e2548bbb 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -189,10 +189,25 @@ class TestCenterUser(models.Model):
     # Company
     company_name = models.CharField(max_length=50, blank=True)
 
+    @staticmethod
+    def user_provided_fields():
+        return [ 'first_name', 'middle_name', 'last_name', 'suffix', 'salutation', 
+                'address_1', 'address_2', 'address_3', 'city', 'state', 'postal_code', 'country', 
+                'phone', 'extension', 'phone_country_code', 'fax', 'fax_country_code', 'company_name']
+        
     @property
     def email(self):
         return self.user.email
 
+class TestCenterRegistration(models.Model):
+    testcenter_user = models.ForeignKey(TestCenterUser, unique=True, default=None)
+    created_at = models.DateTimeField(auto_now_add=True, db_index=True)
+    updated_at = models.DateTimeField(auto_now=True, db_index=True)
+    accommodation_request = models.CharField(max_length=1024)
+    # TODO: this should be an enumeration:
+    accommodation_code = models.CharField(max_length=64)
+    
+    
 def unique_id_for_user(user):
     """
     Return a unique id for a user, suitable for inserting into
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 52fcbb0152..d972cb326c 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -26,7 +26,7 @@ from bs4 import BeautifulSoup
 from django.core.cache import cache
 
 from django_future.csrf import ensure_csrf_cookie, csrf_exempt
-from student.models import (Registration, UserProfile, TestCenterUser,
+from student.models import (Registration, UserProfile, TestCenterUser, TestCenterRegistration,
                             PendingNameChange, PendingEmailChange,
                             CourseEnrollment, unique_id_for_user)
 
@@ -614,7 +614,7 @@ def begin_test_registration(request, course_id):
         log.error("User {0} enrolled in non-existent course {1}"
                       .format(user.username, course_id))
 
-    # placeholder for possible messages...
+    # TODO: placeholder for possible messages...
     message = ""
     if not user.is_active:
         message = render_to_string('registration/activate_account_notice.html', {'email': user.email})
@@ -634,52 +634,68 @@ def _do_create_or_update_test_center_user(post_vars):
     registration for this user.
 
     Returns a tuple (User, UserProfile, TestCenterUser).
-
-    Note: this function is also used for creating test users.
+  
     """
-    user = User(username=post_vars['username'],
-             email=post_vars['email'],
-             is_active=False)
-    user.set_password(post_vars['password'])
-    registration = Registration()
+    
+    # first determine if we need to create a new TestCenterUser, or if we are making any update 
+    # to an existing TestCenterUser.
+    username=post_vars['username']
+    user = User.objects.get(username=username)
+    
+    needs_saving = False
+    try:
+        testcenter_user = TestCenterUser.objects.get(user=user)
+        # found a TestCenterUser, so check to see if it has changed
+        needs_updating = any([testcenter_user.__getattribute__(fieldname) != post_vars[fieldname]
+                              for fieldname in TestCenterUser.user_provided_fields()])
+            
+        if needs_updating:
+            # TODO: what do we set a timestamp to, in order to get now()?
+            testcenter_user.user_updated_at = datetime.datetime.now()
+            # Now do the update:
+            for fieldname in TestCenterUser.user_provided_fields():
+                testcenter_user.__setattr__(fieldname, post_vars[fieldname])
+            needs_saving = True
+        
+    except TestCenterUser.DoesNotExist:
+        # did not find the TestCenterUser, so create a new one 
+        testcenter_user = TestCenterUser(user=user)
+        # testcenter_user.user = user
+        for fieldname in TestCenterUser.user_provided_fields():
+            testcenter_user.__setattr__(fieldname, post_vars[fieldname])
+        # testcenter_user.candidate_id remains unset    
+        testcenter_user.client_candidate_id = 'edx' + '123456'  # some unique value  
+        testcenter_user.user_updated_at = datetime.datetime.now()
+        needs_saving = True
+
+    # additional validation occurs at save time, so handle exceptions
     # TODO: Rearrange so that if part of the process fails, the whole process fails.
     # Right now, we can have e.g. no registration e-mail sent out and a zombie account
-    try:
-        user.save()
-    except IntegrityError:
-        js = {'success': False}
-        # Figure out the cause of the integrity error
-        if len(User.objects.filter(username=post_vars['username'])) > 0:
-            js['value'] = "An account with this username already exists."
-            js['field'] = 'username'
-            return HttpResponse(json.dumps(js))
+    if needs_saving:
+        try:
+            testcenter_user.save()
+        except IntegrityError:
+            js = {'success': False}
+            # TODO: Figure out the cause of the integrity error
+            if len(User.objects.filter(username=post_vars['username'])) > 0:
+                js['value'] = "An account with this username already exists."
+                js['field'] = 'username'
+                return HttpResponse(json.dumps(js))
+            
+            if len(User.objects.filter(email=post_vars['email'])) > 0:
+                js['value'] = "An account with this e-mail already exists."
+                js['field'] = 'email'
+                return HttpResponse(json.dumps(js))
 
-        if len(User.objects.filter(email=post_vars['email'])) > 0:
-            js['value'] = "An account with this e-mail already exists."
-            js['field'] = 'email'
-            return HttpResponse(json.dumps(js))
+            raise
+            
+    
+    registration = TestCenterRegistration(testcenter_user = testcenter_user)
+    # registration.register(user)
 
-        raise
+    registration.accommodation_request = post_vars['accommodations']
 
-    registration.register(user)
-
-    profile = UserProfile(user=user)
-    profile.name = post_vars['name']
-    profile.level_of_education = post_vars.get('level_of_education')
-    profile.gender = post_vars.get('gender')
-    profile.mailing_address = post_vars.get('mailing_address')
-    profile.goals = post_vars.get('goals')
-
-    try:
-        profile.year_of_birth = int(post_vars['year_of_birth'])
-    except (ValueError, KeyError):
-        profile.year_of_birth = None  # If they give us garbage, just ignore it instead
-                                # of asking them to put an integer.
-    try:
-        profile.save()
-    except Exception:
-        log.exception("UserProfile creation failed for user {0}.".format(user.id))
-    return (user, profile, registration)
+    return (user, testcenter_user, registration)
 
 @ensure_csrf_cookie
 def create_test_registration(request, post_override=None):
@@ -718,7 +734,7 @@ def create_test_registration(request, post_override=None):
         return ret
 
 
-    (user, profile, testcenter_user, testcenter_registration) = ret
+    (user, testcenter_user, testcenter_registration) = ret
 
 
     # only do the following if there is accommodation text to send,
@@ -743,17 +759,6 @@ def create_test_registration(request, post_override=None):
             return HttpResponse(json.dumps(js))
 
 
-    if DoExternalAuth:
-        eamap.user = login_user
-        eamap.dtsignup = datetime.datetime.now()
-        eamap.save()
-        log.debug('Updated ExternalAuthMap for %s to be %s' % (post_vars['username'],eamap))
-
-        if settings.MITX_FEATURES.get('BYPASS_ACTIVATION_EMAIL_FOR_EXTAUTH'):
-            log.debug('bypassing activation email')
-            login_user.is_active = True
-            login_user.save()
-
     # statsd.increment("common.student.account_created")
 
     js = {'success': True}

From f472ac60f511081ef75fb40af1dc610fb173ca23 Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Wed, 19 Dec 2012 00:21:49 -0500
Subject: [PATCH 006/541] minor tweaks to test center registration

---
 common/djangoapps/student/models.py | 30 ++++++++++++++++++++++++++---
 common/djangoapps/student/views.py  | 15 ++++++++-------
 lms/templates/dashboard.html        |  3 ++-
 3 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index 89e2548bbb..b7b2b4e21d 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -200,13 +200,37 @@ class TestCenterUser(models.Model):
         return self.user.email
 
 class TestCenterRegistration(models.Model):
+    """
+    This is our representation of a user's registration for in-person testing,
+    and specifically for Pearson at this point. A few things to note:
+
+    * Pearson only supports Latin-1, so we have to make sure that the data we
+      capture here will work with that encoding.  This is less of an issue
+      than for the TestCenterUser.
+    * Registrations are only created here when a user registers to take an exam in person.
+
+    The field names and lengths are modeled on the conventions and constraints
+    of Pearson's data import system.
+    """
+    # TODO: Check the spec to find out lengths specified by Pearson
+
     testcenter_user = models.ForeignKey(TestCenterUser, unique=True, default=None)
     created_at = models.DateTimeField(auto_now_add=True, db_index=True)
     updated_at = models.DateTimeField(auto_now=True, db_index=True)
-    accommodation_request = models.CharField(max_length=1024)
-    # TODO: this should be an enumeration:
-    accommodation_code = models.CharField(max_length=64)
+    course_id = models.CharField(max_length=128, db_index=True)
     
+    # store the original text of the accommodation request.
+    accommodation_request = models.CharField(max_length=1024, blank=True)
+    # TODO: this should be an enumeration:
+    accommodation_code = models.CharField(max_length=64, blank=True)
+
+    @property
+    def candidate_id(self):
+        return self.testcenter_user.candidate_id
+    
+    @property
+    def client_candidate_id(self):
+        return self.testcenter_user.client_candidate_id
     
 def unique_id_for_user(user):
     """
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index d972cb326c..cfb6b3a39b 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -207,11 +207,11 @@ def dashboard(request):
 
     # we want to populate the registration page with the relevant information,
     # if it already exists.  Create an empty object otherwise.
-    try:
-        testcenteruser = TestCenterUser.objects.get(user=user)
-    except TestCenterUser.DoesNotExist:
-        testcenteruser = TestCenterUser()
-        testcenteruser.user = user
+#    try:
+#        testcenteruser = TestCenterUser.objects.get(user=user)
+#    except TestCenterUser.DoesNotExist:
+#        testcenteruser = TestCenterUser()
+#        testcenteruser.user = user
     
     # Build our courses list for the user, but ignore any courses that no longer
     # exist (because the course IDs have changed). Still, we don't delete those
@@ -252,7 +252,8 @@ def dashboard(request):
                'show_courseware_links_for' : show_courseware_links_for,
                'cert_statuses': cert_statuses,
                'news': top_news,
-               'testcenteruser': testcenteruser,
+# No longer needed here...move to begin_registration               
+#               'testcenteruser': testcenteruser,
                }
 
     return render_to_response('dashboard.html', context)
@@ -692,7 +693,7 @@ def _do_create_or_update_test_center_user(post_vars):
     
     registration = TestCenterRegistration(testcenter_user = testcenter_user)
     # registration.register(user)
-
+    registration.course_id = post_vars['course_id']
     registration.accommodation_request = post_vars['accommodations']
 
     return (user, testcenter_user, registration)
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index f771f3e098..c7a8df077a 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -239,7 +239,8 @@
                 </div>
 
                 <div class="message message-status is-shown exam-schedule">
-                   <a href="#" class="exam-button">Schedule Pearson exam</a>
+                	<!-- TODO: pull Pearson destination out into a Setting -->
+                   <a href="https://www1.pearsonvue.com/testtaker/signin/SignInPage/EDX" class="exam-button">Schedule Pearson exam</a>
                    <p class="exam-registration-number">Registration number: <strong>edx00015879548</strong></p>
                    <p class="message-copy">Write this down! You’ll need it to schedule your exam.</p>
                 </div>

From ee99080687a8f9b7312bab14e02d6a4ea4de7a7a Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Wed, 19 Dec 2012 16:53:13 -0500
Subject: [PATCH 007/541] add additional fields to testcenter user and update
 test center registration.

---
 ...022_add_more_fields_to_test_center_user.py | 198 ++++++++++++++++++
 common/djangoapps/student/models.py           |  50 ++++-
 common/djangoapps/student/views.py            |  75 ++++---
 common/lib/xmodule/xmodule/course_module.py   |  15 +-
 lms/templates/dashboard.html                  |  20 +-
 lms/templates/test_center_register.html       |   7 +-
 6 files changed, 314 insertions(+), 51 deletions(-)
 create mode 100644 common/djangoapps/student/migrations/0022_add_more_fields_to_test_center_user.py

diff --git a/common/djangoapps/student/migrations/0022_add_more_fields_to_test_center_user.py b/common/djangoapps/student/migrations/0022_add_more_fields_to_test_center_user.py
new file mode 100644
index 0000000000..4a6481f80c
--- /dev/null
+++ b/common/djangoapps/student/migrations/0022_add_more_fields_to_test_center_user.py
@@ -0,0 +1,198 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'TestCenterUser.upload_status'
+        db.add_column('student_testcenteruser', 'upload_status',
+                      self.gf('django.db.models.fields.CharField')(default='', max_length=20, blank=True),
+                      keep_default=False)
+
+        # Adding field 'TestCenterUser.confirmed_at'
+        db.add_column('student_testcenteruser', 'confirmed_at',
+                      self.gf('django.db.models.fields.DateTimeField')(null=True, db_index=True),
+                      keep_default=False)
+
+        # Adding field 'TestCenterUser.upload_error_message'
+        db.add_column('student_testcenteruser', 'upload_error_message',
+                      self.gf('django.db.models.fields.CharField')(default='', max_length=512, blank=True),
+                      keep_default=False)
+
+        # Adding model 'TestCenterRegistration'
+        db.create_table('student_testcenterregistration', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('testcenter_user', self.gf('django.db.models.fields.related.ForeignKey')(default=None, to=orm['student.TestCenterUser'], unique=True)),
+            ('course_id', self.gf('django.db.models.fields.CharField')(max_length=128, db_index=True)),
+            ('created_at', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, db_index=True, blank=True)),
+            ('updated_at', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, db_index=True, blank=True)),
+            ('user_updated_at', self.gf('django.db.models.fields.DateTimeField')(db_index=True)),
+            ('client_authorization_id', self.gf('django.db.models.fields.CharField')(unique=True, max_length=20, db_index=True)),
+            ('exam_series_code', self.gf('django.db.models.fields.CharField')(max_length=15, db_index=True)),
+            ('eligibility_appointment_date_first', self.gf('django.db.models.fields.DateField')(db_index=True)),
+            ('eligibility_appointment_date_last', self.gf('django.db.models.fields.DateField')(db_index=True)),
+            ('accommodation_code', self.gf('django.db.models.fields.CharField')(max_length=64, blank=True)),
+            ('accommodation_request', self.gf('django.db.models.fields.CharField')(max_length=1024, blank=True)),
+            ('upload_status', self.gf('django.db.models.fields.CharField')(max_length=20, blank=True)),
+            ('confirmed_at', self.gf('django.db.models.fields.DateTimeField')(db_index=True)),
+            ('upload_error_message', self.gf('django.db.models.fields.CharField')(max_length=512, blank=True)),
+        ))
+        db.send_create_signal('student', ['TestCenterRegistration'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'TestCenterRegistration'
+        db.delete_table('student_testcenterregistration')
+
+        # Deleting field 'TestCenterUser.upload_status'
+        db.delete_column('student_testcenteruser', 'upload_status')
+
+        # Deleting field 'TestCenterUser.confirmed_at'
+        db.delete_column('student_testcenteruser', 'confirmed_at')
+
+        # Deleting field 'TestCenterUser.upload_error_message'
+        db.delete_column('student_testcenteruser', 'upload_error_message')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'student.courseenrollment': {
+            'Meta': {'unique_together': "(('user', 'course_id'),)", 'object_name': 'CourseEnrollment'},
+            'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'student.pendingemailchange': {
+            'Meta': {'object_name': 'PendingEmailChange'},
+            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'new_email': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'})
+        },
+        'student.pendingnamechange': {
+            'Meta': {'object_name': 'PendingNameChange'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'new_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'rationale': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'})
+        },
+        'student.registration': {
+            'Meta': {'object_name': 'Registration', 'db_table': "'auth_registration'"},
+            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'unique': 'True'})
+        },
+        'student.testcenterregistration': {
+            'Meta': {'object_name': 'TestCenterRegistration'},
+            'accommodation_code': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
+            'accommodation_request': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}),
+            'client_authorization_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20', 'db_index': 'True'}),
+            'confirmed_at': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
+            'course_id': ('django.db.models.fields.CharField', [], {'max_length': '128', 'db_index': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'eligibility_appointment_date_first': ('django.db.models.fields.DateField', [], {'db_index': 'True'}),
+            'eligibility_appointment_date_last': ('django.db.models.fields.DateField', [], {'db_index': 'True'}),
+            'exam_series_code': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'testcenter_user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['student.TestCenterUser']", 'unique': 'True'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'upload_error_message': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}),
+            'upload_status': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
+            'user_updated_at': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'})
+        },
+        'student.testcenteruser': {
+            'Meta': {'object_name': 'TestCenterUser'},
+            'address_1': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+            'address_2': ('django.db.models.fields.CharField', [], {'max_length': '40', 'blank': 'True'}),
+            'address_3': ('django.db.models.fields.CharField', [], {'max_length': '40', 'blank': 'True'}),
+            'candidate_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'db_index': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'}),
+            'client_candidate_id': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
+            'company_name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
+            'confirmed_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}),
+            'country': ('django.db.models.fields.CharField', [], {'max_length': '3', 'db_index': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'extension': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '8', 'blank': 'True'}),
+            'fax': ('django.db.models.fields.CharField', [], {'max_length': '35', 'blank': 'True'}),
+            'fax_country_code': ('django.db.models.fields.CharField', [], {'max_length': '3', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
+            'middle_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'phone': ('django.db.models.fields.CharField', [], {'max_length': '35'}),
+            'phone_country_code': ('django.db.models.fields.CharField', [], {'max_length': '3', 'db_index': 'True'}),
+            'postal_code': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '16', 'blank': 'True'}),
+            'salutation': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
+            'state': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '20', 'blank': 'True'}),
+            'suffix': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'upload_error_message': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}),
+            'upload_status': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['auth.User']", 'unique': 'True'}),
+            'user_updated_at': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'})
+        },
+        'student.userprofile': {
+            'Meta': {'object_name': 'UserProfile', 'db_table': "'auth_userprofile'"},
+            'courseware': ('django.db.models.fields.CharField', [], {'default': "'course.xml'", 'max_length': '255', 'blank': 'True'}),
+            'gender': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '6', 'null': 'True', 'blank': 'True'}),
+            'goals': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'language': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
+            'level_of_education': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '6', 'null': 'True', 'blank': 'True'}),
+            'location': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
+            'mailing_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'meta': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'profile'", 'unique': 'True', 'to': "orm['auth.User']"}),
+            'year_of_birth': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'})
+        },
+        'student.usertestgroup': {
+            'Meta': {'object_name': 'UserTestGroup'},
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'}),
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.User']", 'db_index': 'True', 'symmetrical': 'False'})
+        }
+    }
+
+    complete_apps = ['student']
diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index b7b2b4e21d..6b73c2319f 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -141,6 +141,9 @@ class TestCenterUser(models.Model):
     The field names and lengths are modeled on the conventions and constraints
     of Pearson's data import system, including oddities such as suffix having
     a limit of 255 while last_name only gets 50.
+    
+    Also storing here the confirmation information received from Pearson (if any) 
+    as to the success or failure of the upload.  (VCDC file)
     """
     # Our own record keeping...
     user = models.ForeignKey(User, unique=True, default=None)
@@ -155,7 +158,7 @@ class TestCenterUser(models.Model):
     # we first create the User entry, and is assigned by Pearson later.
     candidate_id = models.IntegerField(null=True, db_index=True)
 
-    # Unique ID we assign our user for a the Test Center.
+    # Unique ID we assign our user for the Test Center.
     client_candidate_id = models.CharField(max_length=50, db_index=True)
 
     # Name
@@ -189,6 +192,11 @@ class TestCenterUser(models.Model):
     # Company
     company_name = models.CharField(max_length=50, blank=True)
 
+    # Confirmation
+    upload_status = models.CharField(max_length=20, blank=True)  # 'Error' or 'Accepted'
+    confirmed_at = models.DateTimeField(null=True, db_index=True)
+    upload_error_message = models.CharField(max_length=512, blank=True)
+    
     @staticmethod
     def user_provided_fields():
         return [ 'first_name', 'middle_name', 'last_name', 'suffix', 'salutation', 
@@ -212,17 +220,38 @@ class TestCenterRegistration(models.Model):
     The field names and lengths are modeled on the conventions and constraints
     of Pearson's data import system.
     """
-    # TODO: Check the spec to find out lengths specified by Pearson
-
+    # to find an exam registration, we key off of the user and course_id.
+    # If multiple exams per course are possible, we would also need to add the 
+    # exam_series_code.
     testcenter_user = models.ForeignKey(TestCenterUser, unique=True, default=None)
+    course_id = models.CharField(max_length=128, db_index=True)
+    
     created_at = models.DateTimeField(auto_now_add=True, db_index=True)
     updated_at = models.DateTimeField(auto_now=True, db_index=True)
-    course_id = models.CharField(max_length=128, db_index=True)
+    # user_updated_at happens only when the user makes a change to their data,
+    # and is something Pearson needs to know to manage updates. Unlike
+    # updated_at, this will not get incremented when we do a batch data import.
+    # The appointment dates, the exam count, and the accommodation codes can be updated, 
+    # but hopefully this won't happen often.
+    user_updated_at = models.DateTimeField(db_index=True)
+    # "client_authorization_id" is the client's unique identifier for the authorization.  
+    # This must be present for an update or delete to be sent to Pearson.
+    client_authorization_id = models.CharField(max_length=20, unique=True, db_index=True)
+
+    # information about the test, from the course policy:
+    exam_series_code = models.CharField(max_length=15, db_index=True)
+    eligibility_appointment_date_first = models.DateField(db_index=True)
+    eligibility_appointment_date_last = models.DateField(db_index=True)
+    # TODO: this should be an enumeration:
+    accommodation_code = models.CharField(max_length=64, blank=True)
     
     # store the original text of the accommodation request.
     accommodation_request = models.CharField(max_length=1024, blank=True)
-    # TODO: this should be an enumeration:
-    accommodation_code = models.CharField(max_length=64, blank=True)
+
+    # Confirmation
+    upload_status = models.CharField(max_length=20, blank=True)  # 'Error' or 'Accepted'
+    confirmed_at = models.DateTimeField(db_index=True)
+    upload_error_message = models.CharField(max_length=512, blank=True)
 
     @property
     def candidate_id(self):
@@ -232,6 +261,15 @@ class TestCenterRegistration(models.Model):
     def client_candidate_id(self):
         return self.testcenter_user.client_candidate_id
     
+    
+
+def get_testcenter_registrations_for_user_and_course(user, course_id):
+    try:
+        tcu = TestCenterUser.objects.get(user=user)
+    except User.DoesNotExist:
+        return []
+    return TestCenterRegistration.objects.filter(testcenter_user=tcu, course_id=course_id)
+    
 def unique_id_for_user(user):
     """
     Return a unique id for a user, suitable for inserting into
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index cfb6b3a39b..4d5728792e 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -1,12 +1,12 @@
 import datetime
 import feedparser
-import itertools
+#import itertools
 import json
 import logging
 import random
 import string
 import sys
-import time
+#import time
 import urllib
 import uuid
 
@@ -19,7 +19,8 @@ from django.core.context_processors import csrf
 from django.core.mail import send_mail
 from django.core.validators import validate_email, validate_slug, ValidationError
 from django.db import IntegrityError
-from django.http import HttpResponse, HttpResponseForbidden, Http404
+from django.http import HttpResponse, HttpResponseForbidden, Http404,\
+    HttpResponseRedirect
 from django.shortcuts import redirect
 from mitxmako.shortcuts import render_to_response, render_to_string
 from bs4 import BeautifulSoup
@@ -37,13 +38,14 @@ from xmodule.modulestore.exceptions import ItemNotFoundError
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.exceptions import ItemNotFoundError
 
-from datetime import date
+#from datetime import date
 from collections import namedtuple
 
 from courseware.courses import get_courses_by_university
 from courseware.access import has_access
 
 from statsd import statsd
+from django.contrib.localflavor.ie.ie_counties import IE_COUNTY_CHOICES
 
 log = logging.getLogger("mitx.student")
 Article = namedtuple('Article', 'title url author image deck publication publish_date')
@@ -640,9 +642,11 @@ def _do_create_or_update_test_center_user(post_vars):
     
     # first determine if we need to create a new TestCenterUser, or if we are making any update 
     # to an existing TestCenterUser.
-    username=post_vars['username']
+    username = post_vars['username']
     user = User.objects.get(username=username)
-    
+    course_id = post_vars['course_id']
+    course = (course_from_id(course_id))  # assume it will be found....
+        
     needs_saving = False
     try:
         testcenter_user = TestCenterUser.objects.get(user=user)
@@ -651,9 +655,8 @@ def _do_create_or_update_test_center_user(post_vars):
                               for fieldname in TestCenterUser.user_provided_fields()])
             
         if needs_updating:
-            # TODO: what do we set a timestamp to, in order to get now()?
+            # leave user and client_candidate_id as before
             testcenter_user.user_updated_at = datetime.datetime.now()
-            # Now do the update:
             for fieldname in TestCenterUser.user_provided_fields():
                 testcenter_user.__setattr__(fieldname, post_vars[fieldname])
             needs_saving = True
@@ -661,7 +664,6 @@ def _do_create_or_update_test_center_user(post_vars):
     except TestCenterUser.DoesNotExist:
         # did not find the TestCenterUser, so create a new one 
         testcenter_user = TestCenterUser(user=user)
-        # testcenter_user.user = user
         for fieldname in TestCenterUser.user_provided_fields():
             testcenter_user.__setattr__(fieldname, post_vars[fieldname])
         # testcenter_user.candidate_id remains unset    
@@ -670,31 +672,43 @@ def _do_create_or_update_test_center_user(post_vars):
         needs_saving = True
 
     # additional validation occurs at save time, so handle exceptions
-    # TODO: Rearrange so that if part of the process fails, the whole process fails.
-    # Right now, we can have e.g. no registration e-mail sent out and a zombie account
     if needs_saving:
         try:
             testcenter_user.save()
-        except IntegrityError:
-            js = {'success': False}
-            # TODO: Figure out the cause of the integrity error
-            if len(User.objects.filter(username=post_vars['username'])) > 0:
-                js['value'] = "An account with this username already exists."
-                js['field'] = 'username'
-                return HttpResponse(json.dumps(js))
+        except IntegrityError, ie:
+            message = ie
+            context = {'course': course,
+                       'user': user,
+                       'message': message,
+                       'testcenteruser': testcenter_user,
+                       }
+            return render_to_response('test_center_register.html', context)
             
-            if len(User.objects.filter(email=post_vars['email'])) > 0:
-                js['value'] = "An account with this e-mail already exists."
-                js['field'] = 'email'
-                return HttpResponse(json.dumps(js))
-
-            raise
-            
-    
+    # create and save the registration:
     registration = TestCenterRegistration(testcenter_user = testcenter_user)
-    # registration.register(user)
     registration.course_id = post_vars['course_id']
     registration.accommodation_request = post_vars['accommodations']
+    exam_info = course.testcenter_info
+    registration.exam_series_code = exam_info.get('Exam_Series_Code')
+    registration.eligibility_appointment_date_first = exam_info.get('First_Eligible_Appointment_Date')
+    registration.eligibility_appointment_date_last = exam_info.get('Last_Eligible_Appointment_Date')
+    # accommodation_code remains blank for now, along with Pearson confirmation
+    registration.user_updated_at = datetime.datetime.now()
+
+    # "client_authorization_id" is the client's unique identifier for the authorization.  
+    # This must be present for an update or delete to be sent to Pearson.
+    registration.client_authorization_id = "1"
+    try:
+        registration.save()
+    except IntegrityError, ie:
+        message = ie
+        context = {'course': course,
+                   'user': user,
+                   'message': message,
+                   'testcenteruser': testcenter_user,
+                   }
+        return render_to_response('test_center_register.html', context)
+        
 
     return (user, testcenter_user, registration)
 
@@ -759,11 +773,12 @@ def create_test_registration(request, post_override=None):
             js['value'] = 'Could not send accommodation e-mail.'
             return HttpResponse(json.dumps(js))
 
-
+    # TODO: enable appropriate stat
     # statsd.increment("common.student.account_created")
 
-    js = {'success': True}
-    return HttpResponse(json.dumps(js), mimetype="application/json")
+#    js = {'success': True}
+#    return HttpResponse(json.dumps(js), mimetype="application/json")
+    return HttpResponseRedirect('/dashboard')
 
 def get_random_post_override():
     """
diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py
index a4cf87b333..715b263b59 100644
--- a/common/lib/xmodule/xmodule/course_module.py
+++ b/common/lib/xmodule/xmodule/course_module.py
@@ -315,7 +315,7 @@ class CourseDescriptor(SequenceDescriptor):
         Returns None if no url specified.
         """
         return self.metadata.get('end_of_course_survey_url')
-
+    
     @property
     def testcenter_info(self):
         """
@@ -324,10 +324,17 @@ class CourseDescriptor(SequenceDescriptor):
         TODO: decide if we expect this entry to be a single test, or if multiple tests are possible
         per course.
 
-        Returns None if no testcenter info specified.
+        For now we expect this entry to be a single test.
+
+        Returns None if no testcenter info specified, or if no exam is included.
         """
-        return self.metadata.get('testcenter_info')
-    
+        info = self.metadata.get('testcenter_info')
+        if info is None or len(info) == 0:
+            return None;
+        else:
+            return info.values()[0]
+            
+
     @property
     def title(self):
         return self.display_name
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index c7a8df077a..13e393180a 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -3,6 +3,7 @@
   from courseware.courses import course_image_url, get_course_about_section
   from courseware.access import has_access
   from certificates.models import CertificateStatuses
+  from student.models import get_testcenter_registrations_for_user_and_course
 %>
 <%inherit file="main.html" />
 
@@ -222,20 +223,26 @@
 	    <!-- TODO: need to add logic to select which of the following to display.  Like certs? -->
             <%
             testcenter_info = course.testcenter_info
+            testcenter_register_target = reverse('begin_test_registration', args=[course.id])
             %>
             % if testcenter_info is not None:
-	    
-	           <% 
-	               testcenter_register_target = reverse('begin_test_registration', args=[course.id])
-               %>
+
+                <!-- see if there is already a registration object
+                	TODO: need to add logic for when registration can begin. -->
+                <%
+                    registrations = get_testcenter_registrations_for_user_and_course(user, course.id)
+                %>
+                % if len(registrations) == 0:	    
                 <div class="message message-status is-shown exam-register">
 <!--                  <a href="#testcenter-register-modal" rel="leanModal" class="exam-button" data-course-id="${course.id}" data-course-number="${course.number}" id="exam_register_button">Register for Pearson exam</a>
 -->                  <a href="${testcenter_register_target}" class="exam-button" id="exam_register_button">Register for Pearson exam</a>
                       <p class="message-copy">Registration for the Pearson exam is now open.</p>
                 </div>
-
+                % else:     
                 <div class="message message-status is-shown">
-                  <p class="message-copy">Your registration for the Pearson exam is pending. Within a few days, you should receive a confirmation number, which can be used to schedule your exam.</p>
+                  <p class="message-copy">Your 
+                    <a href="${testcenter_register_target}" id="exam_register_link">registration for the Pearson exam</a>
+     is pending. Within a few days, you should see a confirmation number here, which can be used to schedule your exam.</p>
                 </div>
 
                 <div class="message message-status is-shown exam-schedule">
@@ -244,6 +251,7 @@
                    <p class="exam-registration-number">Registration number: <strong>edx00015879548</strong></p>
                    <p class="message-copy">Write this down! You’ll need it to schedule your exam.</p>
                 </div>
+                % endif
 
             % endif   
 
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index c71c40610d..51b271dfc3 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -71,12 +71,9 @@
 
         <!-- TODO: need to add logic to select which of the following to display.  Like certs? -->
             <%
-            testcenter_info = course.testcenter_info
+            exam_info = course.testcenter_info
             %>
-            % if testcenter_info is not None:
-                <%
-                    exam_info = testcenter_info.get('Final_Exam')
-                %>
+            % if exam_info is not None:
                 <p>Exam Series Code: ${exam_info.get('Exam_Series_Code')}</p>
                 <p>First Eligible Appointment Date: ${exam_info.get('First_Eligible_Appointment_Date')}</p>
                 <p>Last Eligible Appointment Date: ${exam_info.get('Last_Eligible_Appointment_Date')}</p>

From d5bd2313c1baaa395bda60868f467577387a4d8b Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Thu, 20 Dec 2012 04:16:00 -0500
Subject: [PATCH 008/541] fix migrations, removing one field and making another
 nullable.  Update registration page to allow for editing only demographics.

---
 ...022_add_more_fields_to_test_center_user.py | 15 ++--
 common/djangoapps/student/models.py           | 13 ++--
 common/djangoapps/student/views.py            | 75 ++++++++++--------
 lms/templates/dashboard.html                  |  3 +-
 lms/templates/test_center_register.html       | 78 ++++++++++++++++---
 5 files changed, 128 insertions(+), 56 deletions(-)

diff --git a/common/djangoapps/student/migrations/0022_add_more_fields_to_test_center_user.py b/common/djangoapps/student/migrations/0022_add_more_fields_to_test_center_user.py
index 4a6481f80c..1bffec2213 100644
--- a/common/djangoapps/student/migrations/0022_add_more_fields_to_test_center_user.py
+++ b/common/djangoapps/student/migrations/0022_add_more_fields_to_test_center_user.py
@@ -13,8 +13,8 @@ class Migration(SchemaMigration):
                       self.gf('django.db.models.fields.CharField')(default='', max_length=20, blank=True),
                       keep_default=False)
 
-        # Adding field 'TestCenterUser.confirmed_at'
-        db.add_column('student_testcenteruser', 'confirmed_at',
+        # Adding field 'TestCenterUser.uploaded_at'
+        db.add_column('student_testcenteruser', 'uploaded_at',
                       self.gf('django.db.models.fields.DateTimeField')(null=True, db_index=True),
                       keep_default=False)
 
@@ -31,14 +31,13 @@ class Migration(SchemaMigration):
             ('created_at', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, db_index=True, blank=True)),
             ('updated_at', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, db_index=True, blank=True)),
             ('user_updated_at', self.gf('django.db.models.fields.DateTimeField')(db_index=True)),
-            ('client_authorization_id', self.gf('django.db.models.fields.CharField')(unique=True, max_length=20, db_index=True)),
             ('exam_series_code', self.gf('django.db.models.fields.CharField')(max_length=15, db_index=True)),
             ('eligibility_appointment_date_first', self.gf('django.db.models.fields.DateField')(db_index=True)),
             ('eligibility_appointment_date_last', self.gf('django.db.models.fields.DateField')(db_index=True)),
             ('accommodation_code', self.gf('django.db.models.fields.CharField')(max_length=64, blank=True)),
             ('accommodation_request', self.gf('django.db.models.fields.CharField')(max_length=1024, blank=True)),
             ('upload_status', self.gf('django.db.models.fields.CharField')(max_length=20, blank=True)),
-            ('confirmed_at', self.gf('django.db.models.fields.DateTimeField')(db_index=True)),
+            ('uploaded_at', self.gf('django.db.models.fields.DateTimeField')(null=True, db_index=True)),
             ('upload_error_message', self.gf('django.db.models.fields.CharField')(max_length=512, blank=True)),
         ))
         db.send_create_signal('student', ['TestCenterRegistration'])
@@ -51,8 +50,8 @@ class Migration(SchemaMigration):
         # Deleting field 'TestCenterUser.upload_status'
         db.delete_column('student_testcenteruser', 'upload_status')
 
-        # Deleting field 'TestCenterUser.confirmed_at'
-        db.delete_column('student_testcenteruser', 'confirmed_at')
+        # Deleting field 'TestCenterUser.uploaded_at'
+        db.delete_column('student_testcenteruser', 'uploaded_at')
 
         # Deleting field 'TestCenterUser.upload_error_message'
         db.delete_column('student_testcenteruser', 'upload_error_message')
@@ -127,7 +126,7 @@ class Migration(SchemaMigration):
             'accommodation_code': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
             'accommodation_request': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}),
             'client_authorization_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20', 'db_index': 'True'}),
-            'confirmed_at': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
+            'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
             'course_id': ('django.db.models.fields.CharField', [], {'max_length': '128', 'db_index': 'True'}),
             'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
             'eligibility_appointment_date_first': ('django.db.models.fields.DateField', [], {'db_index': 'True'}),
@@ -149,7 +148,7 @@ class Migration(SchemaMigration):
             'city': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'}),
             'client_candidate_id': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
             'company_name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
-            'confirmed_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}),
+            'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}),
             'country': ('django.db.models.fields.CharField', [], {'max_length': '3', 'db_index': 'True'}),
             'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
             'extension': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '8', 'blank': 'True'}),
diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index 6b73c2319f..716c472330 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -194,7 +194,7 @@ class TestCenterUser(models.Model):
 
     # Confirmation
     upload_status = models.CharField(max_length=20, blank=True)  # 'Error' or 'Accepted'
-    confirmed_at = models.DateTimeField(null=True, db_index=True)
+    uploaded_at = models.DateTimeField(null=True, db_index=True)
     upload_error_message = models.CharField(max_length=512, blank=True)
     
     @staticmethod
@@ -236,7 +236,7 @@ class TestCenterRegistration(models.Model):
     user_updated_at = models.DateTimeField(db_index=True)
     # "client_authorization_id" is the client's unique identifier for the authorization.  
     # This must be present for an update or delete to be sent to Pearson.
-    client_authorization_id = models.CharField(max_length=20, unique=True, db_index=True)
+    # client_authorization_id = models.CharField(max_length=20, unique=True, db_index=True)
 
     # information about the test, from the course policy:
     exam_series_code = models.CharField(max_length=15, db_index=True)
@@ -250,7 +250,7 @@ class TestCenterRegistration(models.Model):
 
     # Confirmation
     upload_status = models.CharField(max_length=20, blank=True)  # 'Error' or 'Accepted'
-    confirmed_at = models.DateTimeField(db_index=True)
+    uploaded_at = models.DateTimeField(null=True, db_index=True)
     upload_error_message = models.CharField(max_length=512, blank=True)
 
     @property
@@ -261,12 +261,15 @@ class TestCenterRegistration(models.Model):
     def client_candidate_id(self):
         return self.testcenter_user.client_candidate_id
     
-    
+    @property
+    def client_authorization_id(self):
+        # TODO: make this explicitly into a string object:
+        return self.id
 
 def get_testcenter_registrations_for_user_and_course(user, course_id):
     try:
         tcu = TestCenterUser.objects.get(user=user)
-    except User.DoesNotExist:
+    except TestCenterUser.DoesNotExist:
         return []
     return TestCenterRegistration.objects.filter(testcenter_user=tcu, course_id=course_id)
     
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 4d5728792e..62943478a0 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -10,6 +10,7 @@ import sys
 import urllib
 import uuid
 
+
 from django.conf import settings
 from django.contrib.auth import logout, authenticate, login
 from django.contrib.auth.forms import PasswordResetForm
@@ -17,6 +18,7 @@ from django.contrib.auth.models import User
 from django.contrib.auth.decorators import login_required
 from django.core.context_processors import csrf
 from django.core.mail import send_mail
+from django.core.urlresolvers import reverse
 from django.core.validators import validate_email, validate_slug, ValidationError
 from django.db import IntegrityError
 from django.http import HttpResponse, HttpResponseForbidden, Http404,\
@@ -29,7 +31,8 @@ from django.core.cache import cache
 from django_future.csrf import ensure_csrf_cookie, csrf_exempt
 from student.models import (Registration, UserProfile, TestCenterUser, TestCenterRegistration,
                             PendingNameChange, PendingEmailChange,
-                            CourseEnrollment, unique_id_for_user)
+                            CourseEnrollment, unique_id_for_user,
+                            get_testcenter_registrations_for_user_and_course)
 
 from certificates.models import CertificateStatuses, certificate_status_for_student
 
@@ -617,11 +620,7 @@ def begin_test_registration(request, course_id):
         log.error("User {0} enrolled in non-existent course {1}"
                       .format(user.username, course_id))
 
-    # TODO: placeholder for possible messages...
     message = ""
-    if not user.is_active:
-        message = render_to_string('registration/activate_account_notice.html', {'email': user.email})
-
     context = {'course': course,
                'user': user,
                'message': message,
@@ -676,7 +675,7 @@ def _do_create_or_update_test_center_user(post_vars):
         try:
             testcenter_user.save()
         except IntegrityError, ie:
-            message = ie
+            message = "%s" % ie
             context = {'course': course,
                        'user': user,
                        'message': message,
@@ -685,31 +684,45 @@ def _do_create_or_update_test_center_user(post_vars):
             return render_to_response('test_center_register.html', context)
             
     # create and save the registration:
-    registration = TestCenterRegistration(testcenter_user = testcenter_user)
-    registration.course_id = post_vars['course_id']
-    registration.accommodation_request = post_vars['accommodations']
-    exam_info = course.testcenter_info
-    registration.exam_series_code = exam_info.get('Exam_Series_Code')
-    registration.eligibility_appointment_date_first = exam_info.get('First_Eligible_Appointment_Date')
-    registration.eligibility_appointment_date_last = exam_info.get('Last_Eligible_Appointment_Date')
-    # accommodation_code remains blank for now, along with Pearson confirmation
-    registration.user_updated_at = datetime.datetime.now()
-
-    # "client_authorization_id" is the client's unique identifier for the authorization.  
-    # This must be present for an update or delete to be sent to Pearson.
-    registration.client_authorization_id = "1"
-    try:
-        registration.save()
-    except IntegrityError, ie:
-        message = ie
-        context = {'course': course,
-                   'user': user,
-                   'message': message,
-                   'testcenteruser': testcenter_user,
-                   }
-        return render_to_response('test_center_register.html', context)
+    needs_saving = False
+    registrations = get_testcenter_registrations_for_user_and_course(user, course.id)
+    # In future, this should check the exam series code of the registrations, if there
+    # were multiple.
+    if len(registrations) > 0:
+        registration = registrations[0]
+        # check to see if registration changed.  Should check appointment dates too...
+        # And later should check changes in accommodation_code.
+        # But at the moment, we don't expect anything to cause this to change
+        # right now.
+        
+    else:
+        registration = TestCenterRegistration(testcenter_user = testcenter_user)
+        registration.course_id = post_vars['course_id']
+        registration.accommodation_request = post_vars['accommodations']
+        exam_info = course.testcenter_info
+        registration.exam_series_code = exam_info.get('Exam_Series_Code')
+        registration.eligibility_appointment_date_first = exam_info.get('First_Eligible_Appointment_Date')
+        registration.eligibility_appointment_date_last = exam_info.get('Last_Eligible_Appointment_Date')
+        # accommodation_code remains blank for now, along with Pearson confirmation
+        registration.user_updated_at = datetime.datetime.now()
+        needs_saving = True
+        
+    # "client_authorization_id" is the client's unique identifier for the authorization.  
+    # This must be present for an update or delete to be sent to Pearson.  
+    # Can we just use the id field of the registration?  Lets...
+    
+    if needs_saving:
+        try:
+            registration.save()
+        except IntegrityError, ie:
+            message = "%s" % ie
+            context = {'course': course,
+                       'user': user,
+                       'message': message,
+                       'testcenteruser': testcenter_user,
+                       }
+            return render_to_response('test_center_register.html', context)
         
-
     return (user, testcenter_user, registration)
 
 @ensure_csrf_cookie
@@ -778,7 +791,7 @@ def create_test_registration(request, post_override=None):
 
 #    js = {'success': True}
 #    return HttpResponse(json.dumps(js), mimetype="application/json")
-    return HttpResponseRedirect('/dashboard')
+    return HttpResponseRedirect(reverse('dashboard'))
 
 def get_random_post_override():
     """
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index 13e393180a..1f1553d90c 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -234,8 +234,7 @@
                 %>
                 % if len(registrations) == 0:	    
                 <div class="message message-status is-shown exam-register">
-<!--                  <a href="#testcenter-register-modal" rel="leanModal" class="exam-button" data-course-id="${course.id}" data-course-number="${course.number}" id="exam_register_button">Register for Pearson exam</a>
--->                  <a href="${testcenter_register_target}" class="exam-button" id="exam_register_button">Register for Pearson exam</a>
+                      <a href="${testcenter_register_target}" class="exam-button" id="exam_register_button">Register for Pearson exam</a>
                       <p class="message-copy">Registration for the Pearson exam is now open.</p>
                 </div>
                 % else:     
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index 51b271dfc3..8c99b4f8ef 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -3,6 +3,7 @@
   from courseware.courses import course_image_url, get_course_about_section
   from courseware.access import has_access
   from certificates.models import CertificateStatuses
+  from student.models import get_testcenter_registrations_for_user_and_course
 %>
 <%inherit file="main.html" />
 
@@ -34,14 +35,7 @@
   </script>
 </%block>
 
-<section id="testcenter-register" class="">
-    
-    
-  %if message:
-    <section class="dashboard-banner">
-      ${message}
-    </section>
-  %endif
+<section id="testcenter-register" class="">    
 
   <div class="inner-wrapper">
     <div id="register">
@@ -81,7 +75,63 @@
 
       </section>
 
+	<!-- check to see if the user has already registering, or
+	 	 is registering for the first time -->
+	<%	 	 
+	 	registrations = get_testcenter_registrations_for_user_and_course(user, course.id)
+	%>	
+	 
+	% if len(registrations) > 0:
+		<%	 	 
+		 	registration = registrations[0]
+		%>	
 
+		<section><div>Already Registered</div>
+			<p>Here is the current state of your registration, for debugging purposes:</p>
+			<l>
+				<li>id: ${registration.id}</li>
+				<li>testcenter_user_id: ${registration.testcenter_user_id}</li>
+				<li>course_id: ${registration.course_id}</li>
+				<li>accommodation codes: ${registration.accommodation_code}</li>
+				<li>accommodation request: ${registration.accommodation_request}</li>
+				<li>created_at: ${registration.created_at}</li>
+				<li>updated_at: ${registration.updated_at}</li>
+				<li>user_updated_at: ${registration.user_updated_at}</li>
+				<li>upload_status: ${registration.upload_status}</li>
+				<li>upload_error_message: ${registration.upload_error_message}</li>
+			</l>
+			
+			
+			<!-- determine status of registration 
+					doing here for now, but will move into model or view -->
+			<%
+				regstatus = "registration pending acknowledgement by Pearson"
+				
+				if registration.upload_status == 'Accepted':
+					regstatus = "registration approved by Pearson"
+				elif registration.upload_status == 'Error':
+					regstatus = "registration rejected by Pearson: %s" % registration.upload_error_message
+				elif len(registration.accommodation_request) > 0 and registration.accommodation_code == '':
+					regstatus = "pending approval of accommodation request"
+			%>
+			<p>Current status: ${regstatus}</p>				
+			
+			<p>The demographic information provided below was used to register
+			for the exam listed above.  Changes to this information 
+			may be submitted below.</p>
+		</section>
+	% else:
+			<p>The demographic information must be provided below in order to register
+			for the exam listed above.</p>
+	% endif
+
+	<!-- provide mechanism for error messages to appear -->
+  % if message:
+    <section class="">
+      <p>${message}</p>
+    </section>
+  % endif
+	
       <form id="test_register_form" class="test_register_form" method="post" data-remote="true" action="/create_test_registration">
         <div class="notice"></div>
         <!-- TODO: why are both of these here? -->
@@ -91,7 +141,6 @@
         <!-- include these as pass-throughs -->
         <input id="id_email" type="hidden" name="email" maxlength="75" value="${user.email}" />
         <input id="id_username" type="hidden" name="username" maxlength="75" value="${user.username}" />
-        <!-- TODO: add the course somehow... -->
         <input id="id_course_id" type="hidden" name="course_id" maxlength="75" value="${course.id}" />
 
         <div class="input-group">
@@ -150,15 +199,24 @@
           <label data-field="company_name">Company</label>
           <input name="company_name" type="text" value="${testcenteruser.company_name}" placeholder="Acme Corporation">
         </div>
-
+		<div><p>The following is included here just so it can be input within the form.  But it
+			is not part of the demographics, and it is not something that can be changed once input.</p>
+        </div>
         <div class="input-group">
           <label data-field="accommodations">Accommodations Requested</label>
           <textarea name="accommodations"></textarea>
         </div>
 
+	% if len(registrations) > 0:
+        <div class="submit">
+          <input name="submit" type="submit" value="Update demographics">
+        </div>
+    % else: 
         <div class="submit">
           <input name="submit" type="submit" value="Register for Test">
         </div>
+    % endif
+    
       </form>
 
     </div>

From 5119257f3e2ef7357b541ad18fa736f19b5e47f1 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Thu, 20 Dec 2012 12:24:31 -0500
Subject: [PATCH 009/541] test center - fixed dashboard link font issue and
 started cleaning up markup in reg form - wip

---
 lms/static/sass/application.scss            |   1 +
 lms/static/sass/multicourse/_dashboard.scss |   4 +
 lms/templates/test_center_register.html     | 309 +++++++++-----------
 3 files changed, 150 insertions(+), 164 deletions(-)

diff --git a/lms/static/sass/application.scss b/lms/static/sass/application.scss
index 944d3b2884..4e532cf30e 100644
--- a/lms/static/sass/application.scss
+++ b/lms/static/sass/application.scss
@@ -19,6 +19,7 @@
 
 @import 'multicourse/home';
 @import 'multicourse/dashboard';
+@import 'multicourse/testcenter-register';
 @import 'multicourse/courses';
 @import 'multicourse/course_about';
 @import 'multicourse/jobs';
diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss
index 249e8a0513..8383b01a54 100644
--- a/lms/static/sass/multicourse/_dashboard.scss
+++ b/lms/static/sass/multicourse/_dashboard.scss
@@ -418,6 +418,10 @@
         font-size: 13px;
         margin: 0;
 
+        a {
+          font-family: $sans-serif;
+        }
+
         .grade-value {
           font-size: 1.2rem;
           font-weight: bold;
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index 8c99b4f8ef..f1b071d121 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -9,7 +9,7 @@
 
 <%namespace name='static' file='static_content.html'/>
 
-<%block name="title"><title>Sign Up for Pearson VUE Test Center Proctoring</title></%block>
+<%block name="title"><title>Pearson VUE Test Center Proctoring - Sign Up</title></%block>
 
 <%block name="js_extra">
   <script type="text/javascript">
@@ -35,45 +35,37 @@
   </script>
 </%block>
 
-<section id="testcenter-register" class="">    
+<section class="testcenter-register container">    
 
-  <div class="inner-wrapper">
-    <div id="register">
-      <header>
-        <h2></h2>
-        <hr>
-      </header>
+  <!-- display stuff about the exam and the course for which the user is registering.  
+       If the user has already registered in the past for a test center, then also display
+       their ID. -->
 
-      <!-- display stuff about the exam and the course for which the user is registering.  
-           If the user has already registered in the past for a test center, then also display
-           their ID. -->
+  <section class="info">
+    <hgroup>
+      <p class="date-block">
+        % if course.has_ended():
+        Course Completed - ${course.end_date_text}
+        % elif course.has_started():
+        Course Started - ${course.start_date_text}
+        % else:   # hasn't started yet
+        Course Starts - ${course.start_date_text}
+        % endif
+        </p>
+        <h2 class="university">${get_course_about_section(course, 'university')}</h2>
+        <h3>${course.number} ${course.title}</h3>
+    </hgroup>
 
-      <section class="info">
-        <hgroup>
-          <p class="date-block">
-              % if course.has_ended():
-              Course Completed - ${course.end_date_text}
-              % elif course.has_started():
-              Course Started - ${course.start_date_text}
-              % else:   # hasn't started yet
-              Course Starts - ${course.start_date_text}
-              % endif
-              </p>
-              <h2 class="university">${get_course_about_section(course, 'university')}</h2>
-              <h3>${course.number} ${course.title}</h3>
-        </hgroup>
-
-        <!-- TODO: need to add logic to select which of the following to display.  Like certs? -->
-            <%
-            exam_info = course.testcenter_info
-            %>
-            % if exam_info is not None:
-                <p>Exam Series Code: ${exam_info.get('Exam_Series_Code')}</p>
-                <p>First Eligible Appointment Date: ${exam_info.get('First_Eligible_Appointment_Date')}</p>
-                <p>Last Eligible Appointment Date: ${exam_info.get('Last_Eligible_Appointment_Date')}</p>
-            % endif
-
-      </section>
+    <!-- TODO: need to add logic to select which of the following to display.  Like certs? -->
+    <%
+    exam_info = course.testcenter_info
+    %>
+    % if exam_info is not None:
+        <p>Exam Series Code: ${exam_info.get('Exam_Series_Code')}</p>
+        <p>First Eligible Appointment Date: ${exam_info.get('First_Eligible_Appointment_Date')}</p>
+        <p>Last Eligible Appointment Date: ${exam_info.get('Last_Eligible_Appointment_Date')}</p>
+    % endif
+  </section>
 
 	<!-- check to see if the user has already registering, or
 	 	 is registering for the first time -->
@@ -86,40 +78,41 @@
 		 	registration = registrations[0]
 		%>	
 
-		<section><div>Already Registered</div>
-			<p>Here is the current state of your registration, for debugging purposes:</p>
-			<l>
-				<li>id: ${registration.id}</li>
-				<li>testcenter_user_id: ${registration.testcenter_user_id}</li>
-				<li>course_id: ${registration.course_id}</li>
-				<li>accommodation codes: ${registration.accommodation_code}</li>
-				<li>accommodation request: ${registration.accommodation_request}</li>
-				<li>created_at: ${registration.created_at}</li>
-				<li>updated_at: ${registration.updated_at}</li>
-				<li>user_updated_at: ${registration.user_updated_at}</li>
-				<li>upload_status: ${registration.upload_status}</li>
-				<li>upload_error_message: ${registration.upload_error_message}</li>
-			</l>
+	<section><div>Already Registered</div>
+		<p>Here is the current state of your registration, for debugging purposes:</p>
+		<l>
+			<li>id: ${registration.id}</li>
+			<li>testcenter_user_id: ${registration.testcenter_user_id}</li>
+			<li>course_id: ${registration.course_id}</li>
+			<li>accommodation codes: ${registration.accommodation_code}</li>
+			<li>accommodation request: ${registration.accommodation_request}</li>
+			<li>created_at: ${registration.created_at}</li>
+			<li>updated_at: ${registration.updated_at}</li>
+			<li>user_updated_at: ${registration.user_updated_at}</li>
+			<li>upload_status: ${registration.upload_status}</li>
+			<li>upload_error_message: ${registration.upload_error_message}</li>
+		</l>
+		
+		
+		<!-- determine status of registration 
+				doing here for now, but will move into model or view -->
+		<%
+			regstatus = "registration pending acknowledgement by Pearson"
 			
-			
-			<!-- determine status of registration 
-					doing here for now, but will move into model or view -->
-			<%
-				regstatus = "registration pending acknowledgement by Pearson"
-				
-				if registration.upload_status == 'Accepted':
-					regstatus = "registration approved by Pearson"
-				elif registration.upload_status == 'Error':
-					regstatus = "registration rejected by Pearson: %s" % registration.upload_error_message
-				elif len(registration.accommodation_request) > 0 and registration.accommodation_code == '':
-					regstatus = "pending approval of accommodation request"
-			%>
-			<p>Current status: ${regstatus}</p>				
-			
-			<p>The demographic information provided below was used to register
-			for the exam listed above.  Changes to this information 
-			may be submitted below.</p>
-		</section>
+			if registration.upload_status == 'Accepted':
+				regstatus = "registration approved by Pearson"
+			elif registration.upload_status == 'Error':
+				regstatus = "registration rejected by Pearson: %s" % registration.upload_error_message
+			elif len(registration.accommodation_request) > 0 and registration.accommodation_code == '':
+				regstatus = "pending approval of accommodation request"
+		%>
+		<p>Current status: ${regstatus}</p>				
+		
+		<p>The demographic information provided below was used to register
+		for the exam listed above.  Changes to this information 
+		may be submitted below.</p>
+	</section>
+  
 	% else:
 			<p>The demographic information must be provided below in order to register
 			for the exam listed above.</p>
@@ -127,106 +120,94 @@
 
 	<!-- provide mechanism for error messages to appear -->
   % if message:
-    <section class="">
-      <p>${message}</p>
-    </section>
+  <div id="register_error" name="register_error">
+    <p>${message}</p>
+  </div> 
   % endif
 	
-      <form id="test_register_form" class="test_register_form" method="post" data-remote="true" action="/create_test_registration">
-        <div class="notice"></div>
-        <!-- TODO: why are both of these here? -->
-        <div id="register_error" class="modal-form-error" name="register_error"></div>
-        <div id="register_error" name="register_error"></div>
-
-        <!-- include these as pass-throughs -->
-        <input id="id_email" type="hidden" name="email" maxlength="75" value="${user.email}" />
-        <input id="id_username" type="hidden" name="username" maxlength="75" value="${user.username}" />
-        <input id="id_course_id" type="hidden" name="course_id" maxlength="75" value="${course.id}" />
-
-        <div class="input-group">
-          <label data-field="salutation">Salutation</label>
-          <input name="salutation" type="text" value="${testcenteruser.salutation}" placeholder="e.g. Dr.">
-          <br>
-          <label data-field="first_name">First Name*</label>
-          <input name="first_name" type="text" value="${testcenteruser.first_name}" maxlength="30" placeholder="e.g. Jane">
-          <br>
-          <label data-field="middle_name">Middle Name</label>
-          <input name="middle_name" type="text" value="${testcenteruser.middle_name}" placeholder="e.g. Michael">
-          <br>
-          <label data-field="last_name">Last Name*</label>
-          <input name="last_name" type="text" value="${testcenteruser.last_name}" placeholder="e.g. Smith">
-          <br>
-          <label data-field="suffix">Suffix</label>
-          <input name="suffix" type="text" value="${testcenteruser.suffix}" placeholder="e.g. Jr.">
-          <br>
-        </div>
-
-        <div class="input-group">
-          <label data-field="address_1">Address1*</label>
-          <input name="address_1" type="text" value="${testcenteruser.address_1}" placeholder="123 Main St.">
-          <br>
-          <label data-field="address_2">Address2</label>
-          <input name="address_2" type="text" value="${testcenteruser.address_2}" placeholder="Apartment 2B.">
-          <br>
-          <label data-field="address_3">Address3</label>
-          <input name="address_3" type="text" value="${testcenteruser.address_3}" placeholder="Attention: John Smith">
-          <br>
-
-          <label data-field="city">City</label>
-          <input name="city" type="text" value="${testcenteruser.city}" placeholder="Our Fair City">
-          <label data-field="state">State/Province</label>
-          <input name="state" type="text" value="${testcenteruser.state}" placeholder="MA">
-          <br>
-          <label data-field="postal_code">Postal Code</label>
-          <input name="postal_code" type="text" value="${testcenteruser.postal_code}" placeholder="02138">
-          <label data-field="country">Country Code*</label>
-          <input name="country" type="text" value="${testcenteruser.country}" placeholder="USA">
-        </div>
-
-        <div class="input-group">
-          <label data-field="phone">Phone*</label>
-          <input name="phone" type="text" value="${testcenteruser.phone}" placeholder="1-23-456-7890">
-          <label data-field="phone">Extension</label>
-          <input name="extension" type="text" value="${testcenteruser.extension}" placeholder="x123">
-          <label data-field="phone_country_code">Phone Country Code*</label>
-          <input name="phone_country_code" type="text" value="${testcenteruser.phone_country_code}" placeholder="ABC">
-          <br>
-          <label data-field="fax">Fax</label>
-          <input name="fax" type="text" value="${testcenteruser.fax}" placeholder="1-23-456-7891">
-          <label data-field="fax_country_code">Fax Country Code*</label>
-          <input name="fax_country_code" type="text" value="${testcenteruser.fax_country_code}" placeholder="ABC">
-          <br>
-          <label data-field="company_name">Company</label>
-          <input name="company_name" type="text" value="${testcenteruser.company_name}" placeholder="Acme Corporation">
-        </div>
-		<div><p>The following is included here just so it can be input within the form.  But it
-			is not part of the demographics, and it is not something that can be changed once input.</p>
-        </div>
-        <div class="input-group">
-          <label data-field="accommodations">Accommodations Requested</label>
-          <textarea name="accommodations"></textarea>
-        </div>
-
-	% if len(registrations) > 0:
-        <div class="submit">
-          <input name="submit" type="submit" value="Update demographics">
-        </div>
-    % else: 
-        <div class="submit">
-          <input name="submit" type="submit" value="Register for Test">
-        </div>
-    % endif
+  <form id="testcenter-register-form" method="post" data-remote="true" action="/create_test_registration">
     
-      </form>
+    <!-- include these as pass-throughs -->
+    <input id="id_email" type="hidden" name="email" maxlength="75" value="${user.email}" />
+    <input id="id_username" type="hidden" name="username" maxlength="75" value="${user.username}" />
+    <input id="id_course_id" type="hidden" name="course_id" maxlength="75" value="${course.id}" />
 
+    <div class="input-group">
+      <label data-field="salutation">Salutation</label>
+      <input name="salutation" type="text" value="${testcenteruser.salutation}" placeholder="e.g. Dr.">
+      <br>
+      <label data-field="first_name">First Name*</label>
+      <input name="first_name" type="text" value="${testcenteruser.first_name}" maxlength="30" placeholder="e.g. Jane">
+      <br>
+      <label data-field="middle_name">Middle Name</label>
+      <input name="middle_name" type="text" value="${testcenteruser.middle_name}" placeholder="e.g. Michael">
+      <br>
+      <label data-field="last_name">Last Name*</label>
+      <input name="last_name" type="text" value="${testcenteruser.last_name}" placeholder="e.g. Smith">
+      <br>
+      <label data-field="suffix">Suffix</label>
+      <input name="suffix" type="text" value="${testcenteruser.suffix}" placeholder="e.g. Jr.">
+      <br>
     </div>
-<!--
-    <div class="close-modal">
-      <div class="inner">
-        <p>&#10005;</p>
-      </div>
-    </div> -->
+
+    <div class="input-group">
+      <label data-field="address_1">Address1*</label>
+      <input name="address_1" type="text" value="${testcenteruser.address_1}" placeholder="123 Main St.">
+      <br>
+      <label data-field="address_2">Address2</label>
+      <input name="address_2" type="text" value="${testcenteruser.address_2}" placeholder="Apartment 2B.">
+      <br>
+      <label data-field="address_3">Address3</label>
+      <input name="address_3" type="text" value="${testcenteruser.address_3}" placeholder="Attention: John Smith">
+      <br>
+
+      <label data-field="city">City</label>
+      <input name="city" type="text" value="${testcenteruser.city}" placeholder="Our Fair City">
+      <label data-field="state">State/Province</label>
+      <input name="state" type="text" value="${testcenteruser.state}" placeholder="MA">
+      <br>
+      <label data-field="postal_code">Postal Code</label>
+      <input name="postal_code" type="text" value="${testcenteruser.postal_code}" placeholder="02138">
+      <label data-field="country">Country Code*</label>
+      <input name="country" type="text" value="${testcenteruser.country}" placeholder="USA">
+    </div>
+
+    <div class="input-group">
+      <label data-field="phone">Phone*</label>
+      <input name="phone" type="text" value="${testcenteruser.phone}" placeholder="1-23-456-7890">
+      <label data-field="phone">Extension</label>
+      <input name="extension" type="text" value="${testcenteruser.extension}" placeholder="x123">
+      <label data-field="phone_country_code">Phone Country Code*</label>
+      <input name="phone_country_code" type="text" value="${testcenteruser.phone_country_code}" placeholder="ABC">
+      <br>
+      <label data-field="fax">Fax</label>
+      <input name="fax" type="text" value="${testcenteruser.fax}" placeholder="1-23-456-7891">
+      <label data-field="fax_country_code">Fax Country Code*</label>
+      <input name="fax_country_code" type="text" value="${testcenteruser.fax_country_code}" placeholder="ABC">
+      <br>
+      <label data-field="company_name">Company</label>
+      <input name="company_name" type="text" value="${testcenteruser.company_name}" placeholder="Acme Corporation">
+    </div>
+	<div>
+   
+  <p>The following is included here just so it can be input within the form.  But it is not part of the demographics, and it is not something that can be changed once input.</p>
+  
+  <div class="input-group">
+    <label data-field="accommodations">Accommodations Requested</label>
+    <textarea name="accommodations"></textarea>
   </div>
+
+% if len(registrations) > 0:
+  <div class="submit">
+    <input name="submit" type="submit" value="Update demographics">
+  </div>
+  % else: 
+  <div class="submit">
+    <input name="submit" type="submit" value="Register for Test">
+  </div>
+  % endif
+    
+  </form>
 </section>
 
 

From 76f6ee18772d905033d2ff65218f9ca8c3dd2588 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Thu, 20 Dec 2012 13:00:08 -0500
Subject: [PATCH 010/541] test center - reorg of HTML - wip

---
 lms/templates/test_center_register.html | 132 ++++++++++++++----------
 1 file changed, 78 insertions(+), 54 deletions(-)

diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index f1b071d121..8d5f7cb206 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -35,13 +35,17 @@
   </script>
 </%block>
 
+<%
+exam_info = course.testcenter_info
+%>
+
 <section class="testcenter-register container">    
 
   <!-- display stuff about the exam and the course for which the user is registering.  
        If the user has already registered in the past for a test center, then also display
        their ID. -->
 
-  <section class="info">
+  <section class="output-raw">
     <hgroup>
       <p class="date-block">
         % if course.has_ended():
@@ -57,66 +61,86 @@
     </hgroup>
 
     <!-- TODO: need to add logic to select which of the following to display.  Like certs? -->
-    <%
-    exam_info = course.testcenter_info
-    %>
     % if exam_info is not None:
         <p>Exam Series Code: ${exam_info.get('Exam_Series_Code')}</p>
         <p>First Eligible Appointment Date: ${exam_info.get('First_Eligible_Appointment_Date')}</p>
         <p>Last Eligible Appointment Date: ${exam_info.get('Last_Eligible_Appointment_Date')}</p>
     % endif
+    
+    <!-- check to see if the user has already registering, or
+       is registering for the first time -->
+    <%     
+      registrations = get_testcenter_registrations_for_user_and_course(user, course.id)
+    %>  
+     
+    % if len(registrations) > 0:
+      <%     
+        registration = registrations[0]
+      %>  
+
+    <section><div>Already Registered</div>
+      <p>Here is the current state of your registration, for debugging purposes:</p>
+      <l>
+        <li>id: ${registration.id}</li>
+        <li>testcenter_user_id: ${registration.testcenter_user_id}</li>
+        <li>course_id: ${registration.course_id}</li>
+        <li>accommodation codes: ${registration.accommodation_code}</li>
+        <li>accommodation request: ${registration.accommodation_request}</li>
+        <li>created_at: ${registration.created_at}</li>
+        <li>updated_at: ${registration.updated_at}</li>
+        <li>user_updated_at: ${registration.user_updated_at}</li>
+        <li>upload_status: ${registration.upload_status}</li>
+        <li>upload_error_message: ${registration.upload_error_message}</li>
+      </l>
+      
+      
+      <!-- determine status of registration 
+          doing here for now, but will move into model or view -->
+      <%
+        regstatus = "registration pending acknowledgement by Pearson"
+        
+        if registration.upload_status == 'Accepted':
+          regstatus = "registration approved by Pearson"
+        elif registration.upload_status == 'Error':
+          regstatus = "registration rejected by Pearson: %s" % registration.upload_error_message
+        elif len(registration.accommodation_request) > 0 and registration.accommodation_code == '':
+          regstatus = "pending approval of accommodation request"
+      %>
+      <p>Current status: ${regstatus}</p>       
+      
+      <p>The demographic information provided below was used to register
+      for the exam listed above.  Changes to this information 
+      may be submitted below.</p>
+    </section>
+     
+    % else:
+        <p>The demographic information must be provided below in order to register
+        for the exam listed above.</p>
+    % endif
   </section>
-
-	<!-- check to see if the user has already registering, or
-	 	 is registering for the first time -->
-	<%	 	 
-	 	registrations = get_testcenter_registrations_for_user_and_course(user, course.id)
-	%>	
-	 
-	% if len(registrations) > 0:
-		<%	 	 
-		 	registration = registrations[0]
-		%>	
-
-	<section><div>Already Registered</div>
-		<p>Here is the current state of your registration, for debugging purposes:</p>
-		<l>
-			<li>id: ${registration.id}</li>
-			<li>testcenter_user_id: ${registration.testcenter_user_id}</li>
-			<li>course_id: ${registration.course_id}</li>
-			<li>accommodation codes: ${registration.accommodation_code}</li>
-			<li>accommodation request: ${registration.accommodation_request}</li>
-			<li>created_at: ${registration.created_at}</li>
-			<li>updated_at: ${registration.updated_at}</li>
-			<li>user_updated_at: ${registration.user_updated_at}</li>
-			<li>upload_status: ${registration.upload_status}</li>
-			<li>upload_error_message: ${registration.upload_error_message}</li>
-		</l>
-		
-		
-		<!-- determine status of registration 
-				doing here for now, but will move into model or view -->
-		<%
-			regstatus = "registration pending acknowledgement by Pearson"
-			
-			if registration.upload_status == 'Accepted':
-				regstatus = "registration approved by Pearson"
-			elif registration.upload_status == 'Error':
-				regstatus = "registration rejected by Pearson: %s" % registration.upload_error_message
-			elif len(registration.accommodation_request) > 0 and registration.accommodation_code == '':
-				regstatus = "pending approval of accommodation request"
-		%>
-		<p>Current status: ${regstatus}</p>				
-		
-		<p>The demographic information provided below was used to register
-		for the exam listed above.  Changes to this information 
-		may be submitted below.</p>
-	</section>
   
-	% else:
-			<p>The demographic information must be provided below in order to register
-			for the exam listed above.</p>
-	% endif
+  <section class="introduction">
+    <header>
+      <hgroup>
+        <h2>${get_course_about_section(course, 'university')} ${course.number} ${course.title}</h2>      
+        <h1>Register for a Pearson VUE Proctored Exam</h1>
+      </hgroup>
+      
+      <span class="date">
+        % if course.has_ended():
+        <span class="date-title">Course Completed:</span> <span class="date-value">${course.end_date_text}</span>
+        % elif course.has_started():
+        <span class="date-title">Course Started:</span> <span class="date-value">${course.start_date_text}</span>
+        % else:   # hasn't started yet
+        <span class="date-title">Course Starts:</span> <span class="date-value">${course.start_date_text}</span>
+        % endif
+      </span>    
+    </header>
+    
+    <div class="status">
+      
+    </div>
+  </section>
 
 	<!-- provide mechanism for error messages to appear -->
   % if message:

From 2788ad8629d8f0371339543df5d8c3e921a73882 Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Fri, 21 Dec 2012 01:39:18 -0500
Subject: [PATCH 011/541] switch back to returning json to test_center_register
 template, and enable jquery handling in template.

---
 common/djangoapps/student/views.py      | 40 ++++++++++++-------------
 lms/templates/test_center_register.html | 16 ++++------
 2 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 62943478a0..29d8a206cb 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -675,13 +675,18 @@ def _do_create_or_update_test_center_user(post_vars):
         try:
             testcenter_user.save()
         except IntegrityError, ie:
-            message = "%s" % ie
-            context = {'course': course,
-                       'user': user,
-                       'message': message,
-                       'testcenteruser': testcenter_user,
-                       }
-            return render_to_response('test_center_register.html', context)
+            js = {'success': False}
+            error_msg = unicode(ie);
+            # attempt to find a field name to signal    
+            for fieldname in TestCenterUser.user_provided_fields():
+                if error_msg.find(fieldname) >= 0: 
+                    js['value'] = error_msg
+                    js['field'] = fieldname
+                    return HttpResponse(json.dumps(js))
+            # otherwise just return the error message        
+            js['value'] = error_msg
+            js['field'] = "General Error"
+            return HttpResponse(json.dumps(js))
             
     # create and save the registration:
     needs_saving = False
@@ -715,13 +720,7 @@ def _do_create_or_update_test_center_user(post_vars):
         try:
             registration.save()
         except IntegrityError, ie:
-            message = "%s" % ie
-            context = {'course': course,
-                       'user': user,
-                       'message': message,
-                       'testcenteruser': testcenter_user,
-                       }
-            return render_to_response('test_center_register.html', context)
+            raise
         
     return (user, testcenter_user, registration)
 
@@ -743,14 +742,14 @@ def create_test_registration(request, post_override=None):
             js['field'] = a
             return HttpResponse(json.dumps(js))
 
-    # Confirm appropriate fields are there.
+    # Confirm appropriate fields are filled in with something for now
     for a in ['first_name', 'last_name', 'address_1', 'city', 'country']:
         if len(post_vars[a]) < 2:
             error_str = {'first_name': 'First name must be minimum of two characters long.',
                          'last_name': 'Last name must be minimum of two characters long.',
-                         'address_1': 'Last name must be minimum of two characters long.',
-                         'city': 'Last name must be minimum of two characters long.',
-                         'country': 'Last name must be minimum of two characters long.',
+                         'address_1': 'Address must be minimum of two characters long.',
+                         'city': 'City must be minimum of two characters long.',
+                         'country': 'Country must be minimum of two characters long.',
                          }
             js['value'] = error_str[a]
             js['field'] = a
@@ -789,9 +788,8 @@ def create_test_registration(request, post_override=None):
     # TODO: enable appropriate stat
     # statsd.increment("common.student.account_created")
 
-#    js = {'success': True}
-#    return HttpResponse(json.dumps(js), mimetype="application/json")
-    return HttpResponseRedirect(reverse('dashboard'))
+    js = {'success': True}
+    return HttpResponse(json.dumps(js), mimetype="application/json")
 
 def get_random_post_override():
     """
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index 8c99b4f8ef..b4d47bf487 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -15,19 +15,13 @@
   <script type="text/javascript">
   (function() {
 
-    $(".unenroll").click(function(event) {
-      $("#unenroll_course_id").val( $(event.target).data("course-id") );
-      $("#unenroll_course_number").text( $(event.target).data("course-number") );
-    });
-
-    $(document).delegate('#unenroll_form', 'ajax:success', function(data, json, xhr) {
+    $(document).on('ajax:success', '#test_register_form', function(data, json, xhr) {
       if(json.success) {
         location.href="${reverse('dashboard')}";
       } else {
-        if($('#unenroll_error').length == 0) {
-          $('#unenroll_form').prepend('<div id="unenroll_error" class="modal-form-error"></div>');
-        }
-        $('#unenroll_error').text(json.error).stop().css("display", "block");
+        $(".field-error").removeClass('field-error');
+        $('#register_error').html(json.value).stop().css("display", "block");
+        $("[data-field='"+json.field+"']").addClass('field-error')
       }
     });
 
@@ -231,4 +225,4 @@
 
 
  
- 
\ No newline at end of file
+ 

From 3987120496750a0d6050f41c22cee035e2cf3bef Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Fri, 21 Dec 2012 13:04:22 -0500
Subject: [PATCH 012/541] test center registration - further UI design and
 styling on form and dashboard tweaks

---
 lms/static/sass/multicourse/_dashboard.scss |   5 +
 lms/templates/dashboard.html                |   2 +-
 lms/templates/test_center_register.html     | 351 ++++++++++++++------
 3 files changed, 253 insertions(+), 105 deletions(-)

diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss
index 8383b01a54..90a9d7239b 100644
--- a/lms/static/sass/multicourse/_dashboard.scss
+++ b/lms/static/sass/multicourse/_dashboard.scss
@@ -478,9 +478,14 @@
       .exam-registration-number {
         font-family: $sans-serif;
         font-size: 18px;
+
+        a {
+          font-family: $sans-serif;
+        }
       }
 
       &.exam-register {
+
         .message-copy {
           margin-top: 5px;
         }
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index 1f1553d90c..384ffec0ac 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -247,7 +247,7 @@
                 <div class="message message-status is-shown exam-schedule">
                 	<!-- TODO: pull Pearson destination out into a Setting -->
                    <a href="https://www1.pearsonvue.com/testtaker/signin/SignInPage/EDX" class="exam-button">Schedule Pearson exam</a>
-                   <p class="exam-registration-number">Registration number: <strong>edx00015879548</strong></p>
+                   <p class="exam-registration-number"><a href="${testcenter_register_target}" id="exam_register_link">Registration</a> number: <strong>edx00015879548</strong></p>
                    <p class="message-copy">Write this down! You’ll need it to schedule your exam.</p>
                 </div>
                 % endif
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index 8d5f7cb206..e9e9539d2f 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -123,117 +123,260 @@ exam_info = course.testcenter_info
     <header>
       <hgroup>
         <h2>${get_course_about_section(course, 'university')} ${course.number} ${course.title}</h2>      
+        
+        % if len(registrations) > 0:
+        <h1>Your Pearson VUE Proctored Exam Registration</h1>
+        % else: 
         <h1>Register for a Pearson VUE Proctored Exam</h1>
-      </hgroup>
-      
-      <span class="date">
-        % if course.has_ended():
-        <span class="date-title">Course Completed:</span> <span class="date-value">${course.end_date_text}</span>
-        % elif course.has_started():
-        <span class="date-title">Course Started:</span> <span class="date-value">${course.start_date_text}</span>
-        % else:   # hasn't started yet
-        <span class="date-title">Course Starts:</span> <span class="date-value">${course.start_date_text}</span>
         % endif
-      </span>    
+      </hgroup>
     </header>
+  </section>
+  
+  <section class="status">
     
-    <div class="status">
-      
+    <!-- NOTE: BT - registration data updated confirmation message - in case upon successful submit we're directing folks back to this view -->
+    <div class="message message-status submission-saved is-shown">
+      <p class="message-copy">Your registration data has been updated and saved.</p>
+    </div>
+    
+    <!-- NOTE: BT - registration error message  -->
+    <!-- provide mechanism for error messages to appear -->
+    % if message:
+    <div class="message message-status submission-error">
+      <p class="message-copy">${message}</p>
+    </div> 
+    % endif
+    
+    <!-- NOTE: BT - Sample markup for error message -->
+    <div class="message message-status submission-error is-shown">
+      <p class="message-copy">We're Sorry, but there was an error with the information you provided below:</p>
     </div>
   </section>
-
-	<!-- provide mechanism for error messages to appear -->
-  % if message:
-  <div id="register_error" name="register_error">
-    <p>${message}</p>
-  </div> 
-  % endif
-	
-  <form id="testcenter-register-form" method="post" data-remote="true" action="/create_test_registration">
-    
-    <!-- include these as pass-throughs -->
-    <input id="id_email" type="hidden" name="email" maxlength="75" value="${user.email}" />
-    <input id="id_username" type="hidden" name="username" maxlength="75" value="${user.username}" />
-    <input id="id_course_id" type="hidden" name="course_id" maxlength="75" value="${course.id}" />
-
-    <div class="input-group">
-      <label data-field="salutation">Salutation</label>
-      <input name="salutation" type="text" value="${testcenteruser.salutation}" placeholder="e.g. Dr.">
-      <br>
-      <label data-field="first_name">First Name*</label>
-      <input name="first_name" type="text" value="${testcenteruser.first_name}" maxlength="30" placeholder="e.g. Jane">
-      <br>
-      <label data-field="middle_name">Middle Name</label>
-      <input name="middle_name" type="text" value="${testcenteruser.middle_name}" placeholder="e.g. Michael">
-      <br>
-      <label data-field="last_name">Last Name*</label>
-      <input name="last_name" type="text" value="${testcenteruser.last_name}" placeholder="e.g. Smith">
-      <br>
-      <label data-field="suffix">Suffix</label>
-      <input name="suffix" type="text" value="${testcenteruser.suffix}" placeholder="e.g. Jr.">
-      <br>
-    </div>
-
-    <div class="input-group">
-      <label data-field="address_1">Address1*</label>
-      <input name="address_1" type="text" value="${testcenteruser.address_1}" placeholder="123 Main St.">
-      <br>
-      <label data-field="address_2">Address2</label>
-      <input name="address_2" type="text" value="${testcenteruser.address_2}" placeholder="Apartment 2B.">
-      <br>
-      <label data-field="address_3">Address3</label>
-      <input name="address_3" type="text" value="${testcenteruser.address_3}" placeholder="Attention: John Smith">
-      <br>
-
-      <label data-field="city">City</label>
-      <input name="city" type="text" value="${testcenteruser.city}" placeholder="Our Fair City">
-      <label data-field="state">State/Province</label>
-      <input name="state" type="text" value="${testcenteruser.state}" placeholder="MA">
-      <br>
-      <label data-field="postal_code">Postal Code</label>
-      <input name="postal_code" type="text" value="${testcenteruser.postal_code}" placeholder="02138">
-      <label data-field="country">Country Code*</label>
-      <input name="country" type="text" value="${testcenteruser.country}" placeholder="USA">
-    </div>
-
-    <div class="input-group">
-      <label data-field="phone">Phone*</label>
-      <input name="phone" type="text" value="${testcenteruser.phone}" placeholder="1-23-456-7890">
-      <label data-field="phone">Extension</label>
-      <input name="extension" type="text" value="${testcenteruser.extension}" placeholder="x123">
-      <label data-field="phone_country_code">Phone Country Code*</label>
-      <input name="phone_country_code" type="text" value="${testcenteruser.phone_country_code}" placeholder="ABC">
-      <br>
-      <label data-field="fax">Fax</label>
-      <input name="fax" type="text" value="${testcenteruser.fax}" placeholder="1-23-456-7891">
-      <label data-field="fax_country_code">Fax Country Code*</label>
-      <input name="fax_country_code" type="text" value="${testcenteruser.fax_country_code}" placeholder="ABC">
-      <br>
-      <label data-field="company_name">Company</label>
-      <input name="company_name" type="text" value="${testcenteruser.company_name}" placeholder="Acme Corporation">
-    </div>
-	<div>
-   
-  <p>The following is included here just so it can be input within the form.  But it is not part of the demographics, and it is not something that can be changed once input.</p>
   
-  <div class="input-group">
-    <label data-field="accommodations">Accommodations Requested</label>
-    <textarea name="accommodations"></textarea>
-  </div>
+  <section class="content">
+    <header>
+      <h3 class="is-hidden">Registration Form</h3>
+    </header>      
+    <form id="testcenter-register-form" method="post" data-remote="true" action="/create_test_registration">
+      
+      % if len(registrations) > 0:
+      <p class="instructions">
+        Please complete the following form to update your demographic information used in your Pearson VUE Porctored Exam. Required fields are noted by <strong>bold text and an asterisk (*)</strong>. 
+      </p>
+      % else: 
+      <p class="instructions">
+        Please provide the following demographic information to register for a Pearson VUE Porctored Exam. Required fields are noted by <strong>bold text and an asterisk (*)</strong>.
+      </p>
+      % endif
+            
+      <!-- include these as pass-throughs -->
+      <input id="id_email" type="hidden" name="email" maxlength="75" value="${user.email}" />
+      <input id="id_username" type="hidden" name="username" maxlength="75" value="${user.username}" />
+      <input id="id_course_id" type="hidden" name="course_id" maxlength="75" value="${course.id}" />
 
-% if len(registrations) > 0:
-  <div class="submit">
-    <input name="submit" type="submit" value="Update demographics">
-  </div>
-  % else: 
-  <div class="submit">
-    <input name="submit" type="submit" value="Register for Test">
-  </div>
-  % endif
+      <div class="form-fields-primary">
+        <fieldset class="group group-form group-form-personalinformation">
+          <legend class="is-hidden">Personal Information</legend>
+          
+          <ol class="list-input">
+            <li class="field">
+              <label for="salutation">Salutation</label>
+              <input class="short" id="salutation" type="text" value="${testcenteruser.salutation}" placeholder="e.g. Mr., Ms., Mrs., Dr." />              
+            </li>
+            <!-- NOTE: BT - to inform a user of what field the error occured on, add a class of .error to the .field element -->
+            <li class="field required">
+              <label for="name-first">First Name </label>
+              <input id="name-first" type="text" value="${testcenteruser.first_name}" placeholder="e.g. Albert" />
+            </li>
+            <li class="field">
+              <label for="name-middle">Middle Name</label>
+              <input id="name-middle" type="text" value="${testcenteruser.middle_name}" placeholder="" />
+            </li>
+            <li class="field required">
+              <label for="name-last">Last Name</label>
+              <input id="name-last" type="text" value="${testcenteruser.last_name}" placeholder="e.g. Einstein" />
+            </li>
+            <li class="field">
+              <label for="name-suffix">Suffix</label>
+              <input class="short" id="name-suffix" type="text" value="${testcenteruser.suffix}" placeholder="e.g. Jr., Sr. " />
+            </li>
+          </ol>
+        </fieldset>
+        
+        <fieldset class="group group-form group-form-mailingaddress">
+          <legend class="is-hidden">Mailing Address</legend>
+          
+          <ol class="list-input">
+            <li class="field">
+              <label class="long" for="address-1">Address Line #1</label>
+              <input id="address-1" type="text" value="${testcenteruser.address_1}" placeholder="e.g. 112 Mercer Street" />              
+            </li>
+            <li class="field-group addresses">
+              <div class="field">
+                <label for="address-2">Address Line #2</label>
+                <input id="address-2" class="long" type="text" value="${testcenteruser.address_2}" placeholder="e.g. Apartment 123" />
+              </div>
+              <div class="field">
+                <label for="address-3">Address Line #3</label>
+                <input id="address-3" class="long" type="text" value="${testcenteruser.address_3}" placeholder="e.g. Attention: Albert Einstein" />
+              </div>
+            </li>            
+            <li class="field-group postal">
+              <div class="field">
+                <label for="state">State/Province</label>
+                <input id="state" class="short" type="text" value="${testcenteruser.state}" placeholder="e.g. NJ" />
+              </div>
+              <div class="field">
+                <label for="postal-code">Postal Code</label>
+                <input id="postal-code" class="short" type="text" value="${testcenteruser.postal_code}" placeholder="e.g. 08540" />
+              </div>
+              <div class="field required">
+                <label class="short" for="country-code">Country Code</label>
+                <input id="country-code" class="short" type="text" value="${testcenteruser.country}" placeholder="e.g. USA" />
+              </div>
+            </li>
+          </ol>
+        </fieldset>
+        
+        <fieldset class="group group-form group-form-contactinformation">
+          <legend class="is-hidden">Contact &amp; Other Information</legend>
+          
+          <ol class="list-input">
+            <li class="field-group phoneinfo">
+              <div class="field required">
+                <label for="phone">Phone Number</label>
+                <input id="phone" type="text" value="${testcenteruser.phone}" placeholder="e.g. 1-55-555-5555" />              
+              </div>
+              <div class="field">
+                <label for="phone-extension">Extension</label>
+                <input id="phone-extension" class="short" type="text" value="${testcenteruser.extension}" placeholder="e.g. 555" />
+              </div>
+              <div class="field required">
+                <label for="phone-countrycode">Phone Country Code</label>
+                <input id="phone-countrycode" class="short" type="text" value="${testcenteruser.phone_country_code}" placeholder="e.g. USA" />
+              </div>
+            </li>
+            <li class="field-group faxinfo">
+              <div class="field">
+                <label for="fax">Fax Number</label>
+                <input id="fax" type="text" class="short" value="${testcenteruser.fax}" placeholder="e.g. 1-55-555-5555" />
+              </div>
+              <div class="field">
+                <label for="fax-countrycode">Fax Country Code</label>
+                <input id="fax-countrycode" class="short" type="text" value="${testcenteruser.fax_country_code}" placeholder="e.g. USA" />
+              </div>
+            </li>
+            <li class="field">
+              <label for="company">Company</label>
+              <input id="company" type="text" value="${testcenteruser.company_name}" placeholder="e.g. American Association of University Professors" />
+            </li>
+          </ol>
+        </fieldset>
+      </div>
+      
+      <div class="form-fields-secondary">
+        <!-- NOTE: BT - Assuming accomodations cannot be edited after a user originally submits registration, I've disabled the field and provided different text. Correct if this is not the case. -->
+        % if len(registrations) > 0:
+        <p class="instructions">Fields below this point are not part of the demographics, and are not editable currently.</p>
+        % else: 
+        <p class="instructions">Fields below this point are not part of the demographics, and cannot be changed once submitted.</p>
+        % endif
+                  
+        <fieldset class="group group-form group-form-optional">
+          <legend class="is-hidden">Optional Information</legend>
+          
+          <ol class="list-input">
+            % if len(registrations) > 0:
+            <li class="field disabled">
+              <label for="accommodations">Accommodations Requested</label>
+              <textarea class="long" id="accommodations"value="" placeholder="" disabled="disabled"></textarea>
+            </li>
+            % else: 
+            <li class="field">
+              <label for="accommodations">Accommodations Requested</label>
+              <textarea class="long" id="accommodations"value="" placeholder=""></textarea>             
+            </li>
+            % endif
+          </ol>
+        </fieldset>
+      </div>
+      
+      <div class="form-actions">
+        % if len(registrations) > 0:
+        <button type="submit" id="submit" class="action action-primary action-update">Update Demographics</button>
+        % else: 
+        <button type="submit" id="submit" class="action action-primary action-register">Register for Pearson VUE Test</button>
+        % endif
+      </div>        
+    </form>
+  </section>
     
-  </form>
-</section>
+  <aside>
+    <h3 class="is-hidden">Registration Details</h3>
+    
+    <%
+      regstatus = "registration pending acknowledgement by Pearson"
+      
+      if registration.upload_status == 'Accepted':
+        regstatus = "Registration approved by Pearson"
+      elif registration.upload_status == 'Error':
+        regstatus = "rRgistration rejected by Pearson: %s" % registration.upload_error_message
+      elif len(registration.accommodation_request) > 0 and registration.accommodation_code == '':
+        regstatus = "Pending approval of accommodation request"
+    %>
+    
+    <!-- NOTE: BT - state for if registration is accepted -->
+    <div class="message message-status registration-accepted is-shown">
+      <p class="registration-status"><span class="label">Registration Status: </span><span class="value">${regstatus}</span></p>
+      <p class="registration-number"><span class="label">Registration number: </span> <span class="value">edx00015879548</span></p>
+      <p class="message-copy">Write this down! You’ll need it to schedule your exam.</p>
+      <a href="https://www1.pearsonvue.com/testtaker/signin/SignInPage/EDX" class="button exam-button">Schedule Pearson exam</a>
+    </div>
+    
+    <!-- NOTE: BT - state for if registration is rejected -->
+    <div class="message message-status registration-rejected is-shown">
+      <p class="registration-status"><span class="label">Registration Status: </span><span class="value">${regstatus}</span></p>
+      <p class="message-copy">Your registration for the Pearson exam has been rejected. Please contact Pearson VUE for further information regarding your registration.</p>
+    </div>
+    
+    <!-- NOTE: BT - state for if registration is pending -->
+    <div class="message message-status registration-pending is-shown">
+      <p class="registration-status"><span class="label">Registration Status: </span><span class="value">${regstatus}</span></p>
+      <p class="message-copy">Your registration for the Pearson exam is pending. Within a few days, you should see a confirmation number here, which can be used to schedule your exam.</p>
+    </div>
+    
+    <div class="details details-course">
+      <!-- NOTE: showing course details -->
+      <h4>About ${get_course_about_section(course, 'university')} ${course.number}</h4>
+      <p>
+      % if course.has_ended():
+      <span class="label">Course Completed:</span> <span class="value">${course.end_date_text}</span>
+      % elif course.has_started():
+      <span class="label">Course Started:</span> <span class="value">${course.start_date_text}</span>
+      % else:   # hasn't started yet
+      <span class="label">Course Starts:</span> <span class="value">${course.start_date_text}</span>
+      % endif
+      </p>
+    </div>
 
-
- 
- 
\ No newline at end of file
+    <div class="details details-registration">
+      <!-- NOTE: showing test details -->
+      <h4>Pearson VUE Test Details</h4>
+      % if exam_info is not None:
+        <!-- TODO: BT - Can we obtain a more human readable value for test-type (e.g. "Final Exam" or "Midterm Exam")? -->
+        <ul>
+          <li>
+            <span class="label">Exam Series Code:</span> <span class="value">${exam_info.get('Exam_Series_Code')}</span>
+          </li>
+          <li>
+            <span class="label">First Eligible Appointment Date:</span> <span class="value">${exam_info.get('First_Eligible_Appointment_Date')}</span>
+          </li>
+          <li>
+            <span class="label">Last Eligible Appointment Date:</span> <span class="value">${exam_info.get('Last_Eligible_Appointment_Date')}</span>
+          </li>            
+        </ul>
+      % endif
+    </div>
+  </aside>
+</section>
\ No newline at end of file

From 3bd8f408b52d94328914f085a30446a03a7c70da Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Fri, 21 Dec 2012 13:16:39 -0500
Subject: [PATCH 013/541] test center registration - added final styling and
 label focus JS

---
 lms/templates/test_center_register.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index e9e9539d2f..890a30ade8 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -31,6 +31,12 @@
       }
     });
 
+    $("form :input").focus(function() {
+      $("label[for='" + this.id + "']").addClass("is-focused");
+    }).blur(function() {
+      $("label").removeClass("is-focused");
+    });
+
   })(this)
   </script>
 </%block>

From e170afa9276df4ae09e1508af18f17affc5ac4a1 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Fri, 21 Dec 2012 13:23:20 -0500
Subject: [PATCH 014/541] test center registration - forgot to add/commit
 corresponding SASS file

---
 .../multicourse/_testcenter-register.scss     | 412 ++++++++++++++++++
 1 file changed, 412 insertions(+)
 create mode 100644 lms/static/sass/multicourse/_testcenter-register.scss

diff --git a/lms/static/sass/multicourse/_testcenter-register.scss b/lms/static/sass/multicourse/_testcenter-register.scss
new file mode 100644
index 0000000000..9286155c48
--- /dev/null
+++ b/lms/static/sass/multicourse/_testcenter-register.scss
@@ -0,0 +1,412 @@
+// ==========
+
+$baseline: 20px;
+$yellow: rgb(255, 235, 169);
+$red: rgb(178, 6, 16);
+
+// ==========
+
+.testcenter-register {
+	@include clearfix;
+	padding: 60px 0px 120px;
+
+	// basic layout
+	.introduction {
+		width: flex-grid(12);
+	}
+
+	.message-status-registration {
+		width: flex-grid(12);
+	}
+
+	.content, aside {
+		@include box-sizing(border-box);
+	}
+
+	.content {
+		margin-right: flex-gutter();
+		width: flex-grid(8);
+		float: left;
+	}
+
+	aside {
+		margin: 0;
+		width: flex-grid(4);
+		float: left;
+	}
+
+	// introduction
+	.introduction {
+
+		header {
+			
+			h2 {
+				margin: 0;
+				font-family: $sans-serif;
+				font-size: 16px;
+				color: $lighter-base-font-color;
+			}
+
+			h1 {
+				font-family: $sans-serif;
+				font-size: 34px;
+				text-align: left;
+			}			
+		}
+	}
+
+	// content
+	.content {
+		background: rgb(255,255,255);
+	}
+
+	// form
+	.form-fields-primary, .form-fields-secondary {
+		border-bottom: 1px solid rgba(0,0,0,0.25);
+		@include box-shadow(0 1px 2px 0 rgba(0,0,0, 0.1));
+	}
+
+	form {
+		border: 1px solid rgb(216, 223, 230);
+		@include border-radius(3px);
+		@include box-shadow(0 1px 2px 0 rgba(0,0,0, 0.2));
+
+		.instructions {
+			margin: 0;
+			padding: ($baseline*1.5) ($baseline*1.5) 0 ($baseline*1.5);
+			font-family: $sans-serif;
+			font-size: 14px;
+		}
+
+		fieldset {
+			border-bottom: 1px solid rgba(216, 223, 230, 0.50);
+			padding: ($baseline*1.5);
+		}
+
+		.form-actions {
+			padding: ($baseline*1.5);
+
+			button[type="submit"] {
+				display: block;
+				width: 100%;
+				@include button(simple, $blue);
+				@include box-sizing(border-box);
+				@include border-radius(3px);
+				font: bold 15px/1.6rem $sans-serif;
+				letter-spacing: 0;
+				padding: ($baseline*0.75) $baseline;
+				text-align: center;
+			}
+		}
+
+		.list-input {
+			margin: 0;
+			padding: 0;
+			list-style: none;
+
+			.field {
+				border-bottom: 1px dotted rgba(216, 223, 230, 0.5);
+				margin: 0 0 $baseline 0;
+				padding: 0 0 $baseline 0;
+
+				&:last-child {
+					border: none;
+					margin-bottom: 0;
+					padding-bottom: 0;
+				}
+
+				&.disabled {
+					color: rgba(0,0,0,.25);
+
+					label {
+						color: rgba(0,0,0,.25);
+
+						&:after {
+							content: "(Disabled Currently)";
+							margin-left: ($baseline/4);
+						}
+					}
+
+					textarea, input {
+						background: rgb(255,255,255);
+						color: rgba(0,0,0,.25);
+					}
+				}
+
+				&.error {
+
+					label {
+						color: $red;
+					}
+
+					input, textarea {
+						border-color: tint($red,50%);
+					}
+				}
+
+				&.required {
+
+					label {
+						font-weight: bold;
+					}
+
+					label:after {
+						margin-left: ($baseline/4);
+						content: "*";
+					}
+				}
+
+				label, input, textarea {
+					display: block;
+					font-family: $sans-serif;
+					font-style: normal;
+				}
+
+				label {
+					margin: 0 0 ($baseline/4) 0;
+					@include transition(color, 0.15s, ease-in-out);
+
+					&.is-focused {
+						color: $blue;
+					}
+				}
+
+				input, textarea {
+					width: 100%;
+					padding: $baseline ($baseline*.75);					
+
+					&.long {
+						width: 100%;
+					}
+
+					&.short {
+						width: 25%;
+					}
+				}
+
+				textarea.long {
+					height: ($baseline*5);
+				}
+			}
+
+			.field-group {
+				@include clearfix();
+				border-bottom: 1px dotted rgba(216, 223, 230, 0.5);
+				margin: 0 0 $baseline 0;
+				padding: 0 0 $baseline 0;
+
+				.field {
+					display: block;
+					float: left;
+					border-bottom: none;
+					margin: 0 ($baseline) 0 0;
+					padding-bottom: 0;
+
+					input, textarea {
+						width: 100%;
+					}
+				}
+
+				&.addresses {
+
+					.field {
+						width: 45%;
+					}
+				}
+
+				&.postal {
+					border-bottom: none;
+					margin-bottom: 0;
+					padding-bottom: 0;
+
+				}
+
+				&.phoneinfo {
+
+				}
+			}
+		}
+	}
+
+
+	// aside
+	aside {
+		padding-left: $baseline;
+
+		.message-status {
+			@include border-radius(3px);
+			margin: 0 0 ($baseline*2) 0;
+			padding: $baseline;
+			border: 1px solid #ccc;
+			background: tint($yellow,85%);
+
+			p {
+				margin: 0 0 ($baseline/4) 0;
+				padding: 0;
+				font-size: 13px;
+				font-family: $sans-serif;
+			}
+
+			.label, .value {
+				display: block;
+			}
+
+			.label {
+				margin-right: ($baseline/4);
+				text-transform: uppercase;
+				letter-spacing: 1px;
+			}
+
+			.value {
+				color: rgba(0,0,0,0.9);
+				font-size: 14px;
+			}
+
+			.registration-status {
+				margin: 0 0 ($baseline/2) 0;
+
+				.label {
+					margin: 0 0 ($baseline/2) 0;
+					color: #ccc;
+				}
+			}
+
+			.registration-number {
+
+				.label {
+					text-transform: none;
+					letter-spacing: 0;
+				}
+
+				.label, .value {
+					display: inline-block
+				}
+			}
+
+			.message-copy {
+				margin: 0;
+				color: rgba(0,0,0,0.65);
+			}
+		}
+
+		.registration-accepted {
+
+			.message-copy {
+				margin: 0 0 ($baseline/2) 0;
+			}
+
+			.exam-button {
+			  @include button(simple, $pink);
+			  display: block;
+			  padding: ($baseline/2) $baseline;
+			  font-size: 13px;
+			  font-weight: bold;
+
+			  &:hover {
+			    text-decoration: none;
+			  }
+			}
+		}
+
+		.details {
+			border-bottom: 1px solid rgba(216, 223, 230, 0.5);
+			margin: 0 0 $baseline 0;
+			padding: 0 0 $baseline 0;
+			font-family: $sans-serif;
+			font-size: 14px;
+
+			&:last-child {
+				border: none;
+				margin-bottom: 0;
+				padding-bottom: 0;
+			}
+
+			h4 {
+				margin: 0 0 ($baseline/2) 0;
+				font-family: $sans-serif;
+				font-size: 14px;
+				text-transform: uppercase;
+				letter-spacing: 0.5px;
+				color: #ccc;
+			}
+
+			.label, .value {
+				display: inline-block;
+			}
+
+			.label {
+				color: rgba(0,0,0,.65);
+				margin-right: ($baseline/2);
+			}
+
+			.value {
+				color: rgb(0,0,0);
+			}
+		}
+
+		.details-course {
+
+		}
+
+		.details-registration {
+
+			ul {
+				margin: 0;
+				padding: 0;
+				list-style: none;
+
+				li {
+					margin: 0 0 ($baseline/4) 0;
+				}
+			}
+		}
+	}
+
+	// status messages
+	.message {
+		@include border-radius(3px);
+		display: none;
+		margin: $baseline 0;
+		padding: ($baseline/2) $baseline;
+
+		&.is-shown {
+			display: block;
+		}
+
+		.message-copy {
+			font-family: $sans-serif;
+			font-size: 14px;
+		}
+
+		// submission error
+		&.submission-error {
+			border: 1px solid tint($red,85%);
+			background: tint($red,95%);
+
+			p {
+				color: $red;
+			}
+		}
+
+		// submission success
+		&.submission-saved {
+			border: 1px solid tint($blue,85%);
+			background: tint($blue,95%);
+
+			.message-copy {
+				color: $blue;
+			}
+		}
+	}
+
+
+	// hidden
+	.is-hidden {
+		display: none;
+	}
+
+	// temp
+	.output-raw {
+		display: none;
+	}
+}
\ No newline at end of file

From 4abd9cd3d437a149973655af10ed49654efb57dd Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Wed, 2 Jan 2013 18:56:25 -0500
Subject: [PATCH 015/541] get closer to working again

---
 common/djangoapps/student/models.py     | 57 ++++++++++++++++-
 common/djangoapps/student/views.py      | 81 ++++++++++++++-----------
 lms/templates/test_center_register.html | 76 ++++++++++++++---------
 3 files changed, 148 insertions(+), 66 deletions(-)

diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index 716c472330..88b3c3cd80 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -47,6 +47,7 @@ from django.contrib.auth.models import User
 from django.db import models
 from django.db.models.signals import post_save
 from django.dispatch import receiver
+from django.forms import ModelForm
 
 import comment_client as cc
 from django_comment_client.models import Role
@@ -194,7 +195,7 @@ class TestCenterUser(models.Model):
 
     # Confirmation
     upload_status = models.CharField(max_length=20, blank=True)  # 'Error' or 'Accepted'
-    uploaded_at = models.DateTimeField(null=True, db_index=True)
+    uploaded_at = models.DateTimeField(null=True, blank=True, db_index=True)
     upload_error_message = models.CharField(max_length=512, blank=True)
     
     @staticmethod
@@ -206,7 +207,56 @@ class TestCenterUser(models.Model):
     @property
     def email(self):
         return self.user.email
+    
+    def needs_update(self, dict):
+#        needs_updating = any([__getattribute__(fieldname) != dict[fieldname]
+#                              for fieldname in TestCenterUser.user_provided_fields()])
+        for fieldname in TestCenterUser.user_provided_fields():
+            if self.__getattribute__(fieldname) != dict[fieldname]:
+                return True
+            
+        return False    
+                              
+    def update(self, dict):
+        # leave user and client_candidate_id as before
+        self.user_updated_at = datetime.now()
+        for fieldname in TestCenterUser.user_provided_fields():
+            self.__setattr__(fieldname, dict[fieldname])
 
+    @staticmethod
+    def create(user, dict):
+        testcenter_user = TestCenterUser(user=user)
+        testcenter_user.update(dict)
+        # testcenter_user.candidate_id remains unset    
+        # TODO: assign an ID of our own:
+        testcenter_user.client_candidate_id = 'edx' + '123456'  # some unique value  
+        
+
+class TestCenterUserForm(ModelForm):
+    class Meta:
+        model = TestCenterUser
+        fields = ( 'first_name', 'middle_name', 'last_name', 'suffix', 'salutation', 
+                'address_1', 'address_2', 'address_3', 'city', 'state', 'postal_code', 'country', 
+                'phone', 'extension', 'phone_country_code', 'fax', 'fax_country_code', 'company_name')
+        
+        
+        
+        
+        
+   
+ACCOMODATION_CODES = (
+                      ('EQPMNT', 'Equipment'),
+                      ('ET12ET', 'Extra Time - 1/2 Exam Time'),
+                      ('ET30MN', 'Extra Time - 30 Minutes'),
+                      ('ETDBTM', 'Extra Time - Double Time'),
+                      ('SEPRMM', 'Separate Room'),
+                      ('SRREAD', 'Separate Room & Reader'),
+                      ('SRRERC', 'Separate Room & Reader/Recorder'),
+                      ('SRRECR', 'Separate Room & Recorder'),
+                      ('SRSEAN', 'Separate Room & Service Animal'),
+                      ('SRSGNR', 'Separate Room & Sign Lang Interp'), 
+                      )
+    
 class TestCenterRegistration(models.Model):
     """
     This is our representation of a user's registration for in-person testing,
@@ -242,7 +292,8 @@ class TestCenterRegistration(models.Model):
     exam_series_code = models.CharField(max_length=15, db_index=True)
     eligibility_appointment_date_first = models.DateField(db_index=True)
     eligibility_appointment_date_last = models.DateField(db_index=True)
-    # TODO: this should be an enumeration:
+
+    # this is really a list of codes, using an '*' as a delimiter.
     accommodation_code = models.CharField(max_length=64, blank=True)
     
     # store the original text of the accommodation request.
@@ -250,7 +301,7 @@ class TestCenterRegistration(models.Model):
 
     # Confirmation
     upload_status = models.CharField(max_length=20, blank=True)  # 'Error' or 'Accepted'
-    uploaded_at = models.DateTimeField(null=True, db_index=True)
+    uploaded_at = models.DateTimeField(null=True, blank=True, db_index=True)
     upload_error_message = models.CharField(max_length=512, blank=True)
 
     @property
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 29d8a206cb..47992554f2 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -29,7 +29,7 @@ from bs4 import BeautifulSoup
 from django.core.cache import cache
 
 from django_future.csrf import ensure_csrf_cookie, csrf_exempt
-from student.models import (Registration, UserProfile, TestCenterUser, TestCenterRegistration,
+from student.models import (Registration, UserProfile, TestCenterUser, TestCenterUserForm, TestCenterRegistration,
                             PendingNameChange, PendingEmailChange,
                             CourseEnrollment, unique_id_for_user,
                             get_testcenter_registrations_for_user_and_course)
@@ -650,29 +650,41 @@ def _do_create_or_update_test_center_user(post_vars):
     try:
         testcenter_user = TestCenterUser.objects.get(user=user)
         # found a TestCenterUser, so check to see if it has changed
-        needs_updating = any([testcenter_user.__getattribute__(fieldname) != post_vars[fieldname]
-                              for fieldname in TestCenterUser.user_provided_fields()])
-            
+#        needs_updating = any([testcenter_user.__getattribute__(fieldname) != post_vars[fieldname]
+#                              for fieldname in TestCenterUser.user_provided_fields()])
+        needs_updating = testcenter_user.needs_update(post_vars)    
         if needs_updating:
-            # leave user and client_candidate_id as before
-            testcenter_user.user_updated_at = datetime.datetime.now()
-            for fieldname in TestCenterUser.user_provided_fields():
-                testcenter_user.__setattr__(fieldname, post_vars[fieldname])
+#            # leave user and client_candidate_id as before
+#            testcenter_user.user_updated_at = datetime.datetime.now()
+#            for fieldname in TestCenterUser.user_provided_fields():
+#                testcenter_user.__setattr__(fieldname, post_vars[fieldname])
+            testcenter_user.update(post_vars)
             needs_saving = True
         
     except TestCenterUser.DoesNotExist:
         # did not find the TestCenterUser, so create a new one 
-        testcenter_user = TestCenterUser(user=user)
-        for fieldname in TestCenterUser.user_provided_fields():
-            testcenter_user.__setattr__(fieldname, post_vars[fieldname])
-        # testcenter_user.candidate_id remains unset    
-        testcenter_user.client_candidate_id = 'edx' + '123456'  # some unique value  
-        testcenter_user.user_updated_at = datetime.datetime.now()
+        testcenter_user = TestCenterUser.create(user, post_vars)
+#        testcenter_user = TestCenterUser(user=user)
+#        testcenter_user.update(post_vars)
+##        for fieldname in TestCenterUser.user_provided_fields():
+##            testcenter_user.__setattr__(fieldname, post_vars[fieldname])
+#        # testcenter_user.candidate_id remains unset    
+#        testcenter_user.client_candidate_id = 'edx' + '123456'  # some unique value  
+##        testcenter_user.user_updated_at = datetime.datetime.now()
         needs_saving = True
 
-    # additional validation occurs at save time, so handle exceptions
     if needs_saving:
         try:
+            # first perform validation on the user information 
+            # using a Django Form.
+            form = TestCenterUserForm(testcenter_user)
+            if not form.is_valid():
+                response_data = {'success': False}
+                # return a list of errors...
+                response_data['field_errors'] = form.errors
+                response_data['non_field_errors'] = form.non_field_errors()
+                return HttpResponse(json.dumps(response_data))
+                
             testcenter_user.save()
         except IntegrityError, ie:
             js = {'success': False}
@@ -728,7 +740,7 @@ def _do_create_or_update_test_center_user(post_vars):
 def create_test_registration(request, post_override=None):
     '''
     JSON call to create test registration.
-    Used by form in test_center_register_modal.html, which is included 
+    Used by form in test_center_register.html, which is called from 
     into dashboard.html
     '''
     js = {'success': False}
@@ -736,24 +748,24 @@ def create_test_registration(request, post_override=None):
     post_vars = post_override if post_override else request.POST
 
     # Confirm we have a properly formed request
-    for a in ['first_name', 'last_name', 'address_1', 'city', 'country']:
-        if a not in post_vars:
-            js['value'] = "Error (401 {field}). E-mail us.".format(field=a)
-            js['field'] = a
-            return HttpResponse(json.dumps(js))
-
-    # Confirm appropriate fields are filled in with something for now
-    for a in ['first_name', 'last_name', 'address_1', 'city', 'country']:
-        if len(post_vars[a]) < 2:
-            error_str = {'first_name': 'First name must be minimum of two characters long.',
-                         'last_name': 'Last name must be minimum of two characters long.',
-                         'address_1': 'Address must be minimum of two characters long.',
-                         'city': 'City must be minimum of two characters long.',
-                         'country': 'Country must be minimum of two characters long.',
-                         }
-            js['value'] = error_str[a]
-            js['field'] = a
-            return HttpResponse(json.dumps(js))
+#    for a in ['first_name', 'last_name', 'address_1', 'city', 'country']:
+#        if a not in post_vars:
+#            js['value'] = "Error (401 {field}). E-mail us.".format(field=a)
+#            js['field'] = a
+#            return HttpResponse(json.dumps(js))
+#
+#    # Confirm appropriate fields are filled in with something for now
+#    for a in ['first_name', 'last_name', 'address_1', 'city', 'country']:
+#        if len(post_vars[a]) < 2:
+#            error_str = {'first_name': 'First name must be minimum of two characters long.',
+#                         'last_name': 'Last name must be minimum of two characters long.',
+#                         'address_1': 'Address must be minimum of two characters long.',
+#                         'city': 'City must be minimum of two characters long.',
+#                         'country': 'Country must be minimum of two characters long.',
+#                         }
+#            js['value'] = error_str[a]
+#            js['field'] = a
+#            return HttpResponse(json.dumps(js))
 
     # Once the test_center_user information has been validated, create the entries:
     ret = _do_create_or_update_test_center_user(post_vars)
@@ -791,6 +803,7 @@ def create_test_registration(request, post_override=None):
     js = {'success': True}
     return HttpResponse(json.dumps(js), mimetype="application/json")
 
+
 def get_random_post_override():
     """
     Return a dictionary suitable for passing to post_vars of _do_create_account or post_override
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index 0860adfe6c..d6a38e1bb4 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -45,6 +45,13 @@ exam_info = course.testcenter_info
        If the user has already registered in the past for a test center, then also display
        their ID. -->
 
+    <!-- check to see if the user has already registering, or
+       is registering for the first time -->
+  <%     
+    registrations = get_testcenter_registrations_for_user_and_course(user, course.id)
+  %>  
+     
+
   <section class="output-raw">
     <hgroup>
       <p class="date-block">
@@ -67,12 +74,6 @@ exam_info = course.testcenter_info
         <p>Last Eligible Appointment Date: ${exam_info.get('Last_Eligible_Appointment_Date')}</p>
     % endif
     
-    <!-- check to see if the user has already registering, or
-       is registering for the first time -->
-    <%     
-      registrations = get_testcenter_registrations_for_user_and_course(user, course.id)
-    %>  
-     
     % if len(registrations) > 0:
       <%     
         registration = registrations[0]
@@ -161,14 +162,14 @@ exam_info = course.testcenter_info
       
       % if len(registrations) > 0:
       <p class="instructions">
-        Please complete the following form to update your demographic information used in your Pearson VUE Porctored Exam. Required fields are noted by <strong>bold text and an asterisk (*)</strong>. 
+        Please complete the following form to update your demographic information used in your Pearson VUE Proctored Exam. Required fields are noted by <strong>bold text and an asterisk (*)</strong>. 
       </p>
       % else: 
       <p class="instructions">
-        Please provide the following demographic information to register for a Pearson VUE Porctored Exam. Required fields are noted by <strong>bold text and an asterisk (*)</strong>.
+        Please provide the following demographic information to register for a Pearson VUE Proctored Exam. Required fields are noted by <strong>bold text and an asterisk (*)</strong>.
       </p>
       % endif
-            
+
       <!-- include these as pass-throughs -->
       <input id="id_email" type="hidden" name="email" maxlength="75" value="${user.email}" />
       <input id="id_username" type="hidden" name="username" maxlength="75" value="${user.username}" />
@@ -181,24 +182,24 @@ exam_info = course.testcenter_info
           <ol class="list-input">
             <li class="field">
               <label for="salutation">Salutation</label>
-              <input class="short" id="salutation" type="text" value="${testcenteruser.salutation}" placeholder="e.g. Mr., Ms., Mrs., Dr." />              
+              <input class="short" id="salutation" type="text" name="salutation" value="${testcenteruser.salutation}" placeholder="e.g. Mr., Ms., Mrs., Dr." />              
             </li>
             <!-- NOTE: BT - to inform a user of what field the error occured on, add a class of .error to the .field element -->
             <li class="field required">
               <label for="name-first">First Name </label>
-              <input id="name-first" type="text" value="${testcenteruser.first_name}" placeholder="e.g. Albert" />
+              <input id="name-first" type="text" name="first_name" value="${testcenteruser.first_name}" placeholder="e.g. Albert" />
             </li>
             <li class="field">
               <label for="name-middle">Middle Name</label>
-              <input id="name-middle" type="text" value="${testcenteruser.middle_name}" placeholder="" />
+              <input id="name-middle" type="text" name="middle_name" value="${testcenteruser.middle_name}" placeholder="" />
             </li>
             <li class="field required">
               <label for="name-last">Last Name</label>
-              <input id="name-last" type="text" value="${testcenteruser.last_name}" placeholder="e.g. Einstein" />
+              <input id="name-last" type="text" name="last_name" value="${testcenteruser.last_name}" placeholder="e.g. Einstein" />
             </li>
             <li class="field">
               <label for="name-suffix">Suffix</label>
-              <input class="short" id="name-suffix" type="text" value="${testcenteruser.suffix}" placeholder="e.g. Jr., Sr. " />
+              <input class="short" id="name-suffix" type="text" name="suffix" value="${testcenteruser.suffix}" placeholder="e.g. Jr., Sr. " />
             </li>
           </ol>
         </fieldset>
@@ -209,30 +210,34 @@ exam_info = course.testcenter_info
           <ol class="list-input">
             <li class="field">
               <label class="long" for="address-1">Address Line #1</label>
-              <input id="address-1" type="text" value="${testcenteruser.address_1}" placeholder="e.g. 112 Mercer Street" />              
+              <input id="address-1" type="text" name="address_1" value="${testcenteruser.address_1}" placeholder="e.g. 112 Mercer Street" />              
             </li>
             <li class="field-group addresses">
               <div class="field">
                 <label for="address-2">Address Line #2</label>
-                <input id="address-2" class="long" type="text" value="${testcenteruser.address_2}" placeholder="e.g. Apartment 123" />
+                <input id="address-2" class="long" type="text" name="address_2" value="${testcenteruser.address_2}" placeholder="e.g. Apartment 123" />
               </div>
               <div class="field">
                 <label for="address-3">Address Line #3</label>
-                <input id="address-3" class="long" type="text" value="${testcenteruser.address_3}" placeholder="e.g. Attention: Albert Einstein" />
+                <input id="address-3" class="long" type="text" name="address_3" value="${testcenteruser.address_3}" placeholder="e.g. Attention: Albert Einstein" />
               </div>
             </li>            
             <li class="field-group postal">
+              <div class="field">
+                <label for="city">City</label>
+                <input id="city" class="short" type="text" name="city" value="${testcenteruser.city}" placeholder="e.g. Newark" />
+              </div>
               <div class="field">
                 <label for="state">State/Province</label>
-                <input id="state" class="short" type="text" value="${testcenteruser.state}" placeholder="e.g. NJ" />
+                <input id="state" class="short" type="text" name="state" value="${testcenteruser.state}" placeholder="e.g. NJ" />
               </div>
               <div class="field">
                 <label for="postal-code">Postal Code</label>
-                <input id="postal-code" class="short" type="text" value="${testcenteruser.postal_code}" placeholder="e.g. 08540" />
+                <input id="postal-code" class="short" type="text" name="postal_code" value="${testcenteruser.postal_code}" placeholder="e.g. 08540" />
               </div>
               <div class="field required">
                 <label class="short" for="country-code">Country Code</label>
-                <input id="country-code" class="short" type="text" value="${testcenteruser.country}" placeholder="e.g. USA" />
+                <input id="country-code" class="short" type="text" name="country" value="${testcenteruser.country}" placeholder="e.g. USA" />
               </div>
             </li>
           </ol>
@@ -245,30 +250,30 @@ exam_info = course.testcenter_info
             <li class="field-group phoneinfo">
               <div class="field required">
                 <label for="phone">Phone Number</label>
-                <input id="phone" type="text" value="${testcenteruser.phone}" placeholder="e.g. 1-55-555-5555" />              
+                <input id="phone" type="text" name="phone" value="${testcenteruser.phone}" placeholder="e.g. 1-55-555-5555" />              
               </div>
               <div class="field">
                 <label for="phone-extension">Extension</label>
-                <input id="phone-extension" class="short" type="text" value="${testcenteruser.extension}" placeholder="e.g. 555" />
+                <input id="phone-extension" class="short" type="text" name="extension" value="${testcenteruser.extension}" placeholder="e.g. 555" />
               </div>
               <div class="field required">
                 <label for="phone-countrycode">Phone Country Code</label>
-                <input id="phone-countrycode" class="short" type="text" value="${testcenteruser.phone_country_code}" placeholder="e.g. USA" />
+                <input id="phone-countrycode" class="short" type="text" name="phone_country_code" value="${testcenteruser.phone_country_code}" placeholder="e.g. USA" />
               </div>
             </li>
             <li class="field-group faxinfo">
               <div class="field">
                 <label for="fax">Fax Number</label>
-                <input id="fax" type="text" class="short" value="${testcenteruser.fax}" placeholder="e.g. 1-55-555-5555" />
+                <input id="fax" type="text" class="short" name="fax" value="${testcenteruser.fax}" placeholder="e.g. 1-55-555-5555" />
               </div>
               <div class="field">
                 <label for="fax-countrycode">Fax Country Code</label>
-                <input id="fax-countrycode" class="short" type="text" value="${testcenteruser.fax_country_code}" placeholder="e.g. USA" />
+                <input id="fax-countrycode" class="short" type="text" name="fax_country_code" value="${testcenteruser.fax_country_code}" placeholder="e.g. USA" />
               </div>
             </li>
             <li class="field">
               <label for="company">Company</label>
-              <input id="company" type="text" value="${testcenteruser.company_name}" placeholder="e.g. American Association of University Professors" />
+              <input id="company" type="text" name="company_name" value="${testcenteruser.company_name}" placeholder="e.g. American Association of University Professors" />
             </li>
           </ol>
         </fieldset>
@@ -312,38 +317,51 @@ exam_info = course.testcenter_info
   </section>
     
   <aside>
+   % if len(registrations) > 0:
     <h3 class="is-hidden">Registration Details</h3>
     
     <%
-      regstatus = "registration pending acknowledgement by Pearson"
+      registration = registrations[0]
       
       if registration.upload_status == 'Accepted':
         regstatus = "Registration approved by Pearson"
       elif registration.upload_status == 'Error':
         regstatus = "Registration rejected by Pearson: %s" % registration.upload_error_message
       elif len(registration.accommodation_request) > 0 and registration.accommodation_code == '':
-        regstatus = "Pending approval of accommodation request"
+        regstatus = "Registration pending approval of accommodation request"
+      else:
+        regstatus = "Registration pending acknowledgement by Pearson"
     %>
     
     <!-- NOTE: BT - state for if registration is accepted -->
+    % if registration.upload_status == 'Accepted':
+      <% regstatus = "Registration approved by Pearson" %>
     <div class="message message-status registration-accepted is-shown">
       <p class="registration-status"><span class="label">Registration Status: </span><span class="value">${regstatus}</span></p>
       <p class="registration-number"><span class="label">Registration number: </span> <span class="value">edx00015879548</span></p>
       <p class="message-copy">Write this down! You’ll need it to schedule your exam.</p>
       <a href="https://www1.pearsonvue.com/testtaker/signin/SignInPage/EDX" class="button exam-button">Schedule Pearson exam</a>
     </div>
+    % endif
     
+    % if registration.upload_status == 'Error':
     <!-- NOTE: BT - state for if registration is rejected -->
+      <% regstatus = "Registration rejected by Pearson: %s" % registration.upload_error_message %>
     <div class="message message-status registration-rejected is-shown">
       <p class="registration-status"><span class="label">Registration Status: </span><span class="value">${regstatus}</span></p>
       <p class="message-copy">Your registration for the Pearson exam has been rejected. Please contact Pearson VUE for further information regarding your registration.</p>
     </div>
+    % endif
     
+    % if len(registration.accommodation_request) > 0 and registration.accommodation_code == '':
+        <% regstatus = "Registration pending approval of accommodation request" %>
     <!-- NOTE: BT - state for if registration is pending -->
     <div class="message message-status registration-pending is-shown">
       <p class="registration-status"><span class="label">Registration Status: </span><span class="value">${regstatus}</span></p>
       <p class="message-copy">Your registration for the Pearson exam is pending. Within a few days, you should see a confirmation number here, which can be used to schedule your exam.</p>
     </div>
+    % endif
+   % endif
     
     <div class="details details-course">
       <!-- NOTE: showing course details -->
@@ -378,4 +396,4 @@ exam_info = course.testcenter_info
       % endif
     </div>
   </aside>
-</section>
\ No newline at end of file
+</section>

From c76f37050a4b711de5a4bceea6a490799089ed18 Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Thu, 3 Jan 2013 03:22:37 -0500
Subject: [PATCH 016/541] introduce form to template

---
 common/djangoapps/student/views.py      | 154 ++++++++++++------------
 lms/templates/test_center_register.html | 128 +++++---------------
 2 files changed, 103 insertions(+), 179 deletions(-)

diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 47992554f2..202bfefac5 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -39,7 +39,6 @@ from certificates.models import CertificateStatuses, certificate_status_for_stud
 from xmodule.course_module import CourseDescriptor
 from xmodule.modulestore.exceptions import ItemNotFoundError
 from xmodule.modulestore.django import modulestore
-from xmodule.modulestore.exceptions import ItemNotFoundError
 
 #from datetime import date
 from collections import namedtuple
@@ -209,14 +208,6 @@ def _cert_info(user, course, cert_status):
 def dashboard(request):
     user = request.user
     enrollments = CourseEnrollment.objects.filter(user=user)
-
-    # we want to populate the registration page with the relevant information,
-    # if it already exists.  Create an empty object otherwise.
-#    try:
-#        testcenteruser = TestCenterUser.objects.get(user=user)
-#    except TestCenterUser.DoesNotExist:
-#        testcenteruser = TestCenterUser()
-#        testcenteruser.user = user
     
     # Build our courses list for the user, but ignore any courses that no longer
     # exist (because the course IDs have changed). Still, we don't delete those
@@ -603,9 +594,27 @@ def create_account(request, post_override=None):
 
 @login_required
 @ensure_csrf_cookie
-def begin_test_registration(request, course_id):
-    user = request.user    
-    
+def begin_test_registration(request, course_id, form=None, message=''):
+    user = request.user
+
+    try:
+        course = (course_from_id(course_id))
+    except ItemNotFoundError:
+        log.error("User {0} enrolled in non-existent course {1}"
+                      .format(user.username, course_id))
+
+    # get the exam to be registered for:
+    # (For now, we just assume there is one at most.)
+    exam_info = course.testcenter_info
+
+    # figure out if the user is already registered for this exam:   
+    # (Again, for now we assume that any registration that exists is for this exam.) 
+    registrations = get_testcenter_registrations_for_user_and_course(user, course_id)
+    if len(registrations) > 0:
+        registration = registrations[0]
+    else:
+        registration = None
+        
     # we want to populate the registration page with the relevant information,
     # if it already exists.  Create an empty object otherwise.
     try:
@@ -613,31 +622,31 @@ def begin_test_registration(request, course_id):
     except TestCenterUser.DoesNotExist:
         testcenteruser = TestCenterUser()
         testcenteruser.user = user
-    
-    try:
-        course = (course_from_id(course_id))
-    except ItemNotFoundError:
-        log.error("User {0} enrolled in non-existent course {1}"
-                      .format(user.username, course_id))
 
-    message = ""
+    if form is None:
+        form = TestCenterUserForm(instance=testcenteruser)
+        
     context = {'course': course,
                'user': user,
                'message': message,
                'testcenteruser': testcenteruser,
+               'registration': registration,
+               'form': form,
+               'exam_info': exam_info,
                }
 
     return render_to_response('test_center_register.html', context)
 
+@ensure_csrf_cookie
+def create_test_registration(request, post_override=None):
+    '''
+    JSON call to create test registration.
+    Used by form in test_center_register.html, which is called from 
+    into dashboard.html
+    '''
+ #   js = {'success': False}
 
-def _do_create_or_update_test_center_user(post_vars):
-    """
-    Given cleaned post variables, create the TestCenterUser and UserProfile objects, as well as the
-    registration for this user.
-
-    Returns a tuple (User, UserProfile, TestCenterUser).
-  
-    """
+    post_vars = post_override if post_override else request.POST
     
     # first determine if we need to create a new TestCenterUser, or if we are making any update 
     # to an existing TestCenterUser.
@@ -646,46 +655,43 @@ def _do_create_or_update_test_center_user(post_vars):
     course_id = post_vars['course_id']
     course = (course_from_id(course_id))  # assume it will be found....
         
-    needs_saving = False
+#    needs_saving = False
     try:
         testcenter_user = TestCenterUser.objects.get(user=user)
-        # found a TestCenterUser, so check to see if it has changed
-#        needs_updating = any([testcenter_user.__getattribute__(fieldname) != post_vars[fieldname]
-#                              for fieldname in TestCenterUser.user_provided_fields()])
-        needs_updating = testcenter_user.needs_update(post_vars)    
-        if needs_updating:
-#            # leave user and client_candidate_id as before
-#            testcenter_user.user_updated_at = datetime.datetime.now()
-#            for fieldname in TestCenterUser.user_provided_fields():
-#                testcenter_user.__setattr__(fieldname, post_vars[fieldname])
-            testcenter_user.update(post_vars)
-            needs_saving = True
-        
     except TestCenterUser.DoesNotExist:
-        # did not find the TestCenterUser, so create a new one 
-        testcenter_user = TestCenterUser.create(user, post_vars)
-#        testcenter_user = TestCenterUser(user=user)
-#        testcenter_user.update(post_vars)
-##        for fieldname in TestCenterUser.user_provided_fields():
-##            testcenter_user.__setattr__(fieldname, post_vars[fieldname])
-#        # testcenter_user.candidate_id remains unset    
-#        testcenter_user.client_candidate_id = 'edx' + '123456'  # some unique value  
-##        testcenter_user.user_updated_at = datetime.datetime.now()
-        needs_saving = True
+        testcenter_user = TestCenterUser(user=user)
 
-    if needs_saving:
+    needs_updating = testcenter_user.needs_update(post_vars)    
+#        if needs_updating:
+#            testcenter_user.update(post_vars)
+#            needs_saving = True
+        
+ #   except TestCenterUser.DoesNotExist:
+        # did not find the TestCenterUser, so create a new one 
+#        testcenter_user = TestCenterUser.create(user, post_vars)
+#        needs_saving = True
+
+    # perform validation:
+    if needs_updating:
         try:
             # first perform validation on the user information 
             # using a Django Form.
-            form = TestCenterUserForm(testcenter_user)
+            form = TestCenterUserForm(instance=testcenter_user, data=post_vars)
             if not form.is_valid():
-                response_data = {'success': False}
-                # return a list of errors...
-                response_data['field_errors'] = form.errors
-                response_data['non_field_errors'] = form.non_field_errors()
-                return HttpResponse(json.dumps(response_data))
+                return begin_test_registration(request, course_id, form, 'failed to validate')
+#                response_data = {'success': False}
+#                # return a list of errors...
+#                response_data['field_errors'] = form.errors
+#                response_data['non_field_errors'] = form.non_field_errors()
+#                return HttpResponse(json.dumps(response_data))
+        
+            new_user = form.save(commit=False)
+            # create additional values here:
+            new_user.user_updated_at = datetime.datetime.now()
+            # TODO: create client value....
+            new_user.save()
                 
-            testcenter_user.save()
+            # testcenter_user.save()
         except IntegrityError, ie:
             js = {'success': False}
             error_msg = unicode(ie);
@@ -715,7 +721,7 @@ def _do_create_or_update_test_center_user(post_vars):
     else:
         registration = TestCenterRegistration(testcenter_user = testcenter_user)
         registration.course_id = post_vars['course_id']
-        registration.accommodation_request = post_vars['accommodations']
+        registration.accommodation_request = post_vars.get('accommodations','')
         exam_info = course.testcenter_info
         registration.exam_series_code = exam_info.get('Exam_Series_Code')
         registration.eligibility_appointment_date_first = exam_info.get('First_Eligible_Appointment_Date')
@@ -734,18 +740,8 @@ def _do_create_or_update_test_center_user(post_vars):
         except IntegrityError, ie:
             raise
         
-    return (user, testcenter_user, registration)
+#    return (user, testcenter_user, registration)
 
-@ensure_csrf_cookie
-def create_test_registration(request, post_override=None):
-    '''
-    JSON call to create test registration.
-    Used by form in test_center_register.html, which is called from 
-    into dashboard.html
-    '''
-    js = {'success': False}
-
-    post_vars = post_override if post_override else request.POST
 
     # Confirm we have a properly formed request
 #    for a in ['first_name', 'last_name', 'address_1', 'city', 'country']:
@@ -768,13 +764,12 @@ def create_test_registration(request, post_override=None):
 #            return HttpResponse(json.dumps(js))
 
     # Once the test_center_user information has been validated, create the entries:
-    ret = _do_create_or_update_test_center_user(post_vars)
-    if isinstance(ret,HttpResponse):		# if there was an error then return that
-        return ret
-
-
-    (user, testcenter_user, testcenter_registration) = ret
-
+#    ret = _do_create_or_update_test_center_user(post_vars)
+#    if isinstance(ret,HttpResponse):		# if there was an error then return that
+#        return ret
+#
+#
+#    (user, testcenter_user, testcenter_registration) = ret
 
     # only do the following if there is accommodation text to send,
     # and a destination to which to send it:
@@ -800,8 +795,9 @@ def create_test_registration(request, post_override=None):
     # TODO: enable appropriate stat
     # statsd.increment("common.student.account_created")
 
-    js = {'success': True}
-    return HttpResponse(json.dumps(js), mimetype="application/json")
+#    js = {'success': True}
+#    return HttpResponse(json.dumps(js), mimetype="application/json")
+    return HttpResponseRedirect(reverse('dashboard'))
 
 
 def get_random_post_override():
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index d6a38e1bb4..fe175b11e4 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -10,18 +10,18 @@
 <%namespace name='static' file='static_content.html'/>
 
 <%block name="title"><title>Pearson VUE Test Center Proctoring - Sign Up</title></%block>
-
+<%doc>
 <%block name="js_extra">
   <script type="text/javascript">
   (function() {
 
-    $(document).on('ajax:success', '#test_register_form', function(data, json, xhr) {
+    $(document).on('ajax:success', '#testcenter_register_form', function(data, json, xhr) {
       if(json.success) {
         location.href="${reverse('dashboard')}";
       } else {
         $(".field.error").removeClass('error');
         $('#register_error').html(json.value).stop().css("display", "block");
-        $("[data-field='"+json.field+"']").addClass('field-error')
+        $("[data-field='"+json.field+"']").addClass('error')
       }
     });
 
@@ -34,98 +34,17 @@
   })(this)
   </script>
 </%block>
+</%doc>
 
-<%
-exam_info = course.testcenter_info
-%>
 
 <section class="testcenter-register container">    
-
-  <!-- display stuff about the exam and the course for which the user is registering.  
-       If the user has already registered in the past for a test center, then also display
-       their ID. -->
-
-    <!-- check to see if the user has already registering, or
-       is registering for the first time -->
-  <%     
-    registrations = get_testcenter_registrations_for_user_and_course(user, course.id)
-  %>  
-     
-
-  <section class="output-raw">
-    <hgroup>
-      <p class="date-block">
-        % if course.has_ended():
-        Course Completed - ${course.end_date_text}
-        % elif course.has_started():
-        Course Started - ${course.start_date_text}
-        % else:   # hasn't started yet
-        Course Starts - ${course.start_date_text}
-        % endif
-        </p>
-        <h2 class="university">${get_course_about_section(course, 'university')}</h2>
-        <h3>${course.number} ${course.title}</h3>
-    </hgroup>
-
-    <!-- TODO: need to add logic to select which of the following to display.  Like certs? -->
-    % if exam_info is not None:
-        <p>Exam Series Code: ${exam_info.get('Exam_Series_Code')}</p>
-        <p>First Eligible Appointment Date: ${exam_info.get('First_Eligible_Appointment_Date')}</p>
-        <p>Last Eligible Appointment Date: ${exam_info.get('Last_Eligible_Appointment_Date')}</p>
-    % endif
-    
-    % if len(registrations) > 0:
-      <%     
-        registration = registrations[0]
-      %>  
-
-    <section><div>Already Registered</div>
-      <p>Here is the current state of your registration, for debugging purposes:</p>
-      <l>
-        <li>id: ${registration.id}</li>
-        <li>testcenter_user_id: ${registration.testcenter_user_id}</li>
-        <li>course_id: ${registration.course_id}</li>
-        <li>accommodation codes: ${registration.accommodation_code}</li>
-        <li>accommodation request: ${registration.accommodation_request}</li>
-        <li>created_at: ${registration.created_at}</li>
-        <li>updated_at: ${registration.updated_at}</li>
-        <li>user_updated_at: ${registration.user_updated_at}</li>
-        <li>upload_status: ${registration.upload_status}</li>
-        <li>upload_error_message: ${registration.upload_error_message}</li>
-      </l>
-      
-      
-      <!-- determine status of registration 
-          doing here for now, but will move into model or view -->
-      <%
-        regstatus = "registration pending acknowledgement by Pearson"
-        
-        if registration.upload_status == 'Accepted':
-          regstatus = "registration approved by Pearson"
-        elif registration.upload_status == 'Error':
-          regstatus = "registration rejected by Pearson: %s" % registration.upload_error_message
-        elif len(registration.accommodation_request) > 0 and registration.accommodation_code == '':
-          regstatus = "pending approval of accommodation request"
-      %>
-      <p>Current status: ${regstatus}</p>       
-      
-      <p>The demographic information provided below was used to register
-      for the exam listed above.  Changes to this information 
-      may be submitted below.</p>
-    </section>
-     
-    % else:
-        <p>The demographic information must be provided below in order to register
-        for the exam listed above.</p>
-    % endif
-  </section>
   
   <section class="introduction">
     <header>
       <hgroup>
         <h2>${get_course_about_section(course, 'university')} ${course.number} ${course.title}</h2>      
         
-        % if len(registrations) > 0:
+        % if registration:
         <h1>Your Pearson VUE Proctored Exam Registration</h1>
         % else: 
         <h1>Register for a Pearson VUE Proctored Exam</h1>
@@ -136,8 +55,9 @@ exam_info = course.testcenter_info
   
   <section class="status">
     
-    <!-- NOTE: BT - registration data updated confirmation message - in case upon successful submit we're directing folks back to this view -->
-    <div class="message message-status submission-saved is-shown">
+    <!-- NOTE: BT - registration data updated confirmation message - in case upon successful submit we're directing
+    	 folks back to this view.  To display, add "is-shown" class to div -->
+    <div class="message message-status submission-saved">
       <p class="message-copy">Your registration data has been updated and saved.</p>
     </div>
     
@@ -148,10 +68,12 @@ exam_info = course.testcenter_info
     </div> 
     % endif
     
-    <!-- NOTE: BT - Sample markup for error message -->
+    <!-- NOTE: BT - Sample markup for error message.  To display, add "is-shown" class to div -->
+    % if form.errors and len(form.errors) > 0:
     <div class="message message-status submission-error is-shown">
       <p class="message-copy">We're Sorry, but there was an error with the information you provided below:</p>
     </div>
+    % endif 
   </section>
   
   <section class="content">
@@ -160,7 +82,7 @@ exam_info = course.testcenter_info
     </header>      
     <form id="testcenter-register-form" method="post" data-remote="true" action="/create_test_registration">
       
-      % if len(registrations) > 0:
+      % if registration:
       <p class="instructions">
         Please complete the following form to update your demographic information used in your Pearson VUE Proctored Exam. Required fields are noted by <strong>bold text and an asterisk (*)</strong>. 
       </p>
@@ -181,15 +103,23 @@ exam_info = course.testcenter_info
           
           <ol class="list-input">
             <li class="field">
+              <label for="id-salutation">Salutation:</label>
+ 	         	${form['salutation']}
+            </li>
+            <li class="field required">
+              <label for="id-first_name">First Name:</label>
+ 	         	${form['first_name']}
+            </li>
+<!--            <li class="field">
               <label for="salutation">Salutation</label>
               <input class="short" id="salutation" type="text" name="salutation" value="${testcenteruser.salutation}" placeholder="e.g. Mr., Ms., Mrs., Dr." />              
             </li>
-            <!-- NOTE: BT - to inform a user of what field the error occured on, add a class of .error to the .field element -->
-            <li class="field required">
+   -->         <!-- NOTE: BT - to inform a user of what field the error occurred on, add a class of .error to the .field element -->
+<!--            <li class="field required">
               <label for="name-first">First Name </label>
               <input id="name-first" type="text" name="first_name" value="${testcenteruser.first_name}" placeholder="e.g. Albert" />
             </li>
-            <li class="field">
+ -->           <li class="field">
               <label for="name-middle">Middle Name</label>
               <input id="name-middle" type="text" name="middle_name" value="${testcenteruser.middle_name}" placeholder="" />
             </li>
@@ -281,7 +211,7 @@ exam_info = course.testcenter_info
       
       <div class="form-fields-secondary">
         <!-- NOTE: BT - Assuming accomodations cannot be edited after a user originally submits registration, I've disabled the field and provided different text. Correct if this is not the case. -->
-        % if len(registrations) > 0:
+        % if registration:
         <p class="instructions">Fields below this point are not part of the demographics, and are not editable currently.</p>
         % else: 
         <p class="instructions">Fields below this point are not part of the demographics, and cannot be changed once submitted.</p>
@@ -291,7 +221,7 @@ exam_info = course.testcenter_info
           <legend class="is-hidden">Optional Information</legend>
           
           <ol class="list-input">
-            % if len(registrations) > 0:
+            % if registration:
             <li class="field disabled">
               <label for="accommodations">Accommodations Requested</label>
               <textarea class="long" id="accommodations"value="" placeholder="" disabled="disabled"></textarea>
@@ -307,7 +237,7 @@ exam_info = course.testcenter_info
       </div>
       
       <div class="form-actions">
-        % if len(registrations) > 0:
+        % if registration:
         <button type="submit" id="submit" class="action action-primary action-update">Update Demographics</button>
         % else: 
         <button type="submit" id="submit" class="action action-primary action-register">Register for Pearson VUE Test</button>
@@ -317,12 +247,10 @@ exam_info = course.testcenter_info
   </section>
     
   <aside>
-   % if len(registrations) > 0:
+   % if registration:
     <h3 class="is-hidden">Registration Details</h3>
     
-    <%
-      registration = registrations[0]
-      
+    <%      
       if registration.upload_status == 'Accepted':
         regstatus = "Registration approved by Pearson"
       elif registration.upload_status == 'Error':

From c5cc15a92a22416c19ea713310a6a053f5526ba3 Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Thu, 3 Jan 2013 18:51:26 -0500
Subject: [PATCH 017/541] return json, and add validation errors.  Start
 displaying field with error.

---
 common/djangoapps/student/models.py     | 81 ++++++++++++++++++-------
 common/djangoapps/student/views.py      | 66 ++++++++------------
 lms/templates/test_center_register.html | 44 ++++++++++----
 3 files changed, 116 insertions(+), 75 deletions(-)

diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index 88b3c3cd80..d55abbe760 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -217,20 +217,26 @@ class TestCenterUser(models.Model):
             
         return False    
                               
-    def update(self, dict):
-        # leave user and client_candidate_id as before
-        self.user_updated_at = datetime.now()
-        for fieldname in TestCenterUser.user_provided_fields():
-            self.__setattr__(fieldname, dict[fieldname])
+#    def update(self, dict):
+#        # leave user and client_candidate_id as before
+#        self.user_updated_at = datetime.now()
+#        for fieldname in TestCenterUser.user_provided_fields():
+#            self.__setattr__(fieldname, dict[fieldname])
 
-    @staticmethod
-    def create(user, dict):
-        testcenter_user = TestCenterUser(user=user)
-        testcenter_user.update(dict)
-        # testcenter_user.candidate_id remains unset    
-        # TODO: assign an ID of our own:
-        testcenter_user.client_candidate_id = 'edx' + '123456'  # some unique value  
+#    @staticmethod
+#    def create(user, dict):
+#        testcenter_user = TestCenterUser(user=user)
+#        testcenter_user.update(dict)
+#        # testcenter_user.candidate_id remains unset    
+#        # TODO: assign an ID of our own:
+#        testcenter_user.client_candidate_id = 'edx' + unique_id_for_user(user)  # some unique value  
         
+    @staticmethod
+    def create(user):
+        testcenter_user = TestCenterUser(user=user)
+        # testcenter_user.candidate_id remains unset    
+        # assign an ID of our own:
+        testcenter_user.client_candidate_id = 'edx' + unique_id_for_user(user)  # some unique value  
 
 class TestCenterUserForm(ModelForm):
     class Meta:
@@ -239,8 +245,11 @@ class TestCenterUserForm(ModelForm):
                 'address_1', 'address_2', 'address_3', 'city', 'state', 'postal_code', 'country', 
                 'phone', 'extension', 'phone_country_code', 'fax', 'fax_country_code', 'company_name')
         
-        
-        
+    def update_and_save(self):
+        new_user = self.save(commit=False)
+        # create additional values here:
+        new_user.user_updated_at = datetime.now()
+        new_user.save()
         
         
    
@@ -286,7 +295,7 @@ class TestCenterRegistration(models.Model):
     user_updated_at = models.DateTimeField(db_index=True)
     # "client_authorization_id" is the client's unique identifier for the authorization.  
     # This must be present for an update or delete to be sent to Pearson.
-    # client_authorization_id = models.CharField(max_length=20, unique=True, db_index=True)
+    #client_authorization_id = models.CharField(max_length=20, unique=True, db_index=True)
 
     # information about the test, from the course policy:
     exam_series_code = models.CharField(max_length=15, db_index=True)
@@ -312,24 +321,50 @@ class TestCenterRegistration(models.Model):
     def client_candidate_id(self):
         return self.testcenter_user.client_candidate_id
     
-    @property
-    def client_authorization_id(self):
-        # TODO: make this explicitly into a string object:
-        return self.id
+    @staticmethod
+    def create(testcenter_user, course_id, exam_info, accommodation_request):
+        registration = TestCenterRegistration(testcenter_user = testcenter_user)
+        registration.course_id = course_id
+        registration.accommodation_request = accommodation_request
+        registration.exam_series_code = exam_info.get('Exam_Series_Code')
+        registration.eligibility_appointment_date_first = exam_info.get('First_Eligible_Appointment_Date')
+        registration.eligibility_appointment_date_last = exam_info.get('Last_Eligible_Appointment_Date')
+        # accommodation_code remains blank for now, along with Pearson confirmation
+        registration.user_updated_at = datetime.now()
+        #registration.client_authorization_id = registration._create_client_authorization_id()
+        return registration
+    
+    def _create_client_authorization_id(self):
+        """
+        Return a unique id for a registration, suitable for inserting into
+        e.g. personalized survey links.
+        """
+        # include the secret key as a salt, and to make the ids unique across
+        # different LMS installs.  Then add in (user, course, exam), which should 
+        # be unique.  
+        h = hashlib.md5()
+        h.update(settings.SECRET_KEY)
+        h.update(str(self.testcenter_user.user.id))
+        h.update(str(self.course_id))
+        h.update(str(self.exam_series_code))
+        return h.hexdigest()
 
-def get_testcenter_registrations_for_user_and_course(user, course_id):
+def get_testcenter_registrations_for_user_and_course(user, course_id, exam_series_code=None):
     try:
         tcu = TestCenterUser.objects.get(user=user)
     except TestCenterUser.DoesNotExist:
         return []
-    return TestCenterRegistration.objects.filter(testcenter_user=tcu, course_id=course_id)
-    
+    if exam_series_code is None:
+        return TestCenterRegistration.objects.filter(testcenter_user=tcu, course_id=course_id)
+    else:
+        return TestCenterRegistration.objects.filter(testcenter_user=tcu, course_id=course_id, exam_series_code=exam_series_code)
+        
 def unique_id_for_user(user):
     """
     Return a unique id for a user, suitable for inserting into
     e.g. personalized survey links.
     """
-    # include the secret key as a salt, and to make the ids unique accross
+    # include the secret key as a salt, and to make the ids unique across
     # different LMS installs.    
     h = hashlib.md5()
     h.update(settings.SECRET_KEY)
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 202bfefac5..1ad464bbc6 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -614,6 +614,8 @@ def begin_test_registration(request, course_id, form=None, message=''):
         registration = registrations[0]
     else:
         registration = None
+
+    log.info("User {0} enrolled in course {1} calls for test registration page".format(user.username, course_id))
         
     # we want to populate the registration page with the relevant information,
     # if it already exists.  Create an empty object otherwise.
@@ -654,44 +656,31 @@ def create_test_registration(request, post_override=None):
     user = User.objects.get(username=username)
     course_id = post_vars['course_id']
     course = (course_from_id(course_id))  # assume it will be found....
+    log.info("User {0} enrolled in course {1} clicked on enter/update demographic info for test registration".format(user.username, course_id))
         
-#    needs_saving = False
     try:
         testcenter_user = TestCenterUser.objects.get(user=user)
     except TestCenterUser.DoesNotExist:
-        testcenter_user = TestCenterUser(user=user)
+        # do additional initialization here:
+        testcenter_user = TestCenterUser.create(user)
 
     needs_updating = testcenter_user.needs_update(post_vars)    
-#        if needs_updating:
-#            testcenter_user.update(post_vars)
-#            needs_saving = True
-        
- #   except TestCenterUser.DoesNotExist:
-        # did not find the TestCenterUser, so create a new one 
-#        testcenter_user = TestCenterUser.create(user, post_vars)
-#        needs_saving = True
 
     # perform validation:
     if needs_updating:
+        log.info("User {0} enrolled in course {1} updating demographic info for test registration".format(user.username, course_id))
         try:
             # first perform validation on the user information 
             # using a Django Form.
             form = TestCenterUserForm(instance=testcenter_user, data=post_vars)
             if not form.is_valid():
-                return begin_test_registration(request, course_id, form, 'failed to validate')
-#                response_data = {'success': False}
-#                # return a list of errors...
-#                response_data['field_errors'] = form.errors
-#                response_data['non_field_errors'] = form.non_field_errors()
-#                return HttpResponse(json.dumps(response_data))
-        
-            new_user = form.save(commit=False)
-            # create additional values here:
-            new_user.user_updated_at = datetime.datetime.now()
-            # TODO: create client value....
-            new_user.save()
-                
-            # testcenter_user.save()
+#                return begin_test_registration(request, course_id, form, 'failed to validate')
+                response_data = {'success': False}
+                # return a list of errors...
+                response_data['field_errors'] = form.errors
+                response_data['non_field_errors'] = form.non_field_errors()
+                return HttpResponse(json.dumps(response_data), mimetype="application/json")
+            form.update_and_save()
         except IntegrityError, ie:
             js = {'success': False}
             error_msg = unicode(ie);
@@ -700,15 +689,16 @@ def create_test_registration(request, post_override=None):
                 if error_msg.find(fieldname) >= 0: 
                     js['value'] = error_msg
                     js['field'] = fieldname
-                    return HttpResponse(json.dumps(js))
+                    return HttpResponse(json.dumps(js), mimetype="application/json")
             # otherwise just return the error message        
             js['value'] = error_msg
             js['field'] = "General Error"
-            return HttpResponse(json.dumps(js))
+            return HttpResponse(json.dumps(js), mimetype="application/json")
             
     # create and save the registration:
     needs_saving = False
-    registrations = get_testcenter_registrations_for_user_and_course(user, course.id)
+    exam_info = course.testcenter_info
+    registrations = get_testcenter_registrations_for_user_and_course(user, course_id)
     # In future, this should check the exam series code of the registrations, if there
     # were multiple.
     if len(registrations) > 0:
@@ -719,15 +709,8 @@ def create_test_registration(request, post_override=None):
         # right now.
         
     else:
-        registration = TestCenterRegistration(testcenter_user = testcenter_user)
-        registration.course_id = post_vars['course_id']
-        registration.accommodation_request = post_vars.get('accommodations','')
-        exam_info = course.testcenter_info
-        registration.exam_series_code = exam_info.get('Exam_Series_Code')
-        registration.eligibility_appointment_date_first = exam_info.get('First_Eligible_Appointment_Date')
-        registration.eligibility_appointment_date_last = exam_info.get('Last_Eligible_Appointment_Date')
-        # accommodation_code remains blank for now, along with Pearson confirmation
-        registration.user_updated_at = datetime.datetime.now()
+        accommodation_request = post_vars.get('accommodations','')
+        registration = TestCenterRegistration.create(testcenter_user, course_id, exam_info, accommodation_request)
         needs_saving = True
         
     # "client_authorization_id" is the client's unique identifier for the authorization.  
@@ -790,14 +773,17 @@ def create_test_registration(request, post_override=None):
         except:
             log.exception(sys.exc_info())
             js['value'] = 'Could not send accommodation e-mail.'
-            return HttpResponse(json.dumps(js))
+            return HttpResponse(json.dumps(js), mimetype="application/json")
 
     # TODO: enable appropriate stat
     # statsd.increment("common.student.account_created")
 
-#    js = {'success': True}
-#    return HttpResponse(json.dumps(js), mimetype="application/json")
-    return HttpResponseRedirect(reverse('dashboard'))
+    log.info("User {0} enrolled in course {1} returning from enter/update demographic info for test registration".format(user.username, course_id))
+
+    js = {'success': True}
+    return HttpResponse(json.dumps(js), mimetype="application/json")
+#    return HttpResponseRedirect(reverse('dashboard'))
+    #return HttpResponse("Hello world")
 
 
 def get_random_post_override():
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index fe175b11e4..b5080ab9b2 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -10,7 +10,7 @@
 <%namespace name='static' file='static_content.html'/>
 
 <%block name="title"><title>Pearson VUE Test Center Proctoring - Sign Up</title></%block>
-<%doc>
+
 <%block name="js_extra">
   <script type="text/javascript">
   (function() {
@@ -19,9 +19,20 @@
       if(json.success) {
         location.href="${reverse('dashboard')}";
       } else {
-        $(".field.error").removeClass('error');
+          var field_errors = json.field_errors;
+          var non_field_errors = json.non_field_errors;
+          var fieldname;
+          var field_errorlist;
+          var field_error;
+          $(".field.error").removeClass('error');
+          for (fieldname in field_errors) {
+              field_errorlist = field_errors[fieldname];      
+              for (i=0; i < field_errorlist.length; i+= 1) {
+                  field_error = field_errorlist[i];
+              }
+              $("[data-field='"+fieldname+"']").addClass('error')
+          }
         $('#register_error').html(json.value).stop().css("display", "block");
-        $("[data-field='"+json.field+"']").addClass('error')
       }
     });
 
@@ -31,11 +42,20 @@
       $("label").removeClass("is-focused");
     });
 
+    $(document).delegate('#testcenter_register_form', 'ajax:success', function(data, json, xhr) {
+      if(json.success) {
+        location.href="${reverse('dashboard')}";
+      } else {
+        if($('#testcenter_register_error').length == 0) {
+          $('#testcenter_register_form').prepend('<div id="testcenter_register_error" class="modal-form-error"></div>');
+        }
+        $('#testcenter_register_error').text(json.field_errors).stop().css("display", "block");
+      }
+    });
+
   })(this)
   </script>
 </%block>
-</%doc>
-
 
 <section class="testcenter-register container">    
   
@@ -80,7 +100,7 @@
     <header>
       <h3 class="is-hidden">Registration Form</h3>
     </header>      
-    <form id="testcenter-register-form" method="post" data-remote="true" action="/create_test_registration">
+    <form id="testcenter_register_form" method="post" data-remote="true" action="/create_test_registration">
       
       % if registration:
       <p class="instructions">
@@ -103,11 +123,11 @@
           
           <ol class="list-input">
             <li class="field">
-              <label for="id-salutation">Salutation:</label>
+              <label for="id_salutation">Salutation:</label>
  	         	${form['salutation']}
             </li>
             <li class="field required">
-              <label for="id-first_name">First Name:</label>
+              <label for="id_first_name">First Name:</label>
  	         	${form['first_name']}
             </li>
 <!--            <li class="field">
@@ -153,19 +173,19 @@
               </div>
             </li>            
             <li class="field-group postal">
-              <div class="field">
+              <div data-field="city" class="field">
                 <label for="city">City</label>
                 <input id="city" class="short" type="text" name="city" value="${testcenteruser.city}" placeholder="e.g. Newark" />
               </div>
-              <div class="field">
+              <div data-field="state" class="field">
                 <label for="state">State/Province</label>
                 <input id="state" class="short" type="text" name="state" value="${testcenteruser.state}" placeholder="e.g. NJ" />
               </div>
-              <div class="field">
+              <div data-field="postal_code" class="field">
                 <label for="postal-code">Postal Code</label>
                 <input id="postal-code" class="short" type="text" name="postal_code" value="${testcenteruser.postal_code}" placeholder="e.g. 08540" />
               </div>
-              <div class="field required">
+              <div data-field="country" class="field required">
                 <label class="short" for="country-code">Country Code</label>
                 <input id="country-code" class="short" type="text" name="country" value="${testcenteruser.country}" placeholder="e.g. USA" />
               </div>

From e32dfcf0a0f20ed611d881959ef7c16da965bc9b Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Fri, 4 Jan 2013 01:39:40 -0500
Subject: [PATCH 018/541] get display of validation errors to work.

---
 common/djangoapps/student/models.py     |  14 +++
 common/djangoapps/student/views.py      | 102 ++++------------
 lms/templates/test_center_register.html | 147 +++++++++++++-----------
 3 files changed, 119 insertions(+), 144 deletions(-)

diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index d55abbe760..9254dff551 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -303,6 +303,7 @@ class TestCenterRegistration(models.Model):
     eligibility_appointment_date_last = models.DateField(db_index=True)
 
     # this is really a list of codes, using an '*' as a delimiter.
+    # So it's not a choice list.
     accommodation_code = models.CharField(max_length=64, blank=True)
     
     # store the original text of the accommodation request.
@@ -349,6 +350,19 @@ class TestCenterRegistration(models.Model):
         h.update(str(self.exam_series_code))
         return h.hexdigest()
 
+    def is_accepted(self):
+        return self.upload_status == 'Accepted'
+  
+    def is_rejected(self):
+        return self.upload_status == 'Error'
+    
+    def is_pending_accommodation(self):
+        return len(self.accommodation_request) > 0 and self.accommodation_code == ''
+        
+    def is_pending_acknowledgement(self):
+        return self.upload_status == '' and not self.is_pending_accommodation()
+
+
 def get_testcenter_registrations_for_user_and_course(user, course_id, exam_series_code=None):
     try:
         tcu = TestCenterUser.objects.get(user=user)
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 1ad464bbc6..de3dcde553 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -594,7 +594,7 @@ def create_account(request, post_override=None):
 
 @login_required
 @ensure_csrf_cookie
-def begin_test_registration(request, course_id, form=None, message=''):
+def begin_test_registration(request, course_id):
     user = request.user
 
     try:
@@ -605,6 +605,8 @@ def begin_test_registration(request, course_id, form=None, message=''):
 
     # get the exam to be registered for:
     # (For now, we just assume there is one at most.)
+    # TODO: this should be an object, including the course_id and the
+    # exam info for a particular exam from the course.
     exam_info = course.testcenter_info
 
     # figure out if the user is already registered for this exam:   
@@ -624,16 +626,11 @@ def begin_test_registration(request, course_id, form=None, message=''):
     except TestCenterUser.DoesNotExist:
         testcenteruser = TestCenterUser()
         testcenteruser.user = user
-
-    if form is None:
-        form = TestCenterUserForm(instance=testcenteruser)
         
     context = {'course': course,
                'user': user,
-               'message': message,
                'testcenteruser': testcenteruser,
                'registration': registration,
-               'form': form,
                'exam_info': exam_info,
                }
 
@@ -669,32 +666,18 @@ def create_test_registration(request, post_override=None):
     # perform validation:
     if needs_updating:
         log.info("User {0} enrolled in course {1} updating demographic info for test registration".format(user.username, course_id))
-        try:
-            # first perform validation on the user information 
-            # using a Django Form.
-            form = TestCenterUserForm(instance=testcenter_user, data=post_vars)
-            if not form.is_valid():
-#                return begin_test_registration(request, course_id, form, 'failed to validate')
-                response_data = {'success': False}
-                # return a list of errors...
-                response_data['field_errors'] = form.errors
-                response_data['non_field_errors'] = form.non_field_errors()
-                return HttpResponse(json.dumps(response_data), mimetype="application/json")
+        # first perform validation on the user information 
+        # using a Django Form.
+        form = TestCenterUserForm(instance=testcenter_user, data=post_vars)
+        if form.is_valid():
             form.update_and_save()
-        except IntegrityError, ie:
-            js = {'success': False}
-            error_msg = unicode(ie);
-            # attempt to find a field name to signal    
-            for fieldname in TestCenterUser.user_provided_fields():
-                if error_msg.find(fieldname) >= 0: 
-                    js['value'] = error_msg
-                    js['field'] = fieldname
-                    return HttpResponse(json.dumps(js), mimetype="application/json")
-            # otherwise just return the error message        
-            js['value'] = error_msg
-            js['field'] = "General Error"
-            return HttpResponse(json.dumps(js), mimetype="application/json")
-            
+        else:
+            response_data = {'success': False}
+            # return a list of errors...
+            response_data['field_errors'] = form.errors
+            response_data['non_field_errors'] = form.non_field_errors()
+            return HttpResponse(json.dumps(response_data), mimetype="application/json")
+        
     # create and save the registration:
     needs_saving = False
     exam_info = course.testcenter_info
@@ -712,53 +695,17 @@ def create_test_registration(request, post_override=None):
         accommodation_request = post_vars.get('accommodations','')
         registration = TestCenterRegistration.create(testcenter_user, course_id, exam_info, accommodation_request)
         needs_saving = True
-        
-    # "client_authorization_id" is the client's unique identifier for the authorization.  
-    # This must be present for an update or delete to be sent to Pearson.  
-    # Can we just use the id field of the registration?  Lets...
-    
+
+    # TODO: add validation of registration.  (Mainly whether an accommodation request is too long.)        
     if needs_saving:
-        try:
-            registration.save()
-        except IntegrityError, ie:
-            raise
+        registration.save()
         
-#    return (user, testcenter_user, registration)
-
-
-    # Confirm we have a properly formed request
-#    for a in ['first_name', 'last_name', 'address_1', 'city', 'country']:
-#        if a not in post_vars:
-#            js['value'] = "Error (401 {field}). E-mail us.".format(field=a)
-#            js['field'] = a
-#            return HttpResponse(json.dumps(js))
-#
-#    # Confirm appropriate fields are filled in with something for now
-#    for a in ['first_name', 'last_name', 'address_1', 'city', 'country']:
-#        if len(post_vars[a]) < 2:
-#            error_str = {'first_name': 'First name must be minimum of two characters long.',
-#                         'last_name': 'Last name must be minimum of two characters long.',
-#                         'address_1': 'Address must be minimum of two characters long.',
-#                         'city': 'City must be minimum of two characters long.',
-#                         'country': 'Country must be minimum of two characters long.',
-#                         }
-#            js['value'] = error_str[a]
-#            js['field'] = a
-#            return HttpResponse(json.dumps(js))
-
-    # Once the test_center_user information has been validated, create the entries:
-#    ret = _do_create_or_update_test_center_user(post_vars)
-#    if isinstance(ret,HttpResponse):		# if there was an error then return that
-#        return ret
-#
-#
-#    (user, testcenter_user, testcenter_registration) = ret
 
     # only do the following if there is accommodation text to send,
-    # and a destination to which to send it:
-    if 'accommodation' in post_vars and settings.MITX_FEATURES.get('ACCOMMODATION_EMAIL'):
-        d = {'accommodation': post_vars['accommodation']
-             }
+    # and a destination to which to send it.
+    # TODO: still need to create the accommodation email templates
+    if 'accommodations' in post_vars and settings.MITX_FEATURES.get('ACCOMMODATION_EMAIL'):
+        d = {'accommodations': post_vars['accommodations'] }
         
         # composes accommodation email
         subject = render_to_string('emails/accommodation_email_subject.txt', d)
@@ -772,8 +719,9 @@ def create_test_registration(request, post_override=None):
             send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [dest_addr], fail_silently=False)
         except:
             log.exception(sys.exc_info())
-            js['value'] = 'Could not send accommodation e-mail.'
-            return HttpResponse(json.dumps(js), mimetype="application/json")
+            response_data = {'success': False}
+            response_data['non_field_errors'] =  [ 'Could not send accommodation e-mail.', ]
+            return HttpResponse(json.dumps(response_data), mimetype="application/json")
 
     # TODO: enable appropriate stat
     # statsd.increment("common.student.account_created")
@@ -782,8 +730,6 @@ def create_test_registration(request, post_override=None):
 
     js = {'success': True}
     return HttpResponse(json.dumps(js), mimetype="application/json")
-#    return HttpResponseRedirect(reverse('dashboard'))
-    #return HttpResponse("Hello world")
 
 
 def get_random_post_override():
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index b5080ab9b2..da5f9f1450 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -17,22 +17,48 @@
 
     $(document).on('ajax:success', '#testcenter_register_form', function(data, json, xhr) {
       if(json.success) {
+        // when a form is successfully filled out, return back to the dashboard.
         location.href="${reverse('dashboard')}";
       } else {
-          var field_errors = json.field_errors;
-          var non_field_errors = json.non_field_errors;
-          var fieldname;
-          var field_errorlist;
-          var field_error;
-          $(".field.error").removeClass('error');
-          for (fieldname in field_errors) {
-              field_errorlist = field_errors[fieldname];      
-              for (i=0; i < field_errorlist.length; i+= 1) {
-                  field_error = field_errorlist[i];
-              }
-              $("[data-field='"+fieldname+"']").addClass('error')
+    	// 	This is performed by the following code that parses the errors returned as json by the 
+    	// 	registration form validation. 
+        var field_errors = json.field_errors;
+        var non_field_errors = json.non_field_errors;
+        var fieldname;
+        var field_errorlist;
+        var field_error;
+        var error_msg;
+        var num_errors = 0;
+        var error_html = '';
+        // first get rid of any errors that are already present:
+        $(".field.error").removeClass('error');
+        $("#submission-error-list").html(error_html);
+		// start to display new errors:
+        $(".submission-error").addClass("is-shown");
+        for (fieldname in field_errors) {
+          // to inform a user of what field the error occurred on, add a class of .error to the .field element.
+          // for convenience, use the "data-field" attribute to identify the one matching the errant field's name.
+          $("[data-field='"+fieldname+"']").addClass('error')
+          field_errorlist = field_errors[fieldname];      
+          for (i=0; i < field_errorlist.length; i+= 1) {
+            field_error = field_errorlist[i];
+            error_msg = fieldname + ": " + field_error;
+          	error_html =  error_html + '<li class="to-be-determined">' + error_msg + '</li>';
+          	num_errors += 1;
           }
-        $('#register_error').html(json.value).stop().css("display", "block");
+        }
+        for (i=0; i < non_field_errors.length; i+= 1) {
+          error_msg = non_field_errors[i];
+      	  error_html = error_html + '<li class="to-be-determined">' + error_msg + '</li>';
+       	  num_errors += 1;
+        }
+        if (num_errors == 1) {
+        	error_msg = 'was an error';
+		} else {
+        	error_msg = 'were ' + num_errors + ' errors';
+		}
+	    $('#submission-error-heading').text("We're sorry, but there " + error_msg + " in the information you provided below:")
+        $("#submission-error-list").html(error_html);
       }
     });
 
@@ -80,20 +106,12 @@
     <div class="message message-status submission-saved">
       <p class="message-copy">Your registration data has been updated and saved.</p>
     </div>
-    
-    <!-- NOTE: BT - registration error message  -->
-    % if message:
-    <div class="message message-status submission-error">
-      <p class="message-copy">${message}</p>
-    </div> 
-    % endif
-    
+        
     <!-- NOTE: BT - Sample markup for error message.  To display, add "is-shown" class to div -->
-    % if form.errors and len(form.errors) > 0:
-    <div class="message message-status submission-error is-shown">
-      <p class="message-copy">We're Sorry, but there was an error with the information you provided below:</p>
+    <div class="message message-status submission-error">
+      <p id="submission-error-heading" class="message-copy"></p>
+      <ul id="submission-error-list"/>
     </div>
-    % endif 
   </section>
   
   <section class="content">
@@ -122,32 +140,23 @@
           <legend class="is-hidden">Personal Information</legend>
           
           <ol class="list-input">
-            <li class="field">
-              <label for="id_salutation">Salutation:</label>
- 	         	${form['salutation']}
-            </li>
-            <li class="field required">
-              <label for="id_first_name">First Name:</label>
- 	         	${form['first_name']}
-            </li>
-<!--            <li class="field">
+            <li data-field="salutation" class="field">
               <label for="salutation">Salutation</label>
               <input class="short" id="salutation" type="text" name="salutation" value="${testcenteruser.salutation}" placeholder="e.g. Mr., Ms., Mrs., Dr." />              
             </li>
-   -->         <!-- NOTE: BT - to inform a user of what field the error occurred on, add a class of .error to the .field element -->
-<!--            <li class="field required">
+            <li data-field="first_name" class="field required">
               <label for="name-first">First Name </label>
               <input id="name-first" type="text" name="first_name" value="${testcenteruser.first_name}" placeholder="e.g. Albert" />
             </li>
- -->           <li class="field">
+            <li data-field="middle_name" class="field">
               <label for="name-middle">Middle Name</label>
               <input id="name-middle" type="text" name="middle_name" value="${testcenteruser.middle_name}" placeholder="" />
             </li>
-            <li class="field required">
+            <li data-field="last_name" class="field required">
               <label for="name-last">Last Name</label>
               <input id="name-last" type="text" name="last_name" value="${testcenteruser.last_name}" placeholder="e.g. Einstein" />
             </li>
-            <li class="field">
+            <li data-field="suffix" class="field">
               <label for="name-suffix">Suffix</label>
               <input class="short" id="name-suffix" type="text" name="suffix" value="${testcenteruser.suffix}" placeholder="e.g. Jr., Sr. " />
             </li>
@@ -158,22 +167,22 @@
           <legend class="is-hidden">Mailing Address</legend>
           
           <ol class="list-input">
-            <li class="field">
+            <li data-field="address_1" class="field required">
               <label class="long" for="address-1">Address Line #1</label>
               <input id="address-1" type="text" name="address_1" value="${testcenteruser.address_1}" placeholder="e.g. 112 Mercer Street" />              
             </li>
             <li class="field-group addresses">
-              <div class="field">
+              <div data-field="address_2" class="field">
                 <label for="address-2">Address Line #2</label>
                 <input id="address-2" class="long" type="text" name="address_2" value="${testcenteruser.address_2}" placeholder="e.g. Apartment 123" />
               </div>
-              <div class="field">
+              <div data-field="address_3" class="field">
                 <label for="address-3">Address Line #3</label>
                 <input id="address-3" class="long" type="text" name="address_3" value="${testcenteruser.address_3}" placeholder="e.g. Attention: Albert Einstein" />
               </div>
             </li>            
             <li class="field-group postal">
-              <div data-field="city" class="field">
+              <div data-field="city" class="field required">
                 <label for="city">City</label>
                 <input id="city" class="short" type="text" name="city" value="${testcenteruser.city}" placeholder="e.g. Newark" />
               </div>
@@ -198,30 +207,30 @@
           
           <ol class="list-input">
             <li class="field-group phoneinfo">
-              <div class="field required">
+              <div data-field="phone" class="field required">
                 <label for="phone">Phone Number</label>
                 <input id="phone" type="text" name="phone" value="${testcenteruser.phone}" placeholder="e.g. 1-55-555-5555" />              
               </div>
-              <div class="field">
+              <div data-field="extension" class="field">
                 <label for="phone-extension">Extension</label>
                 <input id="phone-extension" class="short" type="text" name="extension" value="${testcenteruser.extension}" placeholder="e.g. 555" />
               </div>
-              <div class="field required">
+              <div data-field="phone_country_code" class="field required">
                 <label for="phone-countrycode">Phone Country Code</label>
                 <input id="phone-countrycode" class="short" type="text" name="phone_country_code" value="${testcenteruser.phone_country_code}" placeholder="e.g. USA" />
               </div>
             </li>
             <li class="field-group faxinfo">
-              <div class="field">
+              <div data-field="fax" class="field">
                 <label for="fax">Fax Number</label>
                 <input id="fax" type="text" class="short" name="fax" value="${testcenteruser.fax}" placeholder="e.g. 1-55-555-5555" />
               </div>
-              <div class="field">
+              <div data-field="fax_country_code" class="field">
                 <label for="fax-countrycode">Fax Country Code</label>
                 <input id="fax-countrycode" class="short" type="text" name="fax_country_code" value="${testcenteruser.fax_country_code}" placeholder="e.g. USA" />
               </div>
             </li>
-            <li class="field">
+            <li data-field="company_name" class="field">
               <label for="company">Company</label>
               <input id="company" type="text" name="company_name" value="${testcenteruser.company_name}" placeholder="e.g. American Association of University Professors" />
             </li>
@@ -230,7 +239,7 @@
       </div>
       
       <div class="form-fields-secondary">
-        <!-- NOTE: BT - Assuming accomodations cannot be edited after a user originally submits registration, I've disabled the field and provided different text. Correct if this is not the case. -->
+        <!-- NOTE: BT - Assuming accommodations cannot be edited after a user originally submits registration, I've disabled the field and provided different text. Correct if this is not the case. -->
         % if registration:
         <p class="instructions">Fields below this point are not part of the demographics, and are not editable currently.</p>
         % else: 
@@ -240,16 +249,22 @@
         <fieldset class="group group-form group-form-optional">
           <legend class="is-hidden">Optional Information</legend>
           
+          <!-- Only display an accommodation request if one had been specified at registration time. 
+               So only prompt for an accommodation request if no registration exists. 
+               BW: Bug.  It is not enough to set the value of the disabled control.  It does
+               not display any text.  Perhaps we can use a different control. -->
           <ol class="list-input">
             % if registration:
+              % if registration.accommodation_request and len(registration.accommodation_request) > 0:
             <li class="field disabled">
               <label for="accommodations">Accommodations Requested</label>
-              <textarea class="long" id="accommodations"value="" placeholder="" disabled="disabled"></textarea>
+              <textarea class="long" id="accommodations" value="${registration.accommodation_request}" placeholder="" disabled="disabled"></textarea>
             </li>
+              % endif
             % else: 
             <li class="field">
               <label for="accommodations">Accommodations Requested</label>
-              <textarea class="long" id="accommodations"value="" placeholder=""></textarea>             
+              <textarea class="long" id="accommodations" name="accommodations" value="" placeholder=""></textarea>             
             </li>
             % endif
           </ol>
@@ -270,19 +285,8 @@
    % if registration:
     <h3 class="is-hidden">Registration Details</h3>
     
-    <%      
-      if registration.upload_status == 'Accepted':
-        regstatus = "Registration approved by Pearson"
-      elif registration.upload_status == 'Error':
-        regstatus = "Registration rejected by Pearson: %s" % registration.upload_error_message
-      elif len(registration.accommodation_request) > 0 and registration.accommodation_code == '':
-        regstatus = "Registration pending approval of accommodation request"
-      else:
-        regstatus = "Registration pending acknowledgement by Pearson"
-    %>
-    
     <!-- NOTE: BT - state for if registration is accepted -->
-    % if registration.upload_status == 'Accepted':
+    % if registration.is_accepted():
       <% regstatus = "Registration approved by Pearson" %>
     <div class="message message-status registration-accepted is-shown">
       <p class="registration-status"><span class="label">Registration Status: </span><span class="value">${regstatus}</span></p>
@@ -292,7 +296,7 @@
     </div>
     % endif
     
-    % if registration.upload_status == 'Error':
+    % if registration.is_rejected():
     <!-- NOTE: BT - state for if registration is rejected -->
       <% regstatus = "Registration rejected by Pearson: %s" % registration.upload_error_message %>
     <div class="message message-status registration-rejected is-shown">
@@ -301,14 +305,25 @@
     </div>
     % endif
     
-    % if len(registration.accommodation_request) > 0 and registration.accommodation_code == '':
+    % if registration.is_pending_accommodation():
         <% regstatus = "Registration pending approval of accommodation request" %>
     <!-- NOTE: BT - state for if registration is pending -->
+    <div class="message message-status registration-pending is-shown">
+      <p class="registration-status"><span class="label">Registration Status: </span><span class="value">${regstatus}</span></p>
+      <p class="message-copy">Your registration for the Pearson exam is pending. Within a few days, you should see confirmation here of granted accommodations.
+      	At that point, your registration will be forwarded to Pearson.</p>
+    </div>
+    % endif
+
+    % if registration.is_pending_acknowledgement():
+        <% regstatus = "Registration pending acknowledgement by Pearson" %>
+    <!-- NOTE: BT - state for if registration is pending -->
     <div class="message message-status registration-pending is-shown">
       <p class="registration-status"><span class="label">Registration Status: </span><span class="value">${regstatus}</span></p>
       <p class="message-copy">Your registration for the Pearson exam is pending. Within a few days, you should see a confirmation number here, which can be used to schedule your exam.</p>
     </div>
     % endif
+
    % endif
     
     <div class="details details-course">

From ea8a56da0ae33db6a60982d1d37f00a551c8c8a5 Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Fri, 4 Jan 2013 18:45:46 -0500
Subject: [PATCH 019/541] add id generation and validation

---
 ...022_add_more_fields_to_test_center_user.py |  59 +++++---
 common/djangoapps/student/models.py           | 137 +++++++++++++-----
 common/djangoapps/student/views.py            |  32 ++--
 lms/templates/dashboard.html                  |   2 +-
 lms/templates/test_center_register.html       |  17 +--
 5 files changed, 161 insertions(+), 86 deletions(-)

diff --git a/common/djangoapps/student/migrations/0022_add_more_fields_to_test_center_user.py b/common/djangoapps/student/migrations/0022_add_more_fields_to_test_center_user.py
index 1bffec2213..25d20f9e0d 100644
--- a/common/djangoapps/student/migrations/0022_add_more_fields_to_test_center_user.py
+++ b/common/djangoapps/student/migrations/0022_add_more_fields_to_test_center_user.py
@@ -8,29 +8,15 @@ from django.db import models
 class Migration(SchemaMigration):
 
     def forwards(self, orm):
-        # Adding field 'TestCenterUser.upload_status'
-        db.add_column('student_testcenteruser', 'upload_status',
-                      self.gf('django.db.models.fields.CharField')(default='', max_length=20, blank=True),
-                      keep_default=False)
-
-        # Adding field 'TestCenterUser.uploaded_at'
-        db.add_column('student_testcenteruser', 'uploaded_at',
-                      self.gf('django.db.models.fields.DateTimeField')(null=True, db_index=True),
-                      keep_default=False)
-
-        # Adding field 'TestCenterUser.upload_error_message'
-        db.add_column('student_testcenteruser', 'upload_error_message',
-                      self.gf('django.db.models.fields.CharField')(default='', max_length=512, blank=True),
-                      keep_default=False)
-
         # Adding model 'TestCenterRegistration'
         db.create_table('student_testcenterregistration', (
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('testcenter_user', self.gf('django.db.models.fields.related.ForeignKey')(default=None, to=orm['student.TestCenterUser'], unique=True)),
+            ('testcenter_user', self.gf('django.db.models.fields.related.ForeignKey')(default=None, to=orm['student.TestCenterUser'])),
             ('course_id', self.gf('django.db.models.fields.CharField')(max_length=128, db_index=True)),
             ('created_at', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, db_index=True, blank=True)),
             ('updated_at', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, db_index=True, blank=True)),
             ('user_updated_at', self.gf('django.db.models.fields.DateTimeField')(db_index=True)),
+            ('client_authorization_id', self.gf('django.db.models.fields.CharField')(unique=True, max_length=20, db_index=True)),
             ('exam_series_code', self.gf('django.db.models.fields.CharField')(max_length=15, db_index=True)),
             ('eligibility_appointment_date_first', self.gf('django.db.models.fields.DateField')(db_index=True)),
             ('eligibility_appointment_date_last', self.gf('django.db.models.fields.DateField')(db_index=True)),
@@ -42,8 +28,35 @@ class Migration(SchemaMigration):
         ))
         db.send_create_signal('student', ['TestCenterRegistration'])
 
+        # Adding field 'TestCenterUser.upload_status'
+        db.add_column('student_testcenteruser', 'upload_status',
+                      self.gf('django.db.models.fields.CharField')(db_index=True, default='', max_length=20, blank=True),
+                      keep_default=False)
+
+        # Adding field 'TestCenterUser.uploaded_at'
+        db.add_column('student_testcenteruser', 'uploaded_at',
+                      self.gf('django.db.models.fields.DateTimeField')(db_index=True, null=True, blank=True),
+                      keep_default=False)
+
+        # Adding field 'TestCenterUser.upload_error_message'
+        db.add_column('student_testcenteruser', 'upload_error_message',
+                      self.gf('django.db.models.fields.CharField')(default='', max_length=512, blank=True),
+                      keep_default=False)
+
+        # Adding index on 'TestCenterUser', fields ['company_name']
+        db.create_index('student_testcenteruser', ['company_name'])
+
+        # Adding unique constraint on 'TestCenterUser', fields ['client_candidate_id']
+        db.create_unique('student_testcenteruser', ['client_candidate_id'])
+
 
     def backwards(self, orm):
+        # Removing unique constraint on 'TestCenterUser', fields ['client_candidate_id']
+        db.delete_unique('student_testcenteruser', ['client_candidate_id'])
+
+        # Removing index on 'TestCenterUser', fields ['company_name']
+        db.delete_index('student_testcenteruser', ['company_name'])
+
         # Deleting model 'TestCenterRegistration'
         db.delete_table('student_testcenterregistration')
 
@@ -126,17 +139,17 @@ class Migration(SchemaMigration):
             'accommodation_code': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
             'accommodation_request': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}),
             'client_authorization_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20', 'db_index': 'True'}),
-            'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
             'course_id': ('django.db.models.fields.CharField', [], {'max_length': '128', 'db_index': 'True'}),
             'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
             'eligibility_appointment_date_first': ('django.db.models.fields.DateField', [], {'db_index': 'True'}),
             'eligibility_appointment_date_last': ('django.db.models.fields.DateField', [], {'db_index': 'True'}),
             'exam_series_code': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'testcenter_user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['student.TestCenterUser']", 'unique': 'True'}),
+            'testcenter_user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['student.TestCenterUser']"}),
             'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
             'upload_error_message': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}),
             'upload_status': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
+            'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}),
             'user_updated_at': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'})
         },
         'student.testcenteruser': {
@@ -146,9 +159,8 @@ class Migration(SchemaMigration):
             'address_3': ('django.db.models.fields.CharField', [], {'max_length': '40', 'blank': 'True'}),
             'candidate_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'db_index': 'True'}),
             'city': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'}),
-            'client_candidate_id': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
-            'company_name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
-            'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}),
+            'client_candidate_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50', 'db_index': 'True'}),
+            'company_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '50', 'blank': 'True'}),
             'country': ('django.db.models.fields.CharField', [], {'max_length': '3', 'db_index': 'True'}),
             'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
             'extension': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '8', 'blank': 'True'}),
@@ -166,7 +178,8 @@ class Migration(SchemaMigration):
             'suffix': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
             'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
             'upload_error_message': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}),
-            'upload_status': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
+            'upload_status': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '20', 'blank': 'True'}),
+            'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
             'user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['auth.User']", 'unique': 'True'}),
             'user_updated_at': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'})
         },
@@ -194,4 +207,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['student']
+    complete_apps = ['student']
\ No newline at end of file
diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index 9254dff551..84bb4f9b3a 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -40,6 +40,7 @@ import hashlib
 import json
 import logging
 import uuid
+from random import randint
 
 
 from django.conf import settings
@@ -47,10 +48,12 @@ from django.contrib.auth.models import User
 from django.db import models
 from django.db.models.signals import post_save
 from django.dispatch import receiver
-from django.forms import ModelForm
+from django.forms import ModelForm, forms
 
 import comment_client as cc
 from django_comment_client.models import Role
+from feedparser import binascii
+import os
 
 
 log = logging.getLogger(__name__)
@@ -160,7 +163,7 @@ class TestCenterUser(models.Model):
     candidate_id = models.IntegerField(null=True, db_index=True)
 
     # Unique ID we assign our user for the Test Center.
-    client_candidate_id = models.CharField(max_length=50, db_index=True)
+    client_candidate_id = models.CharField(unique=True, max_length=50, db_index=True)
 
     # Name
     first_name = models.CharField(max_length=30, db_index=True)
@@ -191,10 +194,10 @@ class TestCenterUser(models.Model):
     fax_country_code = models.CharField(max_length=3, blank=True)
 
     # Company
-    company_name = models.CharField(max_length=50, blank=True)
+    company_name = models.CharField(max_length=50, blank=True, db_index=True)
 
     # Confirmation
-    upload_status = models.CharField(max_length=20, blank=True)  # 'Error' or 'Accepted'
+    upload_status = models.CharField(max_length=20, blank=True, db_index=True)  # 'Error' or 'Accepted'
     uploaded_at = models.DateTimeField(null=True, blank=True, db_index=True)
     upload_error_message = models.CharField(max_length=512, blank=True)
     
@@ -217,26 +220,21 @@ class TestCenterUser(models.Model):
             
         return False    
                               
-#    def update(self, dict):
-#        # leave user and client_candidate_id as before
-#        self.user_updated_at = datetime.now()
-#        for fieldname in TestCenterUser.user_provided_fields():
-#            self.__setattr__(fieldname, dict[fieldname])
-
-#    @staticmethod
-#    def create(user, dict):
-#        testcenter_user = TestCenterUser(user=user)
-#        testcenter_user.update(dict)
-#        # testcenter_user.candidate_id remains unset    
-#        # TODO: assign an ID of our own:
-#        testcenter_user.client_candidate_id = 'edx' + unique_id_for_user(user)  # some unique value  
+    @staticmethod
+    def _generate_candidate_id():
+        NUM_DIGITS = 12
+        return u"edX%0d" % randint(1, 10**NUM_DIGITS-1) # binascii.hexlify(os.urandom(8))
         
     @staticmethod
     def create(user):
         testcenter_user = TestCenterUser(user=user)
         # testcenter_user.candidate_id remains unset    
         # assign an ID of our own:
-        testcenter_user.client_candidate_id = 'edx' + unique_id_for_user(user)  # some unique value  
+        cand_id = TestCenterUser._generate_candidate_id()
+        while TestCenterUser.objects.filter(client_candidate_id=cand_id).exists():
+            cand_id = TestCenterUser._generate_candidate_id()
+        testcenter_user.client_candidate_id = cand_id  
+        return testcenter_user
 
 class TestCenterUserForm(ModelForm):
     class Meta:
@@ -251,6 +249,60 @@ class TestCenterUserForm(ModelForm):
         new_user.user_updated_at = datetime.now()
         new_user.save()
         
+    # add validation:
+    
+    @staticmethod
+    def can_encode_as_latin(fieldvalue):
+        try:
+            fieldvalue.encode('iso-8859-1')
+        except UnicodeEncodeError:
+            return False
+        return True
+    
+    def check_country_code(self, fieldname):
+        code = self.cleaned_data[fieldname]
+        if code and len(code) != 3:
+            raise forms.ValidationError(u'Must be three characters (ISO 3166-1):  e.g. USA, CAN, MNG')
+        return code
+        
+    def clean_country(self):
+        return self.check_country_code('country')
+        
+    def clean_phone_country_code(self):
+        return self.check_country_code('phone_country_code')
+
+    def clean_fax_country_code(self):
+        return self.check_country_code('fax_country_code')
+        
+    def clean(self):
+        cleaned_data = super(TestCenterUserForm, self).clean()
+        
+        # check for interactions between fields:
+        if 'country' in cleaned_data:
+            country = cleaned_data.get('country')
+            if country == 'USA' or country == 'CAN':
+                if 'state' in cleaned_data and len(cleaned_data['state']) == 0:
+                    self._errors['state'] = self.error_class([u'Required if country is USA or CAN.'])                
+                    del cleaned_data['state']
+
+                if 'postal_code' in cleaned_data and len(cleaned_data['postal_code']) == 0:
+                    self._errors['postal_code'] = self.error_class([u'Required if country is USA or CAN.'])                
+                    del cleaned_data['postal_code']
+                    
+        if 'fax' in cleaned_data and len(cleaned_data['fax']) > 0 and 'fax_country_code' in cleaned_data and len(cleaned_data['fax_country_code']) == 0:
+            self._errors['fax_country_code'] = self.error_class([u'Required if fax is specified.'])                
+            del cleaned_data['fax_country_code']
+
+        # check encoding for all fields:
+        cleaned_data_fields = [fieldname for fieldname in cleaned_data]
+        for fieldname in cleaned_data_fields:
+            if not TestCenterUserForm.can_encode_as_latin(cleaned_data[fieldname]):
+                self._errors[fieldname] = self.error_class([u'Must only use characters in Latin-1 encoding'])                
+                del cleaned_data[fieldname]
+
+        # Always return the full collection of cleaned data.
+        return cleaned_data
+        
         
    
 ACCOMODATION_CODES = (
@@ -282,7 +334,7 @@ class TestCenterRegistration(models.Model):
     # to find an exam registration, we key off of the user and course_id.
     # If multiple exams per course are possible, we would also need to add the 
     # exam_series_code.
-    testcenter_user = models.ForeignKey(TestCenterUser, unique=True, default=None)
+    testcenter_user = models.ForeignKey(TestCenterUser, default=None)
     course_id = models.CharField(max_length=128, db_index=True)
     
     created_at = models.DateTimeField(auto_now_add=True, db_index=True)
@@ -295,7 +347,7 @@ class TestCenterRegistration(models.Model):
     user_updated_at = models.DateTimeField(db_index=True)
     # "client_authorization_id" is the client's unique identifier for the authorization.  
     # This must be present for an update or delete to be sent to Pearson.
-    #client_authorization_id = models.CharField(max_length=20, unique=True, db_index=True)
+    client_authorization_id = models.CharField(max_length=20, unique=True, db_index=True)
 
     # information about the test, from the course policy:
     exam_series_code = models.CharField(max_length=15, db_index=True)
@@ -311,7 +363,7 @@ class TestCenterRegistration(models.Model):
 
     # Confirmation
     upload_status = models.CharField(max_length=20, blank=True)  # 'Error' or 'Accepted'
-    uploaded_at = models.DateTimeField(null=True, blank=True, db_index=True)
+    uploaded_at = models.DateTimeField(null=True, db_index=True)
     upload_error_message = models.CharField(max_length=512, blank=True)
 
     @property
@@ -331,25 +383,26 @@ class TestCenterRegistration(models.Model):
         registration.eligibility_appointment_date_first = exam_info.get('First_Eligible_Appointment_Date')
         registration.eligibility_appointment_date_last = exam_info.get('Last_Eligible_Appointment_Date')
         # accommodation_code remains blank for now, along with Pearson confirmation
-        registration.user_updated_at = datetime.now()
-        #registration.client_authorization_id = registration._create_client_authorization_id()
+        registration.client_authorization_id = registration._create_client_authorization_id()
         return registration
+
+    @staticmethod
+    def _generate_authorization_id():
+        NUM_DIGITS = 12
+        return u"edX%0d" % randint(1, 10**NUM_DIGITS-1) # binascii.hexlify(os.urandom(8))
+    
     
     def _create_client_authorization_id(self):
         """
-        Return a unique id for a registration, suitable for inserting into
-        e.g. personalized survey links.
+        Return a unique id for a registration, suitable for using as an authorization code
+        for Pearson.  It must fit within 20 characters.
         """
-        # include the secret key as a salt, and to make the ids unique across
-        # different LMS installs.  Then add in (user, course, exam), which should 
-        # be unique.  
-        h = hashlib.md5()
-        h.update(settings.SECRET_KEY)
-        h.update(str(self.testcenter_user.user.id))
-        h.update(str(self.course_id))
-        h.update(str(self.exam_series_code))
-        return h.hexdigest()
-
+        # generate a random value, and check to see if it already is in use here
+        auth_id = TestCenterRegistration._generate_authorization_id()
+        while TestCenterRegistration.objects.filter(client_authorization_id=auth_id).exists():
+            auth_id = TestCenterRegistration._generate_authorization_id()
+        return auth_id
+            
     def is_accepted(self):
         return self.upload_status == 'Accepted'
   
@@ -362,7 +415,21 @@ class TestCenterRegistration(models.Model):
     def is_pending_acknowledgement(self):
         return self.upload_status == '' and not self.is_pending_accommodation()
 
+class TestCenterRegistrationForm(ModelForm):
+    class Meta:
+        model = TestCenterRegistration
+        fields = ( 'accommodation_request', )
+        
+    def update_and_save(self):
+        registration = self.save(commit=False)
+        # create additional values here:
+        registration.user_updated_at = datetime.now()
+        registration.save()
 
+    # TODO: add validation code for values added to accommodation_code field.
+    
+    
+    
 def get_testcenter_registrations_for_user_and_course(user, course_id, exam_series_code=None):
     try:
         tcu = TestCenterUser.objects.get(user=user)
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index de3dcde553..61a0d59c18 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -18,18 +18,17 @@ from django.contrib.auth.models import User
 from django.contrib.auth.decorators import login_required
 from django.core.context_processors import csrf
 from django.core.mail import send_mail
-from django.core.urlresolvers import reverse
 from django.core.validators import validate_email, validate_slug, ValidationError
 from django.db import IntegrityError
-from django.http import HttpResponse, HttpResponseForbidden, Http404,\
-    HttpResponseRedirect
+from django.http import HttpResponse, HttpResponseForbidden, Http404
 from django.shortcuts import redirect
 from mitxmako.shortcuts import render_to_response, render_to_string
 from bs4 import BeautifulSoup
 from django.core.cache import cache
 
 from django_future.csrf import ensure_csrf_cookie, csrf_exempt
-from student.models import (Registration, UserProfile, TestCenterUser, TestCenterUserForm, TestCenterRegistration,
+from student.models import (Registration, UserProfile, TestCenterUser, TestCenterUserForm, 
+                            TestCenterRegistration, TestCenterRegistrationForm,
                             PendingNameChange, PendingEmailChange,
                             CourseEnrollment, unique_id_for_user,
                             get_testcenter_registrations_for_user_and_course)
@@ -248,8 +247,6 @@ def dashboard(request):
                'show_courseware_links_for' : show_courseware_links_for,
                'cert_statuses': cert_statuses,
                'news': top_news,
-# No longer needed here...move to begin_registration               
-#               'testcenteruser': testcenteruser,
                }
 
     return render_to_response('dashboard.html', context)
@@ -657,11 +654,12 @@ def create_test_registration(request, post_override=None):
         
     try:
         testcenter_user = TestCenterUser.objects.get(user=user)
+        needs_updating = testcenter_user.needs_update(post_vars)    
     except TestCenterUser.DoesNotExist:
         # do additional initialization here:
         testcenter_user = TestCenterUser.create(user)
+        needs_updating = True
 
-    needs_updating = testcenter_user.needs_update(post_vars)    
 
     # perform validation:
     if needs_updating:
@@ -692,20 +690,28 @@ def create_test_registration(request, post_override=None):
         # right now.
         
     else:
-        accommodation_request = post_vars.get('accommodations','')
+        accommodation_request = post_vars.get('accommodation_request','')
         registration = TestCenterRegistration.create(testcenter_user, course_id, exam_info, accommodation_request)
         needs_saving = True
 
-    # TODO: add validation of registration.  (Mainly whether an accommodation request is too long.)        
     if needs_saving:
-        registration.save()
-        
+        # do validation of registration.  (Mainly whether an accommodation request is too long.)        
+        form = TestCenterRegistrationForm(instance=registration, data=post_vars)
+        if form.is_valid():
+            form.update_and_save()
+        else:
+            response_data = {'success': False}
+            # return a list of errors...
+            response_data['field_errors'] = form.errors
+            response_data['non_field_errors'] = form.non_field_errors()
+            return HttpResponse(json.dumps(response_data), mimetype="application/json")
+         
 
     # only do the following if there is accommodation text to send,
     # and a destination to which to send it.
     # TODO: still need to create the accommodation email templates
-    if 'accommodations' in post_vars and settings.MITX_FEATURES.get('ACCOMMODATION_EMAIL'):
-        d = {'accommodations': post_vars['accommodations'] }
+    if 'accommodation_request' in post_vars and settings.MITX_FEATURES.get('ACCOMMODATION_EMAIL'):
+        d = {'accommodation_request': post_vars['accommodation_request'] }
         
         # composes accommodation email
         subject = render_to_string('emails/accommodation_email_subject.txt', d)
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index 384ffec0ac..5db8a4cd2a 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -247,7 +247,7 @@
                 <div class="message message-status is-shown exam-schedule">
                 	<!-- TODO: pull Pearson destination out into a Setting -->
                    <a href="https://www1.pearsonvue.com/testtaker/signin/SignInPage/EDX" class="exam-button">Schedule Pearson exam</a>
-                   <p class="exam-registration-number"><a href="${testcenter_register_target}" id="exam_register_link">Registration</a> number: <strong>edx00015879548</strong></p>
+                   <p class="exam-registration-number"><a href="${testcenter_register_target}" id="exam_register_link">Registration</a> number: <strong>${registrations[0].client_authorization_id}</strong></p>
                    <p class="message-copy">Write this down! You’ll need it to schedule your exam.</p>
                 </div>
                 % endif
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index da5f9f1450..7b80ebc46b 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -68,17 +68,6 @@
       $("label").removeClass("is-focused");
     });
 
-    $(document).delegate('#testcenter_register_form', 'ajax:success', function(data, json, xhr) {
-      if(json.success) {
-        location.href="${reverse('dashboard')}";
-      } else {
-        if($('#testcenter_register_error').length == 0) {
-          $('#testcenter_register_form').prepend('<div id="testcenter_register_error" class="modal-form-error"></div>');
-        }
-        $('#testcenter_register_error').text(json.field_errors).stop().css("display", "block");
-      }
-    });
-
   })(this)
   </script>
 </%block>
@@ -262,9 +251,9 @@
             </li>
               % endif
             % else: 
-            <li class="field">
+            <li data-field="accommodation_request" class="field">
               <label for="accommodations">Accommodations Requested</label>
-              <textarea class="long" id="accommodations" name="accommodations" value="" placeholder=""></textarea>             
+              <textarea class="long" id="accommodations" name="accommodation_request" value="" placeholder=""></textarea>             
             </li>
             % endif
           </ol>
@@ -290,7 +279,7 @@
       <% regstatus = "Registration approved by Pearson" %>
     <div class="message message-status registration-accepted is-shown">
       <p class="registration-status"><span class="label">Registration Status: </span><span class="value">${regstatus}</span></p>
-      <p class="registration-number"><span class="label">Registration number: </span> <span class="value">edx00015879548</span></p>
+      <p class="registration-number"><span class="label">Registration number: </span> <span class="value">${registration.client_authorization_id}</span></p>
       <p class="message-copy">Write this down! You’ll need it to schedule your exam.</p>
       <a href="https://www1.pearsonvue.com/testtaker/signin/SignInPage/EDX" class="button exam-button">Schedule Pearson exam</a>
     </div>

From e57656e24f325a7685f5edc3418f13aa577a4ff9 Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Sun, 6 Jan 2013 17:57:13 -0500
Subject: [PATCH 020/541] Add TestCenterExam class to course module, and plumb
 through.

---
 common/djangoapps/student/models.py         |  35 +++---
 common/djangoapps/student/views.py          |  65 +++++++-----
 common/lib/xmodule/xmodule/course_module.py | 112 +++++++++++++++++---
 lms/templates/dashboard.html                |  46 ++++----
 lms/templates/test_center_register.html     |  41 ++++---
 5 files changed, 204 insertions(+), 95 deletions(-)

diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index 84bb4f9b3a..2392a92d3a 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -41,6 +41,7 @@ import json
 import logging
 import uuid
 from random import randint
+from time import strftime
 
 
 from django.conf import settings
@@ -236,6 +237,15 @@ class TestCenterUser(models.Model):
         testcenter_user.client_candidate_id = cand_id  
         return testcenter_user
 
+    def is_accepted(self):
+        return self.upload_status == 'Accepted'
+  
+    def is_rejected(self):
+        return self.upload_status == 'Error'
+    
+    def is_pending(self):
+        return self.upload_status == ''
+
 class TestCenterUserForm(ModelForm):
     class Meta:
         model = TestCenterUser
@@ -373,15 +383,15 @@ class TestCenterRegistration(models.Model):
     @property
     def client_candidate_id(self):
         return self.testcenter_user.client_candidate_id
-    
+
     @staticmethod
-    def create(testcenter_user, course_id, exam_info, accommodation_request):
+    def create(testcenter_user, exam, accommodation_request):
         registration = TestCenterRegistration(testcenter_user = testcenter_user)
-        registration.course_id = course_id
+        registration.course_id = exam.course_id
         registration.accommodation_request = accommodation_request
-        registration.exam_series_code = exam_info.get('Exam_Series_Code')
-        registration.eligibility_appointment_date_first = exam_info.get('First_Eligible_Appointment_Date')
-        registration.eligibility_appointment_date_last = exam_info.get('Last_Eligible_Appointment_Date')
+        registration.exam_series_code = exam.exam_series_code # .get('Exam_Series_Code')
+        registration.eligibility_appointment_date_first = strftime("%Y-%m-%d", exam.first_eligible_appointment_date)
+        registration.eligibility_appointment_date_last = strftime("%Y-%m-%d", exam.last_eligible_appointment_date)
         # accommodation_code remains blank for now, along with Pearson confirmation
         registration.client_authorization_id = registration._create_client_authorization_id()
         return registration
@@ -404,16 +414,16 @@ class TestCenterRegistration(models.Model):
         return auth_id
             
     def is_accepted(self):
-        return self.upload_status == 'Accepted'
+        return self.upload_status == 'Accepted' and self.testcenter_user.is_accepted()
   
     def is_rejected(self):
-        return self.upload_status == 'Error'
+        return self.upload_status == 'Error' or self.testcenter_user.is_rejected()
     
     def is_pending_accommodation(self):
         return len(self.accommodation_request) > 0 and self.accommodation_code == ''
         
     def is_pending_acknowledgement(self):
-        return self.upload_status == '' and not self.is_pending_accommodation()
+        return (self.upload_status == '' or self.testcenter_user.is_pending()) and not self.is_pending_accommodation()
 
 class TestCenterRegistrationForm(ModelForm):
     class Meta:
@@ -430,15 +440,12 @@ class TestCenterRegistrationForm(ModelForm):
     
     
     
-def get_testcenter_registrations_for_user_and_course(user, course_id, exam_series_code=None):
+def get_testcenter_registration(user, course_id, exam_series_code):
     try:
         tcu = TestCenterUser.objects.get(user=user)
     except TestCenterUser.DoesNotExist:
         return []
-    if exam_series_code is None:
-        return TestCenterRegistration.objects.filter(testcenter_user=tcu, course_id=course_id)
-    else:
-        return TestCenterRegistration.objects.filter(testcenter_user=tcu, course_id=course_id, exam_series_code=exam_series_code)
+    return TestCenterRegistration.objects.filter(testcenter_user=tcu, course_id=course_id, exam_series_code=exam_series_code)
         
 def unique_id_for_user(user):
     """
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 61a0d59c18..f23ccd4668 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -31,7 +31,7 @@ from student.models import (Registration, UserProfile, TestCenterUser, TestCente
                             TestCenterRegistration, TestCenterRegistrationForm,
                             PendingNameChange, PendingEmailChange,
                             CourseEnrollment, unique_id_for_user,
-                            get_testcenter_registrations_for_user_and_course)
+                            get_testcenter_registration)
 
 from certificates.models import CertificateStatuses, certificate_status_for_student
 
@@ -237,6 +237,8 @@ def dashboard(request):
 
     cert_statuses = { course.id: cert_info(request.user, course) for course in courses}
 
+    exam_registrations = { course.id: exam_registration_info(request.user, course) for course in courses}
+
     # Get the 3 most recent news
     top_news = _get_news(top=3)
 
@@ -247,6 +249,7 @@ def dashboard(request):
                'show_courseware_links_for' : show_courseware_links_for,
                'cert_statuses': cert_statuses,
                'news': top_news,
+               'exam_registrations': exam_registrations,
                }
 
     return render_to_response('dashboard.html', context)
@@ -589,32 +592,45 @@ def create_account(request, post_override=None):
     js = {'success': True}
     return HttpResponse(json.dumps(js), mimetype="application/json")
 
+def exam_registration_info(user, course):
+    """ Returns a Registration object if the user is currently registered for a current
+    exam of the course.  Returns None if the user is not registered, or if there is no
+    current exam for the course.
+    """
+    exam_info = course.current_test_center_exam
+    if exam_info is None:
+        return None
+    
+    exam_code = exam_info.exam_series_code
+    registrations = get_testcenter_registration(user, course.id, exam_code)
+    if len(registrations) > 0:
+        registration = registrations[0]
+    else:
+        registration = None
+    return registration
+    
 @login_required
 @ensure_csrf_cookie
 def begin_test_registration(request, course_id):
+    """ Handles request to register the user for the current
+    test center exam of the specified course.  Called by form
+    in dashboard.html.
+    """
     user = request.user
 
     try:
         course = (course_from_id(course_id))
     except ItemNotFoundError:
+        # TODO: do more than just log!!  The rest will fail, so we should fail right now.
         log.error("User {0} enrolled in non-existent course {1}"
                       .format(user.username, course_id))
 
     # get the exam to be registered for:
     # (For now, we just assume there is one at most.)
-    # TODO: this should be an object, including the course_id and the
-    # exam info for a particular exam from the course.
-    exam_info = course.testcenter_info
+    exam_info = course.current_test_center_exam
 
-    # figure out if the user is already registered for this exam:   
-    # (Again, for now we assume that any registration that exists is for this exam.) 
-    registrations = get_testcenter_registrations_for_user_and_course(user, course_id)
-    if len(registrations) > 0:
-        registration = registrations[0]
-    else:
-        registration = None
-
-    log.info("User {0} enrolled in course {1} calls for test registration page".format(user.username, course_id))
+    # determine if the user is registered for this course:
+    registration = exam_registration_info(user, course)
         
     # we want to populate the registration page with the relevant information,
     # if it already exists.  Create an empty object otherwise.
@@ -636,12 +652,9 @@ def begin_test_registration(request, course_id):
 @ensure_csrf_cookie
 def create_test_registration(request, post_override=None):
     '''
-    JSON call to create test registration.
-    Used by form in test_center_register.html, which is called from 
-    into dashboard.html
+    JSON call to create a test center exam registration.
+    Called by form in test_center_register.html
     '''
- #   js = {'success': False}
-
     post_vars = post_override if post_override else request.POST
     
     # first determine if we need to create a new TestCenterUser, or if we are making any update 
@@ -660,7 +673,6 @@ def create_test_registration(request, post_override=None):
         testcenter_user = TestCenterUser.create(user)
         needs_updating = True
 
-
     # perform validation:
     if needs_updating:
         log.info("User {0} enrolled in course {1} updating demographic info for test registration".format(user.username, course_id))
@@ -678,20 +690,19 @@ def create_test_registration(request, post_override=None):
         
     # create and save the registration:
     needs_saving = False
-    exam_info = course.testcenter_info
-    registrations = get_testcenter_registrations_for_user_and_course(user, course_id)
-    # In future, this should check the exam series code of the registrations, if there
-    # were multiple.
+    exam = course.current_test_center_exam
+    exam_code = exam.exam_series_code
+    registrations = get_testcenter_registration(user, course_id, exam_code)
     if len(registrations) > 0:
         registration = registrations[0]
-        # check to see if registration changed.  Should check appointment dates too...
+        # TODO: check to see if registration changed.  Should check appointment dates too...
         # And later should check changes in accommodation_code.
         # But at the moment, we don't expect anything to cause this to change
-        # right now.
+        # because of the registration form.
         
     else:
         accommodation_request = post_vars.get('accommodation_request','')
-        registration = TestCenterRegistration.create(testcenter_user, course_id, exam_info, accommodation_request)
+        registration = TestCenterRegistration.create(testcenter_user, exam, accommodation_request)
         needs_saving = True
 
     if needs_saving:
@@ -732,8 +743,6 @@ def create_test_registration(request, post_override=None):
     # TODO: enable appropriate stat
     # statsd.increment("common.student.account_created")
 
-    log.info("User {0} enrolled in course {1} returning from enter/update demographic info for test registration".format(user.username, course_id))
-
     js = {'success': True}
     return HttpResponse(json.dumps(js), mimetype="application/json")
 
diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py
index 715b263b59..1b9da9fb06 100644
--- a/common/lib/xmodule/xmodule/course_module.py
+++ b/common/lib/xmodule/xmodule/course_module.py
@@ -96,6 +96,21 @@ class CourseDescriptor(SequenceDescriptor):
         #   disable the syllabus content for courses that do not provide a syllabus
         self.syllabus_present = self.system.resources_fs.exists(path('syllabus'))
 
+        self.test_center_exams = []
+        test_center_info = self.metadata.get('testcenter_info')
+        if test_center_info is not None:
+            for exam_name in test_center_info:
+                try:
+                    exam_info = test_center_info[exam_name]
+                    self.test_center_exams.append(self.TestCenterExam(self.id, exam_name, exam_info))
+                except Exception as err:
+                    # If we can't parse the test center exam info, don't break
+                    # the rest of the courseware.
+                    msg = 'Error %s: Unable to load test-center exam info for exam "%s" of course "%s"' % (err, exam_name, self.id)
+                    log.error(msg)
+                    continue
+
+
     def set_grading_policy(self, policy_str):
         """Parse the policy specified in policy_str, and save it"""
         try:
@@ -315,26 +330,89 @@ class CourseDescriptor(SequenceDescriptor):
         Returns None if no url specified.
         """
         return self.metadata.get('end_of_course_survey_url')
-    
-    @property
-    def testcenter_info(self):
-        """
-        Pull from policy.
-        
-        TODO: decide if we expect this entry to be a single test, or if multiple tests are possible
-        per course.
 
-        For now we expect this entry to be a single test.
-
-        Returns None if no testcenter info specified, or if no exam is included.
-        """
-        info = self.metadata.get('testcenter_info')
-        if info is None or len(info) == 0:
-            return None;
-        else:
-            return info.values()[0]
+    class TestCenterExam:
+        def __init__(self, course_id, exam_name, exam_info):
+            self.course_id = course_id
+            self.exam_name = exam_name
+            self.exam_info = exam_info
+            self.exam_series_code = exam_info.get('Exam_Series_Code') or exam_name
+            self.display_name = exam_info.get('Exam_Display_Name') or self.exam_series_code
+            self.first_eligible_appointment_date = self._try_parse_time('First_Eligible_Appointment_Date')
+            if self.first_eligible_appointment_date is None:
+                raise ValueError("First appointment date must be specified")
+            # TODO: If defaulting the last appointment date, it should be the 
+            # *end* of the same day, not the same time.  It's going to be used as the
+            # end of the exam overall, so we don't want the exam to disappear too soon.  
+            # It's also used optionally as the registration end date, so time matters there too.
+            self.last_eligible_appointment_date = self._try_parse_time('Last_Eligible_Appointment_Date') # or self.first_eligible_appointment_date
+            if self.last_eligible_appointment_date is None:
+                raise ValueError("Last appointment date must be specified")
+            self.registration_start_date = self._try_parse_time('Registration_Start_Date') or time.gmtime(0)
+            self.registration_end_date = self._try_parse_time('Registration_End_Date') or self.last_eligible_appointment_date
+            # do validation within the exam info:
+            if self.registration_start_date > self.registration_end_date:
+                raise ValueError("Registration start date must be before registration end date")
+            if self.first_eligible_appointment_date > self.last_eligible_appointment_date:
+                raise ValueError("First appointment date must be before last appointment date")
+            if self.registration_end_date > self.last_eligible_appointment_date:
+                raise ValueError("Registration end date must be before last appointment date")
             
 
+        def _try_parse_time(self, key):
+            """
+            Parse an optional metadata key containing a time: if present, complain
+            if it doesn't parse.
+            Return None if not present or invalid.
+            """
+            if key in self.exam_info:
+                try:
+                    return parse_time(self.exam_info[key])
+                except ValueError as e:
+                    msg = "Exam {0} in course {1} loaded with a bad exam_info key '{2}': '{3}'".format(self.exam_name, self.course_id, self.exam_info[key], e)
+                    log.warning(msg)
+                return None
+
+        def has_started(self):
+            return time.gmtime() > self.first_eligible_appointment_date
+
+        def has_ended(self):
+            return time.gmtime() > self.last_eligible_appointment_date
+
+        def has_started_registration(self):
+            return time.gmtime() > self.registration_start_date
+
+        def has_ended_registration(self):
+            return time.gmtime() > self.registration_end_date
+
+        def is_registering(self):
+            now = time.gmtime()
+            return now >= self.registration_start_date and now <= self.registration_end_date
+            
+        @property
+        def first_eligible_appointment_date_text(self):
+            return time.strftime("%b %d, %Y", self.first_eligible_appointment_date)
+
+        @property
+        def last_eligible_appointment_date_text(self):
+            return time.strftime("%b %d, %Y", self.last_eligible_appointment_date)
+
+        @property
+        def registration_end_date_text(self):
+            return time.strftime("%b %d, %Y", self.registration_end_date)
+
+    @property
+    def current_test_center_exam(self):
+        exams = [exam for exam in self.test_center_exams if exam.has_started_registration() and not exam.has_ended()]
+        if len(exams) > 1:
+            # TODO: output some kind of warning.  This should already be 
+            # caught if we decide to do validation at load time.
+            return exams[0]
+        elif len(exams) == 1:
+            return exams[0]
+        else:
+            return None
+
     @property
     def title(self):
         return self.display_name
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index 5db8a4cd2a..d5e5ddf29d 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -3,7 +3,6 @@
   from courseware.courses import course_image_url, get_course_about_section
   from courseware.access import has_access
   from certificates.models import CertificateStatuses
-  from student.models import get_testcenter_registrations_for_user_and_course
 %>
 <%inherit file="main.html" />
 
@@ -220,36 +219,45 @@
               <h3><a href="${course_target}">${course.number} ${course.title}</a></h3>
             </hgroup>
 
-	    <!-- TODO: need to add logic to select which of the following to display.  Like certs? -->
             <%
-            testcenter_info = course.testcenter_info
-            testcenter_register_target = reverse('begin_test_registration', args=[course.id])
+                testcenter_exam_info = course.current_test_center_exam
+                registration = exam_registrations.get(course.id)
+                testcenter_register_target = reverse('begin_test_registration', args=[course.id])
             %>
-            % if testcenter_info is not None:
+            % if testcenter_exam_info is not None:
 
-                <!-- see if there is already a registration object
-                	TODO: need to add logic for when registration can begin. -->
-                <%
-                    registrations = get_testcenter_registrations_for_user_and_course(user, course.id)
-                %>
-                % if len(registrations) == 0:	    
+                % if registration is None and testcenter_exam_info.is_registering():	    
                 <div class="message message-status is-shown exam-register">
                       <a href="${testcenter_register_target}" class="exam-button" id="exam_register_button">Register for Pearson exam</a>
                       <p class="message-copy">Registration for the Pearson exam is now open.</p>
                 </div>
-                % else:     
-                <div class="message message-status is-shown">
-                  <p class="message-copy">Your 
-                    <a href="${testcenter_register_target}" id="exam_register_link">registration for the Pearson exam</a>
-     is pending. Within a few days, you should see a confirmation number here, which can be used to schedule your exam.</p>
-                </div>
-
+                % endif
+                <!-- display a registration for a current exam, even if the registration period is over -->
+                % if registration is not None:
+                    % if registration.is_accepted():	    
                 <div class="message message-status is-shown exam-schedule">
                 	<!-- TODO: pull Pearson destination out into a Setting -->
                    <a href="https://www1.pearsonvue.com/testtaker/signin/SignInPage/EDX" class="exam-button">Schedule Pearson exam</a>
-                   <p class="exam-registration-number"><a href="${testcenter_register_target}" id="exam_register_link">Registration</a> number: <strong>${registrations[0].client_authorization_id}</strong></p>
+                   <p class="exam-registration-number"><a href="${testcenter_register_target}" id="exam_register_link">Registration</a> number: <strong>${registration.client_authorization_id}</strong></p>
                    <p class="message-copy">Write this down! You’ll need it to schedule your exam.</p>
                 </div>
+                    % endif
+                    % if  registration.is_rejected():	    
+                	<!-- TODO: revise rejection text -->
+                <div class="message message-status is-shown exam-schedule">
+                  <p class="message-copy">Your 
+                    <a href="${testcenter_register_target}" id="exam_register_link">registration for the Pearson exam</a>
+     has been rejected. Please check the information you provided, and try to correct any demographic errors.  Otherwise
+     contact someone at edX or Pearson, or just scream for help.</p>
+                </div>
+                    % endif
+                   	% if not registration.is_accepted() and not registration.is_rejected():	    
+	            <div class="message message-status is-shown">
+    	              <p class="message-copy">Your 
+                    <a href="${testcenter_register_target}" id="exam_register_link">registration for the Pearson exam</a>
+     is pending. Within a few days, you should see a confirmation number here, which can be used to schedule your exam.</p>
+                </div>
+                    % endif
                 % endif
 
             % endif   
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index 7b80ebc46b..2b0b0c4eb2 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -3,7 +3,6 @@
   from courseware.courses import course_image_url, get_course_about_section
   from courseware.access import has_access
   from certificates.models import CertificateStatuses
-  from student.models import get_testcenter_registrations_for_user_and_course
 %>
 <%inherit file="main.html" />
 
@@ -91,12 +90,15 @@
   <section class="status">
     
     <!-- NOTE: BT - registration data updated confirmation message - in case upon successful submit we're directing
-    	 folks back to this view.  To display, add "is-shown" class to div -->
+    	 folks back to this view.  To display, add "is-shown" class to div.
+    	 NOTE: BW - not planning to do this, but instead returning user to student dashboard.  
     <div class="message message-status submission-saved">
       <p class="message-copy">Your registration data has been updated and saved.</p>
     </div>
+     -->
         
-    <!-- NOTE: BT - Sample markup for error message.  To display, add "is-shown" class to div -->
+    <!-- Markup for error message will be written here by ajax handler.  To display, it adds "is-shown" class to div,
+    	 and adds specific error messages under the list. -->
     <div class="message message-status submission-error">
       <p id="submission-error-heading" class="message-copy"></p>
       <ul id="submission-error-list"/>
@@ -123,6 +125,7 @@
       <input id="id_email" type="hidden" name="email" maxlength="75" value="${user.email}" />
       <input id="id_username" type="hidden" name="username" maxlength="75" value="${user.username}" />
       <input id="id_course_id" type="hidden" name="course_id" maxlength="75" value="${course.id}" />
+      <input id="id_course_id" type="hidden" name="exam_series_code" maxlength="75" value="${exam_info.exam_series_code}" />
 
       <div class="form-fields-primary">
         <fieldset class="group group-form group-form-personalinformation">
@@ -240,14 +243,17 @@
           
           <!-- Only display an accommodation request if one had been specified at registration time. 
                So only prompt for an accommodation request if no registration exists. 
-               BW: Bug.  It is not enough to set the value of the disabled control.  It does
-               not display any text.  Perhaps we can use a different control. -->
+               BW to BT: It is not enough to set the value of the disabled control.  It does
+               not display any text.  Perhaps we can use a different markup instead of a control. -->
           <ol class="list-input">
             % if registration:
               % if registration.accommodation_request and len(registration.accommodation_request) > 0:
             <li class="field disabled">
               <label for="accommodations">Accommodations Requested</label>
+              <!--
               <textarea class="long" id="accommodations" value="${registration.accommodation_request}" placeholder="" disabled="disabled"></textarea>
+              -->
+              <p id="accommodations">${registration.accommodation_request}</p>
             </li>
               % endif
             % else: 
@@ -274,30 +280,30 @@
    % if registration:
     <h3 class="is-hidden">Registration Details</h3>
     
-    <!-- NOTE: BT - state for if registration is accepted -->
     % if registration.is_accepted():
-      <% regstatus = "Registration approved by Pearson" %>
     <div class="message message-status registration-accepted is-shown">
+      <% regstatus = "Registration approved by Pearson" %>
       <p class="registration-status"><span class="label">Registration Status: </span><span class="value">${regstatus}</span></p>
       <p class="registration-number"><span class="label">Registration number: </span> <span class="value">${registration.client_authorization_id}</span></p>
       <p class="message-copy">Write this down! You’ll need it to schedule your exam.</p>
+      <!-- TODO: pull this link out into some settable parameter. -->
       <a href="https://www1.pearsonvue.com/testtaker/signin/SignInPage/EDX" class="button exam-button">Schedule Pearson exam</a>
     </div>
     % endif
     
     % if registration.is_rejected():
-    <!-- NOTE: BT - state for if registration is rejected -->
-      <% regstatus = "Registration rejected by Pearson: %s" % registration.upload_error_message %>
+    <!-- TODO: the registration may be failed because of the upload of the demographics or of the upload of the registration.
+    	Fix this so that the correct upload error message is displayed. -->
     <div class="message message-status registration-rejected is-shown">
+      <% regstatus = "Registration rejected by Pearson: %s" % registration.upload_error_message %>
       <p class="registration-status"><span class="label">Registration Status: </span><span class="value">${regstatus}</span></p>
       <p class="message-copy">Your registration for the Pearson exam has been rejected. Please contact Pearson VUE for further information regarding your registration.</p>
     </div>
     % endif
     
     % if registration.is_pending_accommodation():
-        <% regstatus = "Registration pending approval of accommodation request" %>
-    <!-- NOTE: BT - state for if registration is pending -->
     <div class="message message-status registration-pending is-shown">
+      <% regstatus = "Registration pending approval of accommodation request" %>
       <p class="registration-status"><span class="label">Registration Status: </span><span class="value">${regstatus}</span></p>
       <p class="message-copy">Your registration for the Pearson exam is pending. Within a few days, you should see confirmation here of granted accommodations.
       	At that point, your registration will be forwarded to Pearson.</p>
@@ -305,9 +311,8 @@
     % endif
 
     % if registration.is_pending_acknowledgement():
-        <% regstatus = "Registration pending acknowledgement by Pearson" %>
-    <!-- NOTE: BT - state for if registration is pending -->
     <div class="message message-status registration-pending is-shown">
+      <% regstatus = "Registration pending acknowledgement by Pearson" %>
       <p class="registration-status"><span class="label">Registration Status: </span><span class="value">${regstatus}</span></p>
       <p class="message-copy">Your registration for the Pearson exam is pending. Within a few days, you should see a confirmation number here, which can be used to schedule your exam.</p>
     </div>
@@ -333,16 +338,18 @@
       <!-- NOTE: showing test details -->
       <h4>Pearson VUE Test Details</h4>
       % if exam_info is not None:
-        <!-- TODO: BT - Can we obtain a more human readable value for test-type (e.g. "Final Exam" or "Midterm Exam")? -->
         <ul>
           <li>
-            <span class="label">Exam Series Code:</span> <span class="value">${exam_info.get('Exam_Series_Code')}</span>
+            <span class="label">Exam Name:</span> <span class="value">${exam_info.display_name}</span>
           </li>
           <li>
-            <span class="label">First Eligible Appointment Date:</span> <span class="value">${exam_info.get('First_Eligible_Appointment_Date')}</span>
+            <span class="label">First Eligible Appointment Date:</span> <span class="value">${exam_info.first_eligible_appointment_date_text}</span>
           </li>
           <li>
-            <span class="label">Last Eligible Appointment Date:</span> <span class="value">${exam_info.get('Last_Eligible_Appointment_Date')}</span>
+            <span class="label">Last Eligible Appointment Date:</span> <span class="value">${exam_info.last_eligible_appointment_date_text}</span>
+          </li>            
+          <li>
+            <span class="label">Registration End Date:</span> <span class="value">${exam_info.registration_end_date_text}</span>
           </li>            
         </ul>
       % endif

From 2ec11e5b92c9f3fa9fc0951fb1dca35626f35863 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Mon, 7 Jan 2013 15:15:50 -0500
Subject: [PATCH 021/541] pearson registration - refined error output and
 accommodation field display toggling

---
 .../multicourse/_testcenter-register.scss     |  97 +++++++++-
 lms/templates/test_center_register.html       | 172 ++++++++++--------
 2 files changed, 186 insertions(+), 83 deletions(-)

diff --git a/lms/static/sass/multicourse/_testcenter-register.scss b/lms/static/sass/multicourse/_testcenter-register.scss
index 9286155c48..5b806e3007 100644
--- a/lms/static/sass/multicourse/_testcenter-register.scss
+++ b/lms/static/sass/multicourse/_testcenter-register.scss
@@ -97,6 +97,10 @@ $red: rgb(178, 6, 16);
 				padding: ($baseline*0.75) $baseline;
 				text-align: center;
 			}
+
+			&.error {
+
+			}
 		}
 
 		.list-input {
@@ -115,14 +119,13 @@ $red: rgb(178, 6, 16);
 					padding-bottom: 0;
 				}
 
-				&.disabled {
+				&.disabled, &.submitted {
 					color: rgba(0,0,0,.25);
 
 					label {
-						color: rgba(0,0,0,.25);
+						cursor: text;
 
 						&:after {
-							content: "(Disabled Currently)";
 							margin-left: ($baseline/4);
 						}
 					}
@@ -133,6 +136,28 @@ $red: rgb(178, 6, 16);
 					}
 				}
 
+				&.disabled {
+					label:after {
+						color: rgba(0,0,0,.35);
+						content: "(Disabled Currently)";
+					}
+				}
+
+				&.submitted {
+
+					label:after {
+						content: "(Previously Submitted and Not Editable)";
+					}
+
+					.value {
+						@include border-radius(3px);
+						border: 1px solid #C8C8C8;
+						padding: $baseline ($baseline*0.75);
+						background: #FAFAFA;
+						font-family: $sans-serif;
+					}
+				}
+
 				&.error {
 
 					label {
@@ -228,6 +253,28 @@ $red: rgb(178, 6, 16);
 		}
 	}
 
+	// form - specifics
+	.form-fields-secondary {
+		display: none;
+
+		&.is-shown {
+			display: block;
+		}
+	}
+
+	.form-fields-secondary-visibility {
+		display: block;
+		margin: 0;
+		padding: $baseline ($baseline*1.5) 0 ($baseline*1.5);
+		font-family: $sans-serif;
+		font-size: 13px;
+		text-align: right;
+
+		&.is-hidden {
+			display: none;
+		}
+	}
+
 
 	// aside
 	aside {
@@ -382,10 +429,54 @@ $red: rgb(178, 6, 16);
 		&.submission-error {
 			border: 1px solid tint($red,85%);
 			background: tint($red,95%);
+			font-size: 14px;
+
+			#submission-error-heading {
+				margin-bottom: ($baseline/2);
+				border-bottom: 1px solid tint($red, 85%);
+				padding-bottom: ($baseline/2);
+				font-weight: bold;
+			}
+
+			.field-name, .field-error {
+				display: inline-block;
+			}
+
+			.field-name {
+				margin-right: ($baseline/4);
+			}
+
+			.field-error {
+				color: tint($red, 55%);
+			}
 
 			p {
 				color: $red;
 			}
+
+			ul {
+				margin: 0 0 ($baseline/2) 0;
+				padding: 0;
+				list-style: none;
+
+				li {
+					margin-bottom: ($baseline/2);
+					padding: 0;
+
+					span {
+						color: $red;
+					}
+
+					a {
+						color: $red;
+						text-decoration: none;
+
+						&:hover, &:active {
+							text-decoration: underline;
+						}
+					}
+				}
+			}
 		}
 
 		// submission success
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index 2b0b0c4eb2..d07629af22 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -14,6 +14,15 @@
   <script type="text/javascript">
   (function() {
 
+    $(".form-fields-secondary-visibility").click(function(e){
+      console.log("clicked");
+      e.preventDefault();
+      $(this).addClass("is-hidden");
+
+      $(".form-fields-secondary").addClass("is-shown");
+    });
+
+
     $(document).on('ajax:success', '#testcenter_register_form', function(data, json, xhr) {
       if(json.success) {
         // when a form is successfully filled out, return back to the dashboard.
@@ -30,19 +39,24 @@
         var num_errors = 0;
         var error_html = '';
         // first get rid of any errors that are already present:
-        $(".field.error").removeClass('error');
+        $(".field.error", ".form-actions").removeClass('error');
         $("#submission-error-list").html(error_html);
 		// start to display new errors:
+        $(".form-actions").addClass("error");
         $(".submission-error").addClass("is-shown");
         for (fieldname in field_errors) {
           // to inform a user of what field the error occurred on, add a class of .error to the .field element.
           // for convenience, use the "data-field" attribute to identify the one matching the errant field's name.
-          $("[data-field='"+fieldname+"']").addClass('error')
+          var field_id = "field-" + fieldname;
+          var field_label = $("[id='"+field_id+"'] label").text();
+
+          $("[id='"+field_id+"']").addClass('error');
+
           field_errorlist = field_errors[fieldname];      
           for (i=0; i < field_errorlist.length; i+= 1) {
             field_error = field_errorlist[i];
-            error_msg = fieldname + ": " + field_error;
-          	error_html =  error_html + '<li class="to-be-determined">' + error_msg + '</li>';
+            error_msg = '<span class="field-name">' + field_label + ':</span>' + '<span class="field-error">' + field_error + '</span>';
+          	error_html =  error_html + '<li>' + '<a href="#field-' + fieldname + '">' + error_msg + '</a></li>';
           	num_errors += 1;
           }
         }
@@ -89,20 +103,6 @@
   
   <section class="status">
     
-    <!-- NOTE: BT - registration data updated confirmation message - in case upon successful submit we're directing
-    	 folks back to this view.  To display, add "is-shown" class to div.
-    	 NOTE: BW - not planning to do this, but instead returning user to student dashboard.  
-    <div class="message message-status submission-saved">
-      <p class="message-copy">Your registration data has been updated and saved.</p>
-    </div>
-     -->
-        
-    <!-- Markup for error message will be written here by ajax handler.  To display, it adds "is-shown" class to div,
-    	 and adds specific error messages under the list. -->
-    <div class="message message-status submission-error">
-      <p id="submission-error-heading" class="message-copy"></p>
-      <ul id="submission-error-list"/>
-    </div>
   </section>
   
   <section class="content">
@@ -132,25 +132,25 @@
           <legend class="is-hidden">Personal Information</legend>
           
           <ol class="list-input">
-            <li data-field="salutation" class="field">
+            <li data-field="salutation" class="field" id="field-salutation">
               <label for="salutation">Salutation</label>
               <input class="short" id="salutation" type="text" name="salutation" value="${testcenteruser.salutation}" placeholder="e.g. Mr., Ms., Mrs., Dr." />              
             </li>
-            <li data-field="first_name" class="field required">
-              <label for="name-first">First Name </label>
-              <input id="name-first" type="text" name="first_name" value="${testcenteruser.first_name}" placeholder="e.g. Albert" />
+            <li data-field="first_name" class="field required" id="field-first_name">
+              <label for="first_name">First Name </label>
+              <input id="first_name" type="text" name="first_name" value="${testcenteruser.first_name}" placeholder="e.g. Albert" />
             </li>
-            <li data-field="middle_name" class="field">
-              <label for="name-middle">Middle Name</label>
-              <input id="name-middle" type="text" name="middle_name" value="${testcenteruser.middle_name}" placeholder="" />
+            <li data-field="middle_name" class="field" id="field-middle_name">
+              <label for="middle_name">Middle Name</label>
+              <input id="middle_name" type="text" name="middle_name" value="${testcenteruser.middle_name}" placeholder="" />
             </li>
-            <li data-field="last_name" class="field required">
-              <label for="name-last">Last Name</label>
-              <input id="name-last" type="text" name="last_name" value="${testcenteruser.last_name}" placeholder="e.g. Einstein" />
+            <li data-field="last_name" class="field required" id="field-last_name">
+              <label for="last_name">Last Name</label>
+              <input id="last_name" type="text" name="last_name" value="${testcenteruser.last_name}" placeholder="e.g. Einstein" />
             </li>
-            <li data-field="suffix" class="field">
-              <label for="name-suffix">Suffix</label>
-              <input class="short" id="name-suffix" type="text" name="suffix" value="${testcenteruser.suffix}" placeholder="e.g. Jr., Sr. " />
+            <li data-field="suffix" class="field" id="field-suffix">
+              <label for="suffix">Suffix</label>
+              <input class="short" id="suffix" type="text" name="suffix" value="${testcenteruser.suffix}" placeholder="e.g. Jr., Sr. " />
             </li>
           </ol>
         </fieldset>
@@ -159,36 +159,36 @@
           <legend class="is-hidden">Mailing Address</legend>
           
           <ol class="list-input">
-            <li data-field="address_1" class="field required">
-              <label class="long" for="address-1">Address Line #1</label>
-              <input id="address-1" type="text" name="address_1" value="${testcenteruser.address_1}" placeholder="e.g. 112 Mercer Street" />              
+            <li data-field="address_1" class="field required" id="field-address_1">
+              <label class="long" for="address_1">Address Line #1</label>
+              <input id="address_1" type="text" name="address_1" value="${testcenteruser.address_1}" placeholder="e.g. 112 Mercer Street" />              
             </li>
             <li class="field-group addresses">
-              <div data-field="address_2" class="field">
-                <label for="address-2">Address Line #2</label>
-                <input id="address-2" class="long" type="text" name="address_2" value="${testcenteruser.address_2}" placeholder="e.g. Apartment 123" />
+              <div data-field="address_2" class="field" id="field-address_2">
+                <label for="address_2">Address Line #2</label>
+                <input id="address_2" class="long" type="text" name="address_2" value="${testcenteruser.address_2}" placeholder="e.g. Apartment 123" />
               </div>
-              <div data-field="address_3" class="field">
-                <label for="address-3">Address Line #3</label>
-                <input id="address-3" class="long" type="text" name="address_3" value="${testcenteruser.address_3}" placeholder="e.g. Attention: Albert Einstein" />
+              <div data-field="address_3" class="field" id="field-address_3">
+                <label for="address_3">Address Line #3</label>
+                <input id="address_3" class="long" type="text" name="address_3" value="${testcenteruser.address_3}" placeholder="e.g. Attention: Albert Einstein" />
               </div>
             </li>            
             <li class="field-group postal">
-              <div data-field="city" class="field required">
+              <div data-field="city" class="field required" id="field-city">
                 <label for="city">City</label>
                 <input id="city" class="short" type="text" name="city" value="${testcenteruser.city}" placeholder="e.g. Newark" />
               </div>
-              <div data-field="state" class="field">
+              <div data-field="state" class="field" id="field-state">
                 <label for="state">State/Province</label>
                 <input id="state" class="short" type="text" name="state" value="${testcenteruser.state}" placeholder="e.g. NJ" />
               </div>
-              <div data-field="postal_code" class="field">
-                <label for="postal-code">Postal Code</label>
-                <input id="postal-code" class="short" type="text" name="postal_code" value="${testcenteruser.postal_code}" placeholder="e.g. 08540" />
+              <div data-field="postal_code" class="field" id="field-postal_code">
+                <label for="postal_code">Postal Code</label>
+                <input id="postal_code" class="short" type="text" name="postal_code" value="${testcenteruser.postal_code}" placeholder="e.g. 08540" />
               </div>
-              <div data-field="country" class="field required">
-                <label class="short" for="country-code">Country Code</label>
-                <input id="country-code" class="short" type="text" name="country" value="${testcenteruser.country}" placeholder="e.g. USA" />
+              <div data-field="country" class="field required" id="field-country">
+                <label class="short" for="country">Country Code</label>
+                <input id="country" class="short" type="text" name="country" value="${testcenteruser.country}" placeholder="e.g. USA" />
               </div>
             </li>
           </ol>
@@ -199,67 +199,66 @@
           
           <ol class="list-input">
             <li class="field-group phoneinfo">
-              <div data-field="phone" class="field required">
+              <div data-field="phone" class="field required" id="field-phone">
                 <label for="phone">Phone Number</label>
                 <input id="phone" type="text" name="phone" value="${testcenteruser.phone}" placeholder="e.g. 1-55-555-5555" />              
               </div>
-              <div data-field="extension" class="field">
-                <label for="phone-extension">Extension</label>
-                <input id="phone-extension" class="short" type="text" name="extension" value="${testcenteruser.extension}" placeholder="e.g. 555" />
+              <div data-field="extension" class="field" id="field-extension">
+                <label for="extension">Extension</label>
+                <input id="extension" class="short" type="text" name="extension" value="${testcenteruser.extension}" placeholder="e.g. 555" />
               </div>
-              <div data-field="phone_country_code" class="field required">
-                <label for="phone-countrycode">Phone Country Code</label>
-                <input id="phone-countrycode" class="short" type="text" name="phone_country_code" value="${testcenteruser.phone_country_code}" placeholder="e.g. USA" />
+              <div data-field="phone_country_code" class="field required" id="field-phone_country_code">
+                <label for="phone_country_code">Phone Country Code</label>
+                <input id="phone_country_code" class="short" type="text" name="phone_country_code" value="${testcenteruser.phone_country_code}" placeholder="e.g. USA" />
               </div>
             </li>
             <li class="field-group faxinfo">
-              <div data-field="fax" class="field">
+              <div data-field="fax" class="field" id="field-fax">
                 <label for="fax">Fax Number</label>
                 <input id="fax" type="text" class="short" name="fax" value="${testcenteruser.fax}" placeholder="e.g. 1-55-555-5555" />
               </div>
-              <div data-field="fax_country_code" class="field">
-                <label for="fax-countrycode">Fax Country Code</label>
-                <input id="fax-countrycode" class="short" type="text" name="fax_country_code" value="${testcenteruser.fax_country_code}" placeholder="e.g. USA" />
+              <div data-field="fax_country_code" class="field" id="field-fax_country_code">
+                <label for="fax_country_code">Fax Country Code</label>
+                <input id="fax_country_code" class="short" type="text" name="fax_country_code" value="${testcenteruser.fax_country_code}" placeholder="e.g. USA" />
               </div>
             </li>
-            <li data-field="company_name" class="field">
-              <label for="company">Company</label>
-              <input id="company" type="text" name="company_name" value="${testcenteruser.company_name}" placeholder="e.g. American Association of University Professors" />
+            <li data-field="company_name" class="field" id="field-company_name">
+              <label for="company_name">Company</label>
+              <input id="company_name" type="text" name="company_name" value="${testcenteruser.company_name}" placeholder="e.g. American Association of University Professors" />
             </li>
           </ol>
         </fieldset>
       </div>
       
-      <div class="form-fields-secondary">
-        <!-- NOTE: BT - Assuming accommodations cannot be edited after a user originally submits registration, I've disabled the field and provided different text. Correct if this is not the case. -->
+      % if registration:
+        % if registration.accommodation_request and len(registration.accommodation_request) > 0:
+      <div class="form-fields-secondary is-shown" id="form-fields-secondary">
+        % endif
+      % else: 
+      <div class="form-fields-secondary" id="form-fields-secondary">
+      % endif
+
         % if registration:
-        <p class="instructions">Fields below this point are not part of the demographics, and are not editable currently.</p>
+        <p class="instructions">Fields below this point are not part of your demographic information, and <strong>are not editable currently</strong>.</p>
         % else: 
-        <p class="instructions">Fields below this point are not part of the demographics, and cannot be changed once submitted.</p>
+        <p class="instructions">Fields below this point are not part of your demographic information, <strong>and cannot be changed once submitted</strong>.</p>
         % endif
                   
         <fieldset class="group group-form group-form-optional">
           <legend class="is-hidden">Optional Information</legend>
           
-          <!-- Only display an accommodation request if one had been specified at registration time. 
-               So only prompt for an accommodation request if no registration exists. 
-               BW to BT: It is not enough to set the value of the disabled control.  It does
-               not display any text.  Perhaps we can use a different markup instead of a control. -->
           <ol class="list-input">
             % if registration:
               % if registration.accommodation_request and len(registration.accommodation_request) > 0:
-            <li class="field disabled">
-              <label for="accommodations">Accommodations Requested</label>
-              <!--
-              <textarea class="long" id="accommodations" value="${registration.accommodation_request}" placeholder="" disabled="disabled"></textarea>
-              -->
-              <p id="accommodations">${registration.accommodation_request}</p>
+            <li data-field="accommodation_request" class="field submitted" id="field-accommodation_request">
+              <label for="accommodation_request">Accommodations Requested</label>
+              <p class="value" id="accommodations">${registration.accommodation_request}</p>
             </li>
               % endif
             % else: 
-            <li data-field="accommodation_request" class="field">
-              <label for="accommodations">Accommodations Requested</label>
-              <textarea class="long" id="accommodations" name="accommodation_request" value="" placeholder=""></textarea>             
+            <li data-field="accommodation_request" class="field" id="field-accommodation_request">
+              <label for="accommodation_request">Accommodations Requested</label>
+              <textarea class="long" id="accommodation_request" name="accommodation_request" value="" placeholder=""></textarea>             
             </li>
             % endif
           </ol>
@@ -272,8 +271,21 @@
         % else: 
         <button type="submit" id="submit" class="action action-primary action-register">Register for Pearson VUE Test</button>
         % endif
-      </div>        
+
+        <div class="message message-status submission-error">
+          <p id="submission-error-heading" class="message-copy"></p>
+          <ul id="submission-error-list"></ul>
+        </div>
+      </div>      
     </form>
+
+    % if registration:
+      % if registration.accommodation_request and len(registration.accommodation_request) > 0:
+    <a class="actions form-fields-secondary-visibility is-hidden" href="#form-fields-secondary">Looking for Optional Accomodations?</a>
+      % endif
+    % else: 
+    <a class="actions form-fields-secondary-visibility" href="#form-fields-secondary">Looking for Optional Accomodations?</a>
+    % endif
   </section>
     
   <aside>

From b41f68c801e1514806b946fb4892914d91804d49 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Mon, 7 Jan 2013 17:14:11 -0500
Subject: [PATCH 022/541] pearson registration - changing registration status
 states to progress-based states UI - wip

---
 lms/static/sass/multicourse/_dashboard.scss   |   1 +
 .../multicourse/_testcenter-register.scss     | 213 ++++++++++++++----
 lms/templates/dashboard.html                  |   2 +-
 lms/templates/test_center_register.html       | 104 ++++++---
 4 files changed, 243 insertions(+), 77 deletions(-)

diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss
index 90a9d7239b..abee5d77c3 100644
--- a/lms/static/sass/multicourse/_dashboard.scss
+++ b/lms/static/sass/multicourse/_dashboard.scss
@@ -488,6 +488,7 @@
 
         .message-copy {
           margin-top: 5px;
+          width: 60%;
         }
       }
 
diff --git a/lms/static/sass/multicourse/_testcenter-register.scss b/lms/static/sass/multicourse/_testcenter-register.scss
index 5b806e3007..aae752e2ca 100644
--- a/lms/static/sass/multicourse/_testcenter-register.scss
+++ b/lms/static/sass/multicourse/_testcenter-register.scss
@@ -283,9 +283,13 @@ $red: rgb(178, 6, 16);
 		.message-status {
 			@include border-radius(3px);
 			margin: 0 0 ($baseline*2) 0;
-			padding: $baseline;
 			border: 1px solid #ccc;
-			background: tint($yellow,85%);
+			padding: 0;
+			background: tint($yellow,90%);
+
+			> * {
+				padding: $baseline;
+			}
 
 			p {
 				margin: 0 0 ($baseline/4) 0;
@@ -298,23 +302,169 @@ $red: rgb(178, 6, 16);
 				display: block;
 			}
 
-			.label {
-				margin-right: ($baseline/4);
-				text-transform: uppercase;
-				letter-spacing: 1px;
+			h3, h4, h5 {
+				font-family: $sans-serif;
 			}
 
-			.value {
-				color: rgba(0,0,0,0.9);
+			h3 {
+				border-bottom: 1px solid tint(rgb(0,0,0), 90%);
+				padding-bottom: ($baseline*0.75);
+			}
+
+			h4 {
+				margin-bottom: ($baseline/4);
+			}
+
+			.status-list {
+				list-style: none;
+				margin: 0;
+				padding: $baseline;
+
+				> .item {
+					@include clearfix();
+					margin: 0 0 ($baseline*0.75) 0;
+					border-bottom: 1px solid tint(rgb(0,0,0), 95%);
+					padding: 0 0 ($baseline/2) 0;
+
+					&:last-child {
+						margin-bottom: 0;
+						border-bottom: none;
+						padding-bottom: 0;
+					}
+
+					.title {
+						margin-bottom: ($baseline/4);
+						position: relative;
+						font-weight: bold;
+						font-size: 14px;
+
+						&:after {
+							position: absolute;
+							top: 0;
+							right: $baseline;
+							margin-left: $baseline;
+							content: "testing";
+							text-transform: uppercase;
+							font-size: 11px;
+							font-weight: normal;
+							opacity: 0.5;
+						}
+					}
+
+					.details, .item {
+						@include transition(opacity, 0.10s, ease-in-out);
+						font-size: 13px;
+						opacity: 0.65;
+					}
+
+					&:before {
+						@include border-radius($baseline);
+						position: relative;
+						top: 3px;
+						display: block;
+						float: left;
+						width: ($baseline/2);
+						height: ($baseline/2);
+						margin: 0 ($baseline/2) 0 0;
+						background: $dark-gray;
+						content: "";
+					}
+
+					// specific states
+					&.status-accepted {
+
+						&:before {
+							background: green;
+						}
+
+						.title:after {
+							color: green;
+							content: "accepted";
+						}
+					}
+
+					&.status-pending {
+
+						&:before {
+							background: transparent;
+							border: 1px dotted gray;
+						}
+
+						.title:after {
+							color: gray;
+							content: "pending";
+						}
+					}
+
+					&.status-rejected {
+
+						&:before {
+							background: $red;
+						}
+
+						.title:after {
+							color: red;
+							content: "rejected";
+						}
+					}
+
+					&:hover {
+
+						.details, .item {
+							opacity: 1.0;
+						}
+					}
+				}
+
+				// sub menus
+				.accommodations-list {
+					list-style: none;
+					margin: ($baseline/2) 0;
+					padding: 0;
+					font-size: 13px;
+
+					.item {
+						margin: 0 0 ($baseline/4) 0;
+						padding: 0;
+					}
+				}
+			}
+
+			// actions
+			.actions {
+				@include box-shadow(inset 0 1px 1px 0px rgba(0,0,0,0.2));
+				border-top: 1px solid tint(rgb(0,0,0), 90%);
+				padding-top: ($baseline*0.75);
+				background: tint($yellow,70%);
 				font-size: 14px;
-			}
 
-			.registration-status {
-				margin: 0 0 ($baseline/2) 0;
+				.label, .value {
+					display: inline-block;					
+				}
 
 				.label {
-					margin: 0 0 ($baseline/2) 0;
-					color: #ccc;
+					margin-right: ($baseline/4);
+				}
+
+				.value {
+					font-weight: bold;
+				}
+
+				.message-copy {
+					font-size: 13px;
+				}
+
+				.exam-button {
+				  @include button(simple, $pink);
+				  display: block;
+				  margin: ($baseline/2) 0 0 0;
+				  padding: ($baseline/2) $baseline;
+				  font-size: 13px;
+				  font-weight: bold;
+
+				  &:hover {
+				    text-decoration: none;
+				  }
 				}
 			}
 
@@ -325,40 +475,21 @@ $red: rgb(178, 6, 16);
 					letter-spacing: 0;
 				}
 
-				.label, .value {
-					display: inline-block
+				
+			}
+
+			.registration-accepted {
+
+				.message-copy {
+					margin: 0 0 ($baseline/2) 0;
 				}
 			}
-
-			.message-copy {
-				margin: 0;
-				color: rgba(0,0,0,0.65);
-			}
 		}
 
-		.registration-accepted {
-
-			.message-copy {
-				margin: 0 0 ($baseline/2) 0;
-			}
-
-			.exam-button {
-			  @include button(simple, $pink);
-			  display: block;
-			  padding: ($baseline/2) $baseline;
-			  font-size: 13px;
-			  font-weight: bold;
-
-			  &:hover {
-			    text-decoration: none;
-			  }
-			}
-		}
-
-		.details {
+		> .details {
 			border-bottom: 1px solid rgba(216, 223, 230, 0.5);
 			margin: 0 0 $baseline 0;
-			padding: 0 0 $baseline 0;
+			padding: 0 $baseline $baseline $baseline;
 			font-family: $sans-serif;
 			font-size: 14px;
 
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index d5e5ddf29d..c4da396b0d 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -229,7 +229,7 @@
                 % if registration is None and testcenter_exam_info.is_registering():	    
                 <div class="message message-status is-shown exam-register">
                       <a href="${testcenter_register_target}" class="exam-button" id="exam_register_button">Register for Pearson exam</a>
-                      <p class="message-copy">Registration for the Pearson exam is now open.</p>
+                      <p class="message-copy">Registration for the Pearson exam is now open and will close on <strong>${testcenter_exam_info.registration_end_date_text}</strong></p>
                 </div>
                 % endif
                 <!-- display a registration for a current exam, even if the registration period is over -->
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index d07629af22..855d707295 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -290,45 +290,79 @@
     
   <aside>
    % if registration:
-    <h3 class="is-hidden">Registration Details</h3>
     
-    % if registration.is_accepted():
-    <div class="message message-status registration-accepted is-shown">
-      <% regstatus = "Registration approved by Pearson" %>
-      <p class="registration-status"><span class="label">Registration Status: </span><span class="value">${regstatus}</span></p>
-      <p class="registration-number"><span class="label">Registration number: </span> <span class="value">${registration.client_authorization_id}</span></p>
-      <p class="message-copy">Write this down! You’ll need it to schedule your exam.</p>
-      <!-- TODO: pull this link out into some settable parameter. -->
-      <a href="https://www1.pearsonvue.com/testtaker/signin/SignInPage/EDX" class="button exam-button">Schedule Pearson exam</a>
-    </div>
-    % endif
-    
-    % if registration.is_rejected():
-    <!-- TODO: the registration may be failed because of the upload of the demographics or of the upload of the registration.
-    	Fix this so that the correct upload error message is displayed. -->
-    <div class="message message-status registration-rejected is-shown">
-      <% regstatus = "Registration rejected by Pearson: %s" % registration.upload_error_message %>
-      <p class="registration-status"><span class="label">Registration Status: </span><span class="value">${regstatus}</span></p>
-      <p class="message-copy">Your registration for the Pearson exam has been rejected. Please contact Pearson VUE for further information regarding your registration.</p>
-    </div>
-    % endif
-    
-    % if registration.is_pending_accommodation():
+    <!-- REG: Dem accepted, Accom pending, Registration pending --> 
     <div class="message message-status registration-pending is-shown">
-      <% regstatus = "Registration pending approval of accommodation request" %>
-      <p class="registration-status"><span class="label">Registration Status: </span><span class="value">${regstatus}</span></p>
-      <p class="message-copy">Your registration for the Pearson exam is pending. Within a few days, you should see confirmation here of granted accommodations.
-      	At that point, your registration will be forwarded to Pearson.</p>
-    </div>
-    % endif
+      <h3>Pearson Exam Registration Status</h3>
 
-    % if registration.is_pending_acknowledgement():
-    <div class="message message-status registration-pending is-shown">
-      <% regstatus = "Registration pending acknowledgement by Pearson" %>
-      <p class="registration-status"><span class="label">Registration Status: </span><span class="value">${regstatus}</span></p>
-      <p class="message-copy">Your registration for the Pearson exam is pending. Within a few days, you should see a confirmation number here, which can be used to schedule your exam.</p>
+      <ol class="status-list">
+        <li class="item status status-accepted status-demographics">
+          <h4 class="title">Demographic Information</h4>
+          <p class="details">The demographic information you most recently provided has been accepted</p>
+        </li>
+        <li class="item status status-pending status-accommodations">
+          <h4 class="title">Accommodations Request</h4>
+          <p class="details">Your requested accommodations are pending. Within a few days, you should see confirmation here of granted accommodations.</p>
+        </li>
+        <li class="item status status-pending status-registration">
+          <h4 class="title">Registration Request</h4>
+          <p class="details">Your exam registration is pending. Once all of the above steps are accepted your registration will be forwarded to Pearson and you will be able to schedule an exam.</p>
+        </li>
+      </ol>
+    </div>
+
+    <!-- REG: Dem accepted, Accom accepted, Registration accepted --> 
+    <div class="message message-status registration-accepted is-shown">
+      <h3>Pearson Exam Registration Status</h3>
+
+      <ol class="status-list">
+        <li class="item status status-accepted status-demographics">
+          <h4 class="title">Demographic Information</h4>
+          <p class="details">The demographic information you most recently provided has been accepted</p>
+        </li>
+        <li class="item status status-accepted status-accommodations">
+          <h4 class="title">Accommodations Request</h4>
+          <p class="details">Your requested accommodations have been accepted and include:</p>
+
+          <ul class="accommodations-list">
+            <li class="item">Extra Time - Double Time</li>
+            <li class="item">Separate Room & Reader/Recorder</li>
+            <li class="item">Equipment</li>
+          </ul>  
+        </li>
+        <li class="item status status-accepted status-registration">
+          <h4 class="title">Registration Request</h4>
+          <p class="details">Your exam registration has been accepted and has been forwarded to Pearson. You are now able to schedule an exam.</p>
+        </li>
+      </ol>
+
+      <div class="actions">
+        <span class="label">Registration number: </span> <span class="value">12345678901</span>
+        <p class="message-copy">Write this down! You’ll need it to schedule your exam.</p>
+        <a href="https://www1.pearsonvue.com/testtaker/signin/SignInPage/EDX" class="button exam-button">Schedule Pearson exam</a>
+      </div>
+    </div>
+
+    <!-- REG: Dem rejected, Accom none, Registration rejected --> 
+    <div class="message message-status registration-rejected is-shown">
+      <h3>Pearson Exam Registration Status</h3>
+
+      <ol class="status-list">
+        <li class="item status status-rejected status-demographics">
+          <h4 class="title">Demographic Information</h4>
+          <p class="details">The demographic information you most recently provided has been rejected by Pearson. You can correct it and submit again</p>
+        </li>
+        <li class="item status status-rejected status-registration">
+          <h4 class="title">Registration Request</h4>
+          <p class="details">Your exam registration has been rejected by Pearson. <strong>You currently cannot schedule an exam</strong>.</p>
+        </li>
+      </ol>
+
+      <div class="actions">
+        <span class="label">Pearson Testing Support</span> <span class="value">1-800-555-5555</span>
+        <p class="message-copy">Please contact the number above for further questions about your test</p>
+      </div>
     </div>
-    % endif
 
    % endif
     

From 352f284624bfe1f42e0ea3659ec043dc335eeaa2 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Tue, 8 Jan 2013 11:37:26 -0500
Subject: [PATCH 023/541] pearson registration - revised UI states for reg
 form, simplified markup for form fields, synched button styles/text b/t
 registration form and dashboard

---
 lms/static/sass/multicourse/_dashboard.scss   |  14 ++-
 .../multicourse/_testcenter-register.scss     | 106 ++++++++++++++++-
 lms/templates/dashboard.html                  |   6 +-
 lms/templates/test_center_register.html       | 108 ++++++++++--------
 4 files changed, 175 insertions(+), 59 deletions(-)

diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss
index abee5d77c3..a309816cb4 100644
--- a/lms/static/sass/multicourse/_dashboard.scss
+++ b/lms/static/sass/multicourse/_dashboard.scss
@@ -410,7 +410,7 @@
       margin: 20px 0 10px;
       padding: 15px 20px;
       font-family: $sans-serif;
-      background: #fffcf0;
+      background: tint($yellow,70%);
       border: 1px solid #ccc;
 
       .message-copy {
@@ -498,18 +498,28 @@
         }
       }
 
+      .contact-button {
+        @include button(simple, $blue);
+      }
+
       .exam-button {
         @include button(simple, $pink);
+      }
+
+      .button {
         float: right;
         padding: 9px 18px 10px;
         font-size: 13px;
-        font-weight: 400;
+        font-weight: bold;
+        letter-spacing: 0;
 
         &:hover {
           text-decoration: none;
         }
       }
 
+
+
       &.is-shown {
         display: block;
       }
diff --git a/lms/static/sass/multicourse/_testcenter-register.scss b/lms/static/sass/multicourse/_testcenter-register.scss
index aae752e2ca..f0736e5308 100644
--- a/lms/static/sass/multicourse/_testcenter-register.scss
+++ b/lms/static/sass/multicourse/_testcenter-register.scss
@@ -71,11 +71,21 @@ $red: rgb(178, 6, 16);
 		@include border-radius(3px);
 		@include box-shadow(0 1px 2px 0 rgba(0,0,0, 0.2));
 
-		.instructions {
+		.instructions, .note {
 			margin: 0;
 			padding: ($baseline*1.5) ($baseline*1.5) 0 ($baseline*1.5);
 			font-family: $sans-serif;
 			font-size: 14px;
+			color: tint($base-font-color, 20%);
+
+			strong {
+				font-weight: normal;
+			}
+
+			.title, .indicator {
+				color: $base-font-color;
+				font-weight: 700;
+			}
 		}
 
 		fieldset {
@@ -84,11 +94,11 @@ $red: rgb(178, 6, 16);
 		}
 
 		.form-actions {
+			@include clearfix();
 			padding: ($baseline*1.5);
 
 			button[type="submit"] {
 				display: block;
-				width: 100%;
 				@include button(simple, $blue);
 				@include box-sizing(border-box);
 				@include border-radius(3px);
@@ -98,6 +108,23 @@ $red: rgb(178, 6, 16);
 				text-align: center;
 			}
 
+			.action-primary {
+				float: left;
+				width: flex-grid(5,8);
+				margin-right: flex-gutter(2);
+			}
+
+			.action-secondary {
+				display: block;
+				float: left;
+				width: flex-grid(2,8);
+				margin-top: $baseline;
+				padding: ($baseline/4);
+				font-size: 13px;
+				text-align: right;
+				text-transform: uppercase;
+			}
+
 			&.error {
 
 			}
@@ -224,7 +251,7 @@ $red: rgb(178, 6, 16);
 					display: block;
 					float: left;
 					border-bottom: none;
-					margin: 0 ($baseline) 0 0;
+					margin: 0 $baseline ($baseline/2) 0;
 					padding-bottom: 0;
 
 					input, textarea {
@@ -239,7 +266,7 @@ $red: rgb(178, 6, 16);
 					}
 				}
 
-				&.postal {
+				&.postal-2 {
 					border-bottom: none;
 					margin-bottom: 0;
 					padding-bottom: 0;
@@ -268,7 +295,6 @@ $red: rgb(178, 6, 16);
 		padding: $baseline ($baseline*1.5) 0 ($baseline*1.5);
 		font-family: $sans-serif;
 		font-size: 13px;
-		text-align: right;
 
 		&.is-hidden {
 			display: none;
@@ -343,7 +369,7 @@ $red: rgb(178, 6, 16);
 							top: 0;
 							right: $baseline;
 							margin-left: $baseline;
-							content: "testing";
+							content: "not started";
 							text-transform: uppercase;
 							font-size: 11px;
 							font-weight: normal;
@@ -408,6 +434,18 @@ $red: rgb(178, 6, 16);
 						}
 					}
 
+					&.status-initial {
+
+						&:before {
+							background: transparent;
+							border: 1px dotted gray;
+						}
+
+						.title:after {
+							color: gray;
+						}
+					}
+
 					&:hover {
 
 						.details, .item {
@@ -438,6 +476,10 @@ $red: rgb(178, 6, 16);
 				background: tint($yellow,70%);
 				font-size: 14px;
 
+				.title {
+					font-size: 14px;
+				}
+
 				.label, .value {
 					display: inline-block;					
 				}
@@ -556,6 +598,58 @@ $red: rgb(178, 6, 16);
 			font-size: 14px;
 		}
 
+		// registration status
+		&.message-flash {
+			display: block;
+			@include border-radius(3px);
+			position: relative;
+			margin: 0 0 ($baseline*2) 0;
+			border: 1px solid #ccc;
+			padding-top: ($baseline*0.75);
+			background: tint($yellow,70%);
+			font-size: 14px;
+
+			.message-title, .message-copy {
+				font-family: $sans-serif;
+				font-size: 14px;
+			}
+
+			.message-title {
+				font-weight: bold;
+				margin: 0 0 ($baseline/4) 0;
+			}
+
+			.contact-button {
+				@include button(simple, $blue);
+			}
+
+			.exam-button {
+			  @include button(simple, $pink);
+			}
+
+			.button {
+				position: absolute;
+				top: ($baseline/4);
+				right: $baseline;
+				margin: ($baseline/2) 0 0 0;
+				padding: ($baseline/2) $baseline;
+				font-size: 13px;
+				font-weight: bold;
+
+				&:hover {
+				  text-decoration: none;
+				}
+			}
+
+			&.message-action {
+
+				.message-title, .message-copy {
+					width: 65%;
+				}
+			}
+		}
+
+
 		// submission error
 		&.submission-error {
 			border: 1px solid tint($red,85%);
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index c4da396b0d..ab31de1aed 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -228,8 +228,8 @@
 
                 % if registration is None and testcenter_exam_info.is_registering():	    
                 <div class="message message-status is-shown exam-register">
-                      <a href="${testcenter_register_target}" class="exam-button" id="exam_register_button">Register for Pearson exam</a>
-                      <p class="message-copy">Registration for the Pearson exam is now open and will close on <strong>${testcenter_exam_info.registration_end_date_text}</strong></p>
+                  <a href="${testcenter_register_target}" class="button exam-button" id="exam_register_button">Register for Pearson exam</a>
+                  <p class="message-copy">Registration for the Pearson exam is now open and will close on <strong>${testcenter_exam_info.registration_end_date_text}</strong></p>
                 </div>
                 % endif
                 <!-- display a registration for a current exam, even if the registration period is over -->
@@ -245,10 +245,12 @@
                     % if  registration.is_rejected():	    
                 	<!-- TODO: revise rejection text -->
                 <div class="message message-status is-shown exam-schedule">
+                  <a href="mailto:exam-help@edx.org?subject=Pearson VUE Exam - ${get_course_about_section(course, 'university')} ${course.number}" class="button contact-button">Contact exam-help@edx.org</a>
                   <p class="message-copy">Your 
                     <a href="${testcenter_register_target}" id="exam_register_link">registration for the Pearson exam</a>
      has been rejected. Please check the information you provided, and try to correct any demographic errors.  Otherwise
      contact someone at edX or Pearson, or just scream for help.</p>
+                   
                 </div>
                     % endif
                    	% if not registration.is_accepted() and not registration.is_rejected():	    
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index 855d707295..fb1d70506b 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -90,7 +90,7 @@
   <section class="introduction">
     <header>
       <hgroup>
-        <h2>${get_course_about_section(course, 'university')} ${course.number} ${course.title}</h2>      
+        <h2><a href="${reverse('dashboard')}">${get_course_about_section(course, 'university')} ${course.number} ${course.title}</a></h2>      
         
         % if registration:
         <h1>Your Pearson VUE Proctored Exam Registration</h1>
@@ -101,9 +101,28 @@
     </header>
   </section>
   
-  <section class="status">
-    
+  % if registration:
+
+  <!-- NOTE: reg rejected -->
+  <section class="status message message-flash registration-rejected message-action">
+    <h3 class="message-title">Your registration for the Pearson exam has been rejected</h3>
+    <p class="message-copy">Please check the information you provided, and try to correct any demographic errors.  Otherwise contact someone at edX or Pearson, or just scream for help.</p>
+    <a href="mailto:exam-help@edx.org?subject=Pearson VUE Exam - ${get_course_about_section(course, 'university')} ${course.number}" class="button contact-button">Contact exam-help@edx.org</a>
   </section>
+
+  <!-- NOTE: reg accepted -->
+  <section class="status message message-flash registration-accepted message-action">
+    <h3 class="message-title">Your registration for the Pearson exam has been accepted</h3>
+    <p class="message-copy">Your registration number is <strong>12345678901</strong> (Write this down! You’ll need it to schedule your exam.)</p>
+    <a href="https://www1.pearsonvue.com/testtaker/signin/SignInPage/EDX" class="button exam-button">Schedule Pearson exam</a>
+  </section>
+
+  <!-- NOTE: reg pending -->
+  <section class="status message message-flash registration-pending">
+    <h3 class="message-title">Your registration for the Pearson exam is pending</h3>
+    <p class="message-copy">Once your information is accepted, it will be forwarded to Pearson and you will be able to schedule an exam.</p>
+  </section>
+  % endif
   
   <section class="content">
     <header>
@@ -113,11 +132,11 @@
       
       % if registration:
       <p class="instructions">
-        Please complete the following form to update your demographic information used in your Pearson VUE Proctored Exam. Required fields are noted by <strong>bold text and an asterisk (*)</strong>. 
+        Please complete the following form to update your demographic information used in your Pearson VUE Proctored Exam. Required fields are noted by <strong class="indicator">bold text and an asterisk (*)</strong>. 
       </p>
       % else: 
       <p class="instructions">
-        Please provide the following demographic information to register for a Pearson VUE Proctored Exam. Required fields are noted by <strong>bold text and an asterisk (*)</strong>.
+        Please provide the following demographic information to register for a Pearson VUE Proctored Exam. Required fields are noted by <strong class="indicator">bold text and an asterisk (*)</strong>.
       </p>
       % endif
 
@@ -132,23 +151,23 @@
           <legend class="is-hidden">Personal Information</legend>
           
           <ol class="list-input">
-            <li data-field="salutation" class="field" id="field-salutation">
+            <li class="field" id="field-salutation">
               <label for="salutation">Salutation</label>
               <input class="short" id="salutation" type="text" name="salutation" value="${testcenteruser.salutation}" placeholder="e.g. Mr., Ms., Mrs., Dr." />              
             </li>
-            <li data-field="first_name" class="field required" id="field-first_name">
+            <li class="field required" id="field-first_name">
               <label for="first_name">First Name </label>
               <input id="first_name" type="text" name="first_name" value="${testcenteruser.first_name}" placeholder="e.g. Albert" />
             </li>
-            <li data-field="middle_name" class="field" id="field-middle_name">
+            <li class="field" id="field-middle_name">
               <label for="middle_name">Middle Name</label>
               <input id="middle_name" type="text" name="middle_name" value="${testcenteruser.middle_name}" placeholder="" />
             </li>
-            <li data-field="last_name" class="field required" id="field-last_name">
+            <li class="field required" id="field-last_name">
               <label for="last_name">Last Name</label>
               <input id="last_name" type="text" name="last_name" value="${testcenteruser.last_name}" placeholder="e.g. Einstein" />
             </li>
-            <li data-field="suffix" class="field" id="field-suffix">
+            <li class="field" id="field-suffix">
               <label for="suffix">Suffix</label>
               <input class="short" id="suffix" type="text" name="suffix" value="${testcenteruser.suffix}" placeholder="e.g. Jr., Sr. " />
             </li>
@@ -159,34 +178,34 @@
           <legend class="is-hidden">Mailing Address</legend>
           
           <ol class="list-input">
-            <li data-field="address_1" class="field required" id="field-address_1">
+            <li class="field required" id="field-address_1">
               <label class="long" for="address_1">Address Line #1</label>
               <input id="address_1" type="text" name="address_1" value="${testcenteruser.address_1}" placeholder="e.g. 112 Mercer Street" />              
             </li>
             <li class="field-group addresses">
-              <div data-field="address_2" class="field" id="field-address_2">
+              <div class="field" id="field-address_2">
                 <label for="address_2">Address Line #2</label>
                 <input id="address_2" class="long" type="text" name="address_2" value="${testcenteruser.address_2}" placeholder="e.g. Apartment 123" />
               </div>
-              <div data-field="address_3" class="field" id="field-address_3">
+              <div class="field" id="field-address_3">
                 <label for="address_3">Address Line #3</label>
                 <input id="address_3" class="long" type="text" name="address_3" value="${testcenteruser.address_3}" placeholder="e.g. Attention: Albert Einstein" />
               </div>
-            </li>            
-            <li class="field-group postal">
-              <div data-field="city" class="field required" id="field-city">
-                <label for="city">City</label>
-                <input id="city" class="short" type="text" name="city" value="${testcenteruser.city}" placeholder="e.g. Newark" />
-              </div>
-              <div data-field="state" class="field" id="field-state">
+            </li>
+            <li class="field required postal-1" id="field-city">
+              <label for="city">City</label>
+              <input id="city" class="long" type="text" name="city" value="${testcenteruser.city}" placeholder="e.g. Newark" />
+            </li>         
+            <li class="field-group postal-2">
+              <div class="field" id="field-state">
                 <label for="state">State/Province</label>
                 <input id="state" class="short" type="text" name="state" value="${testcenteruser.state}" placeholder="e.g. NJ" />
               </div>
-              <div data-field="postal_code" class="field" id="field-postal_code">
+              <div class="field" id="field-postal_code">
                 <label for="postal_code">Postal Code</label>
                 <input id="postal_code" class="short" type="text" name="postal_code" value="${testcenteruser.postal_code}" placeholder="e.g. 08540" />
               </div>
-              <div data-field="country" class="field required" id="field-country">
+              <div class="field required" id="field-country">
                 <label class="short" for="country">Country Code</label>
                 <input id="country" class="short" type="text" name="country" value="${testcenteruser.country}" placeholder="e.g. USA" />
               </div>
@@ -199,30 +218,30 @@
           
           <ol class="list-input">
             <li class="field-group phoneinfo">
-              <div data-field="phone" class="field required" id="field-phone">
+              <div class="field required" id="field-phone">
                 <label for="phone">Phone Number</label>
                 <input id="phone" type="text" name="phone" value="${testcenteruser.phone}" placeholder="e.g. 1-55-555-5555" />              
               </div>
-              <div data-field="extension" class="field" id="field-extension">
+              <div class="field" id="field-extension">
                 <label for="extension">Extension</label>
                 <input id="extension" class="short" type="text" name="extension" value="${testcenteruser.extension}" placeholder="e.g. 555" />
               </div>
-              <div data-field="phone_country_code" class="field required" id="field-phone_country_code">
+              <div class="field required" id="field-phone_country_code">
                 <label for="phone_country_code">Phone Country Code</label>
                 <input id="phone_country_code" class="short" type="text" name="phone_country_code" value="${testcenteruser.phone_country_code}" placeholder="e.g. USA" />
               </div>
             </li>
             <li class="field-group faxinfo">
-              <div data-field="fax" class="field" id="field-fax">
+              <div class="field" id="field-fax">
                 <label for="fax">Fax Number</label>
                 <input id="fax" type="text" class="short" name="fax" value="${testcenteruser.fax}" placeholder="e.g. 1-55-555-5555" />
               </div>
-              <div data-field="fax_country_code" class="field" id="field-fax_country_code">
+              <div class="field" id="field-fax_country_code">
                 <label for="fax_country_code">Fax Country Code</label>
                 <input id="fax_country_code" class="short" type="text" name="fax_country_code" value="${testcenteruser.fax_country_code}" placeholder="e.g. USA" />
               </div>
             </li>
-            <li data-field="company_name" class="field" id="field-company_name">
+            <li class="field" id="field-company_name">
               <label for="company_name">Company</label>
               <input id="company_name" type="text" name="company_name" value="${testcenteruser.company_name}" placeholder="e.g. American Association of University Professors" />
             </li>
@@ -239,9 +258,9 @@
       % endif
 
         % if registration:
-        <p class="instructions">Fields below this point are not part of your demographic information, and <strong>are not editable currently</strong>.</p>
+        <p class="note"><span class="title">Note</span>: Accomodation requests, which need to be reviewed in detail, <strong>will add significant delay to the registration process</strong>.</p>
         % else: 
-        <p class="instructions">Fields below this point are not part of your demographic information, <strong>and cannot be changed once submitted</strong>.</p>
+        <p class="note"><span class="title">Note</span>: Accommodation requests are not part of your demographic information, <strong>and cannot be changed once submitted</strong>. Accomodation requests, which need to be reviewed in detail, <strong>will add significant delay to the registration process</strong>.</p>
         % endif
                   
         <fieldset class="group group-form group-form-optional">
@@ -268,8 +287,10 @@
       <div class="form-actions">
         % if registration:
         <button type="submit" id="submit" class="action action-primary action-update">Update Demographics</button>
+        <a href="${reverse('dashboard')}" class="action action-secondary action-cancel">Cancel Update</a>
         % else: 
         <button type="submit" id="submit" class="action action-primary action-register">Register for Pearson VUE Test</button>
+        <a href="${reverse('dashboard')}" class="action action-secondary action-cancel">Cancel Registration</a>
         % endif
 
         <div class="message message-status submission-error">
@@ -290,15 +311,15 @@
     
   <aside>
    % if registration:
-    
-    <!-- REG: Dem accepted, Accom pending, Registration pending --> 
+
+    <!-- NOTE: Dem accepted, Accom pending, Registration pending --> 
     <div class="message message-status registration-pending is-shown">
       <h3>Pearson Exam Registration Status</h3>
 
       <ol class="status-list">
         <li class="item status status-accepted status-demographics">
           <h4 class="title">Demographic Information</h4>
-          <p class="details">The demographic information you most recently provided has been accepted</p>
+          <p class="details">The demographic information you most recently provided has been accepted. You may edit this information at any point before exam registration closes on <strong>${exam_info.registration_end_date_text}</strong></p>
         </li>
         <li class="item status status-pending status-accommodations">
           <h4 class="title">Accommodations Request</h4>
@@ -306,19 +327,19 @@
         </li>
         <li class="item status status-pending status-registration">
           <h4 class="title">Registration Request</h4>
-          <p class="details">Your exam registration is pending. Once all of the above steps are accepted your registration will be forwarded to Pearson and you will be able to schedule an exam.</p>
+          <p class="details">Your exam registration is pending. Once your information is accepted, it will be forwarded to Pearson and you will be able to schedule an exam.</p>
         </li>
       </ol>
     </div>
 
-    <!-- REG: Dem accepted, Accom accepted, Registration accepted --> 
+    <!-- NOTE: Dem accepted, Accom accepted, Registration accepted --> 
     <div class="message message-status registration-accepted is-shown">
       <h3>Pearson Exam Registration Status</h3>
 
       <ol class="status-list">
         <li class="item status status-accepted status-demographics">
           <h4 class="title">Demographic Information</h4>
-          <p class="details">The demographic information you most recently provided has been accepted</p>
+          <p class="details">The demographic information you most recently provided has been accepted. You may edit this information at any point before exam registration closes on <strong>${exam_info.registration_end_date_text}</strong></p>
         </li>
         <li class="item status status-accepted status-accommodations">
           <h4 class="title">Accommodations Request</h4>
@@ -335,33 +356,22 @@
           <p class="details">Your exam registration has been accepted and has been forwarded to Pearson. You are now able to schedule an exam.</p>
         </li>
       </ol>
-
-      <div class="actions">
-        <span class="label">Registration number: </span> <span class="value">12345678901</span>
-        <p class="message-copy">Write this down! You’ll need it to schedule your exam.</p>
-        <a href="https://www1.pearsonvue.com/testtaker/signin/SignInPage/EDX" class="button exam-button">Schedule Pearson exam</a>
-      </div>
     </div>
 
-    <!-- REG: Dem rejected, Accom none, Registration rejected --> 
+    <!-- NOTE: Dem rejected, Accom none, Registration rejected --> 
     <div class="message message-status registration-rejected is-shown">
       <h3>Pearson Exam Registration Status</h3>
 
       <ol class="status-list">
         <li class="item status status-rejected status-demographics">
           <h4 class="title">Demographic Information</h4>
-          <p class="details">The demographic information you most recently provided has been rejected by Pearson. You can correct it and submit again</p>
+          <p class="details">The demographic information you most recently provided has been rejected by Pearson. You can correct and submit it again before the exam registration closes on <strong>${exam_info.registration_end_date_text}</strong>.</p>
         </li>
         <li class="item status status-rejected status-registration">
           <h4 class="title">Registration Request</h4>
           <p class="details">Your exam registration has been rejected by Pearson. <strong>You currently cannot schedule an exam</strong>.</p>
         </li>
       </ol>
-
-      <div class="actions">
-        <span class="label">Pearson Testing Support</span> <span class="value">1-800-555-5555</span>
-        <p class="message-copy">Please contact the number above for further questions about your test</p>
-      </div>
     </div>
 
    % endif

From bbe0120d5c7892b63b0e153f9721d524a0b3fcff Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Tue, 8 Jan 2013 11:41:01 -0500
Subject: [PATCH 024/541] pearson registration - changed accepted classes,
 content, and styling to use the term process instead

---
 .../multicourse/_testcenter-register.scss     |  6 ++--
 lms/templates/test_center_register.html       | 32 +++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lms/static/sass/multicourse/_testcenter-register.scss b/lms/static/sass/multicourse/_testcenter-register.scss
index f0736e5308..dfea8d5e6c 100644
--- a/lms/static/sass/multicourse/_testcenter-register.scss
+++ b/lms/static/sass/multicourse/_testcenter-register.scss
@@ -397,7 +397,7 @@ $red: rgb(178, 6, 16);
 					}
 
 					// specific states
-					&.status-accepted {
+					&.status-processed {
 
 						&:before {
 							background: green;
@@ -405,7 +405,7 @@ $red: rgb(178, 6, 16);
 
 						.title:after {
 							color: green;
-							content: "accepted";
+							content: "processed";
 						}
 					}
 
@@ -520,7 +520,7 @@ $red: rgb(178, 6, 16);
 				
 			}
 
-			.registration-accepted {
+			.registration-processed {
 
 				.message-copy {
 					margin: 0 0 ($baseline/2) 0;
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index fb1d70506b..09f25fbb65 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -110,9 +110,9 @@
     <a href="mailto:exam-help@edx.org?subject=Pearson VUE Exam - ${get_course_about_section(course, 'university')} ${course.number}" class="button contact-button">Contact exam-help@edx.org</a>
   </section>
 
-  <!-- NOTE: reg accepted -->
-  <section class="status message message-flash registration-accepted message-action">
-    <h3 class="message-title">Your registration for the Pearson exam has been accepted</h3>
+  <!-- NOTE: reg processed -->
+  <section class="status message message-flash registration-processed message-action">
+    <h3 class="message-title">Your registration for the Pearson exam has been processed</h3>
     <p class="message-copy">Your registration number is <strong>12345678901</strong> (Write this down! You’ll need it to schedule your exam.)</p>
     <a href="https://www1.pearsonvue.com/testtaker/signin/SignInPage/EDX" class="button exam-button">Schedule Pearson exam</a>
   </section>
@@ -120,7 +120,7 @@
   <!-- NOTE: reg pending -->
   <section class="status message message-flash registration-pending">
     <h3 class="message-title">Your registration for the Pearson exam is pending</h3>
-    <p class="message-copy">Once your information is accepted, it will be forwarded to Pearson and you will be able to schedule an exam.</p>
+    <p class="message-copy">Once your information is processed, it will be forwarded to Pearson and you will be able to schedule an exam.</p>
   </section>
   % endif
   
@@ -312,14 +312,14 @@
   <aside>
    % if registration:
 
-    <!-- NOTE: Dem accepted, Accom pending, Registration pending --> 
+    <!-- NOTE: Dem processed, Accom pending, Registration pending --> 
     <div class="message message-status registration-pending is-shown">
       <h3>Pearson Exam Registration Status</h3>
 
       <ol class="status-list">
-        <li class="item status status-accepted status-demographics">
+        <li class="item status status-processed status-demographics">
           <h4 class="title">Demographic Information</h4>
-          <p class="details">The demographic information you most recently provided has been accepted. You may edit this information at any point before exam registration closes on <strong>${exam_info.registration_end_date_text}</strong></p>
+          <p class="details">The demographic information you most recently provided has been processed. You may edit this information at any point before exam registration closes on <strong>${exam_info.registration_end_date_text}</strong></p>
         </li>
         <li class="item status status-pending status-accommodations">
           <h4 class="title">Accommodations Request</h4>
@@ -327,23 +327,23 @@
         </li>
         <li class="item status status-pending status-registration">
           <h4 class="title">Registration Request</h4>
-          <p class="details">Your exam registration is pending. Once your information is accepted, it will be forwarded to Pearson and you will be able to schedule an exam.</p>
+          <p class="details">Your exam registration is pending. Once your information is processed, it will be forwarded to Pearson and you will be able to schedule an exam.</p>
         </li>
       </ol>
     </div>
 
-    <!-- NOTE: Dem accepted, Accom accepted, Registration accepted --> 
-    <div class="message message-status registration-accepted is-shown">
+    <!-- NOTE: Dem processed, Accom processed, Registration processed --> 
+    <div class="message message-status registration-processed is-shown">
       <h3>Pearson Exam Registration Status</h3>
 
       <ol class="status-list">
-        <li class="item status status-accepted status-demographics">
+        <li class="item status status-processed status-demographics">
           <h4 class="title">Demographic Information</h4>
-          <p class="details">The demographic information you most recently provided has been accepted. You may edit this information at any point before exam registration closes on <strong>${exam_info.registration_end_date_text}</strong></p>
+          <p class="details">The demographic information you most recently provided has been processed. You may edit this information at any point before exam registration closes on <strong>${exam_info.registration_end_date_text}</strong></p>
         </li>
-        <li class="item status status-accepted status-accommodations">
+        <li class="item status status-processed status-accommodations">
           <h4 class="title">Accommodations Request</h4>
-          <p class="details">Your requested accommodations have been accepted and include:</p>
+          <p class="details">Your requested accommodations have been reviewed and processed. You are allowed:</p>
 
           <ul class="accommodations-list">
             <li class="item">Extra Time - Double Time</li>
@@ -351,9 +351,9 @@
             <li class="item">Equipment</li>
           </ul>  
         </li>
-        <li class="item status status-accepted status-registration">
+        <li class="item status status-processed status-registration">
           <h4 class="title">Registration Request</h4>
-          <p class="details">Your exam registration has been accepted and has been forwarded to Pearson. You are now able to schedule an exam.</p>
+          <p class="details">Your exam registration has been processed and has been forwarded to Pearson. You are now able to schedule an exam.</p>
         </li>
       </ol>
     </div>

From 329982a665ec90301f398a36004819cc44fa22e6 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Tue, 8 Jan 2013 11:48:07 -0500
Subject: [PATCH 025/541] pearson registration - fixed layout issue with
 submission errors

---
 lms/static/sass/multicourse/_testcenter-register.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lms/static/sass/multicourse/_testcenter-register.scss b/lms/static/sass/multicourse/_testcenter-register.scss
index dfea8d5e6c..b2b860b60b 100644
--- a/lms/static/sass/multicourse/_testcenter-register.scss
+++ b/lms/static/sass/multicourse/_testcenter-register.scss
@@ -635,6 +635,7 @@ $red: rgb(178, 6, 16);
 				padding: ($baseline/2) $baseline;
 				font-size: 13px;
 				font-weight: bold;
+				letter-spacing: 0;
 
 				&:hover {
 				  text-decoration: none;
@@ -652,6 +653,9 @@ $red: rgb(178, 6, 16);
 
 		// submission error
 		&.submission-error {
+			@include box-sizing(border-box);
+			float: left;
+			width: flex-grid(8,8);
 			border: 1px solid tint($red,85%);
 			background: tint($red,95%);
 			font-size: 14px;

From 25f08374caa9a40c4432222594ece10804393349 Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Tue, 8 Jan 2013 17:42:15 -0500
Subject: [PATCH 026/541] hook up more registration status boxes

---
 ...more_fields_to_test_center_registration.py | 208 ++++++++++++++++++
 common/djangoapps/student/models.py           | 140 +++++++++---
 lms/templates/dashboard.html                  |   6 +-
 lms/templates/test_center_register.html       | 102 ++++++++-
 4 files changed, 414 insertions(+), 42 deletions(-)
 create mode 100644 common/djangoapps/student/migrations/0023_add_more_fields_to_test_center_registration.py

diff --git a/common/djangoapps/student/migrations/0023_add_more_fields_to_test_center_registration.py b/common/djangoapps/student/migrations/0023_add_more_fields_to_test_center_registration.py
new file mode 100644
index 0000000000..adcf5e6d66
--- /dev/null
+++ b/common/djangoapps/student/migrations/0023_add_more_fields_to_test_center_registration.py
@@ -0,0 +1,208 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'TestCenterUser.processed_at'
+        db.add_column('student_testcenteruser', 'processed_at',
+                      self.gf('django.db.models.fields.DateTimeField')(null=True, db_index=True),
+                      keep_default=False)
+
+        # Adding field 'TestCenterUser.confirmed_at'
+        db.add_column('student_testcenteruser', 'confirmed_at',
+                      self.gf('django.db.models.fields.DateTimeField')(null=True, db_index=True),
+                      keep_default=False)
+
+        # Adding field 'TestCenterRegistration.processed_at'
+        db.add_column('student_testcenterregistration', 'processed_at',
+                      self.gf('django.db.models.fields.DateTimeField')(null=True, db_index=True),
+                      keep_default=False)
+
+        # Adding field 'TestCenterRegistration.authorization_id'
+        db.add_column('student_testcenterregistration', 'authorization_id',
+                      self.gf('django.db.models.fields.IntegerField')(null=True, db_index=True),
+                      keep_default=False)
+
+        # Adding field 'TestCenterRegistration.confirmed_at'
+        db.add_column('student_testcenterregistration', 'confirmed_at',
+                      self.gf('django.db.models.fields.DateTimeField')(null=True, db_index=True),
+                      keep_default=False)
+
+        # Adding index on 'TestCenterRegistration', fields ['accommodation_request']
+        db.create_index('student_testcenterregistration', ['accommodation_request'])
+
+        # Adding index on 'TestCenterRegistration', fields ['upload_status']
+        db.create_index('student_testcenterregistration', ['upload_status'])
+
+
+    def backwards(self, orm):
+        # Removing index on 'TestCenterRegistration', fields ['upload_status']
+        db.delete_index('student_testcenterregistration', ['upload_status'])
+
+        # Removing index on 'TestCenterRegistration', fields ['accommodation_request']
+        db.delete_index('student_testcenterregistration', ['accommodation_request'])
+
+        # Deleting field 'TestCenterUser.processed_at'
+        db.delete_column('student_testcenteruser', 'processed_at')
+
+        # Deleting field 'TestCenterUser.confirmed_at'
+        db.delete_column('student_testcenteruser', 'confirmed_at')
+
+        # Deleting field 'TestCenterRegistration.processed_at'
+        db.delete_column('student_testcenterregistration', 'processed_at')
+
+        # Deleting field 'TestCenterRegistration.authorization_id'
+        db.delete_column('student_testcenterregistration', 'authorization_id')
+
+        # Deleting field 'TestCenterRegistration.confirmed_at'
+        db.delete_column('student_testcenterregistration', 'confirmed_at')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'student.courseenrollment': {
+            'Meta': {'unique_together': "(('user', 'course_id'),)", 'object_name': 'CourseEnrollment'},
+            'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'student.pendingemailchange': {
+            'Meta': {'object_name': 'PendingEmailChange'},
+            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'new_email': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'})
+        },
+        'student.pendingnamechange': {
+            'Meta': {'object_name': 'PendingNameChange'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'new_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'rationale': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'})
+        },
+        'student.registration': {
+            'Meta': {'object_name': 'Registration', 'db_table': "'auth_registration'"},
+            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'unique': 'True'})
+        },
+        'student.testcenterregistration': {
+            'Meta': {'object_name': 'TestCenterRegistration'},
+            'accommodation_code': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
+            'accommodation_request': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '1024', 'blank': 'True'}),
+            'authorization_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'db_index': 'True'}),
+            'client_authorization_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20', 'db_index': 'True'}),
+            'confirmed_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}),
+            'course_id': ('django.db.models.fields.CharField', [], {'max_length': '128', 'db_index': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'eligibility_appointment_date_first': ('django.db.models.fields.DateField', [], {'db_index': 'True'}),
+            'eligibility_appointment_date_last': ('django.db.models.fields.DateField', [], {'db_index': 'True'}),
+            'exam_series_code': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'processed_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}),
+            'testcenter_user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['student.TestCenterUser']"}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'upload_error_message': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}),
+            'upload_status': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '20', 'blank': 'True'}),
+            'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}),
+            'user_updated_at': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'})
+        },
+        'student.testcenteruser': {
+            'Meta': {'object_name': 'TestCenterUser'},
+            'address_1': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+            'address_2': ('django.db.models.fields.CharField', [], {'max_length': '40', 'blank': 'True'}),
+            'address_3': ('django.db.models.fields.CharField', [], {'max_length': '40', 'blank': 'True'}),
+            'candidate_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'db_index': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'}),
+            'client_candidate_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50', 'db_index': 'True'}),
+            'company_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '50', 'blank': 'True'}),
+            'confirmed_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}),
+            'country': ('django.db.models.fields.CharField', [], {'max_length': '3', 'db_index': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'extension': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '8', 'blank': 'True'}),
+            'fax': ('django.db.models.fields.CharField', [], {'max_length': '35', 'blank': 'True'}),
+            'fax_country_code': ('django.db.models.fields.CharField', [], {'max_length': '3', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
+            'middle_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'phone': ('django.db.models.fields.CharField', [], {'max_length': '35'}),
+            'phone_country_code': ('django.db.models.fields.CharField', [], {'max_length': '3', 'db_index': 'True'}),
+            'postal_code': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '16', 'blank': 'True'}),
+            'processed_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}),
+            'salutation': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
+            'state': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '20', 'blank': 'True'}),
+            'suffix': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'upload_error_message': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}),
+            'upload_status': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '20', 'blank': 'True'}),
+            'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['auth.User']", 'unique': 'True'}),
+            'user_updated_at': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'})
+        },
+        'student.userprofile': {
+            'Meta': {'object_name': 'UserProfile', 'db_table': "'auth_userprofile'"},
+            'courseware': ('django.db.models.fields.CharField', [], {'default': "'course.xml'", 'max_length': '255', 'blank': 'True'}),
+            'gender': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '6', 'null': 'True', 'blank': 'True'}),
+            'goals': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'language': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
+            'level_of_education': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '6', 'null': 'True', 'blank': 'True'}),
+            'location': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
+            'mailing_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'meta': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'profile'", 'unique': 'True', 'to': "orm['auth.User']"}),
+            'year_of_birth': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'})
+        },
+        'student.usertestgroup': {
+            'Meta': {'object_name': 'UserTestGroup'},
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'}),
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.User']", 'db_index': 'True', 'symmetrical': 'False'})
+        }
+    }
+
+    complete_apps = ['student']
\ No newline at end of file
diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index 2392a92d3a..955876eb66 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -131,6 +131,9 @@ class UserProfile(models.Model):
     def set_meta(self, js):
         self.meta = json.dumps(js)
 
+TEST_CENTER_STATUS_ACCEPTED = "Accepted"
+TEST_CENTER_STATUS_ERROR = "Error"
+
 class TestCenterUser(models.Model):
     """This is our representation of the User for in-person testing, and
     specifically for Pearson at this point. A few things to note:
@@ -159,10 +162,6 @@ class TestCenterUser(models.Model):
     # updated_at, this will not get incremented when we do a batch data import.
     user_updated_at = models.DateTimeField(db_index=True)
 
-    # Unique ID given to us for this User by the Testing Center. It's null when
-    # we first create the User entry, and is assigned by Pearson later.
-    candidate_id = models.IntegerField(null=True, db_index=True)
-
     # Unique ID we assign our user for the Test Center.
     client_candidate_id = models.CharField(unique=True, max_length=50, db_index=True)
 
@@ -197,10 +196,21 @@ class TestCenterUser(models.Model):
     # Company
     company_name = models.CharField(max_length=50, blank=True, db_index=True)
 
-    # Confirmation
-    upload_status = models.CharField(max_length=20, blank=True, db_index=True)  # 'Error' or 'Accepted'
+    # time at which edX sent the registration to the test center
     uploaded_at = models.DateTimeField(null=True, blank=True, db_index=True)
+
+    # confirmation back from the test center, as well as timestamps
+    # on when they processed the request, and when we received 
+    # confirmation back.
+    processed_at = models.DateTimeField(null=True, db_index=True)
+    upload_status = models.CharField(max_length=20, blank=True, db_index=True)  # 'Error' or 'Accepted'
     upload_error_message = models.CharField(max_length=512, blank=True)
+    # Unique ID given to us for this User by the Testing Center. It's null when
+    # we first create the User entry, and may be assigned by Pearson later.
+    # (However, it may never be set if we are always initiating such candidate creation.)
+    candidate_id = models.IntegerField(null=True, db_index=True)
+    confirmed_at = models.DateTimeField(null=True, db_index=True)
+
     
     @staticmethod
     def user_provided_fields():
@@ -237,14 +247,17 @@ class TestCenterUser(models.Model):
         testcenter_user.client_candidate_id = cand_id  
         return testcenter_user
 
+    @property
     def is_accepted(self):
-        return self.upload_status == 'Accepted'
+        return self.upload_status == TEST_CENTER_STATUS_ACCEPTED
   
+    @property
     def is_rejected(self):
-        return self.upload_status == 'Error'
+        return self.upload_status == TEST_CENTER_STATUS_ERROR
     
+    @property
     def is_pending(self):
-        return self.upload_status == ''
+        return not self.is_accepted and not self.is_rejected
 
 class TestCenterUserForm(ModelForm):
     class Meta:
@@ -313,19 +326,21 @@ class TestCenterUserForm(ModelForm):
         # Always return the full collection of cleaned data.
         return cleaned_data
         
-        
+# our own code to indicate that a request has been rejected. 
+ACCOMMODATION_REJECTED_CODE = 'NONE'        
    
 ACCOMODATION_CODES = (
+                      (ACCOMMODATION_REJECTED_CODE, 'No Accommodation Granted'), 
                       ('EQPMNT', 'Equipment'),
                       ('ET12ET', 'Extra Time - 1/2 Exam Time'),
                       ('ET30MN', 'Extra Time - 30 Minutes'),
                       ('ETDBTM', 'Extra Time - Double Time'),
                       ('SEPRMM', 'Separate Room'),
-                      ('SRREAD', 'Separate Room & Reader'),
-                      ('SRRERC', 'Separate Room & Reader/Recorder'),
-                      ('SRRECR', 'Separate Room & Recorder'),
-                      ('SRSEAN', 'Separate Room & Service Animal'),
-                      ('SRSGNR', 'Separate Room & Sign Lang Interp'), 
+                      ('SRREAD', 'Separate Room and Reader'),
+                      ('SRRERC', 'Separate Room and Reader/Recorder'),
+                      ('SRRECR', 'Separate Room and Recorder'),
+                      ('SRSEAN', 'Separate Room and Service Animal'),
+                      ('SRSGNR', 'Separate Room and Sign Language Interpreter'), 
                       )
     
 class TestCenterRegistration(models.Model):
@@ -355,7 +370,7 @@ class TestCenterRegistration(models.Model):
     # The appointment dates, the exam count, and the accommodation codes can be updated, 
     # but hopefully this won't happen often.
     user_updated_at = models.DateTimeField(db_index=True)
-    # "client_authorization_id" is the client's unique identifier for the authorization.  
+    # "client_authorization_id" is our unique identifier for the authorization.  
     # This must be present for an update or delete to be sent to Pearson.
     client_authorization_id = models.CharField(max_length=20, unique=True, db_index=True)
 
@@ -365,17 +380,28 @@ class TestCenterRegistration(models.Model):
     eligibility_appointment_date_last = models.DateField(db_index=True)
 
     # this is really a list of codes, using an '*' as a delimiter.
-    # So it's not a choice list.
+    # So it's not a choice list.  We use the special value of ACCOMMODATION_REJECTED_CODE 
+    # to indicate the rejection of an accommodation request.
     accommodation_code = models.CharField(max_length=64, blank=True)
     
     # store the original text of the accommodation request.
-    accommodation_request = models.CharField(max_length=1024, blank=True)
+    accommodation_request = models.CharField(max_length=1024, blank=True, db_index=True)
 
-    # Confirmation
-    upload_status = models.CharField(max_length=20, blank=True)  # 'Error' or 'Accepted'
+    # time at which edX sent the registration to the test center
     uploaded_at = models.DateTimeField(null=True, db_index=True)
-    upload_error_message = models.CharField(max_length=512, blank=True)
 
+    # confirmation back from the test center, as well as timestamps
+    # on when they processed the request, and when we received 
+    # confirmation back.
+    processed_at = models.DateTimeField(null=True, db_index=True)
+    upload_status = models.CharField(max_length=20, blank=True, db_index=True)  # 'Error' or 'Accepted'
+    upload_error_message = models.CharField(max_length=512, blank=True)
+    # Unique ID given to us for this registration by the Testing Center. It's null when
+    # we first create the registration entry, and may be assigned by Pearson later.
+    # (However, it may never be set if we are always initiating such candidate creation.)
+    authorization_id = models.IntegerField(null=True, db_index=True)
+    confirmed_at = models.DateTimeField(null=True, db_index=True)
+    
     @property
     def candidate_id(self):
         return self.testcenter_user.candidate_id
@@ -389,11 +415,11 @@ class TestCenterRegistration(models.Model):
         registration = TestCenterRegistration(testcenter_user = testcenter_user)
         registration.course_id = exam.course_id
         registration.accommodation_request = accommodation_request
-        registration.exam_series_code = exam.exam_series_code # .get('Exam_Series_Code')
+        registration.exam_series_code = exam.exam_series_code
         registration.eligibility_appointment_date_first = strftime("%Y-%m-%d", exam.first_eligible_appointment_date)
         registration.eligibility_appointment_date_last = strftime("%Y-%m-%d", exam.last_eligible_appointment_date)
-        # accommodation_code remains blank for now, along with Pearson confirmation
-        registration.client_authorization_id = registration._create_client_authorization_id()
+        registration.client_authorization_id = TestCenterRegistration._create_client_authorization_id()
+        # accommodation_code remains blank for now, along with Pearson confirmation information
         return registration
 
     @staticmethod
@@ -402,7 +428,8 @@ class TestCenterRegistration(models.Model):
         return u"edX%0d" % randint(1, 10**NUM_DIGITS-1) # binascii.hexlify(os.urandom(8))
     
     
-    def _create_client_authorization_id(self):
+    @staticmethod
+    def _create_client_authorization_id():
         """
         Return a unique id for a registration, suitable for using as an authorization code
         for Pearson.  It must fit within 20 characters.
@@ -413,17 +440,68 @@ class TestCenterRegistration(models.Model):
             auth_id = TestCenterRegistration._generate_authorization_id()
         return auth_id
             
-    def is_accepted(self):
-        return self.upload_status == 'Accepted' and self.testcenter_user.is_accepted()
+    # methods for providing registration status details on registration page:        
+    @property
+    def demographics_is_accepted(self):
+        return self.testcenter_user.is_accepted
+
+    @property
+    def demographics_is_rejected(self):
+        return self.testcenter_user.is_rejected
+                
+    @property
+    def demographics_is_pending(self):
+        return self.testcenter_user.is_pending
+
+    @property
+    def accommodation_is_accepted(self):
+        return len(self.accommodation_request) > 0 and len(self.accommodation_code) > 0 and self.accommodation_code != ACCOMMODATION_REJECTED_CODE
+
+    @property
+    def accommodation_is_rejected(self):
+        return len(self.accommodation_request) > 0 and self.accommodation_code == ACCOMMODATION_REJECTED_CODE
+            
+    @property
+    def accommodation_is_pending(self):
+        return len(self.accommodation_request) > 0 and len(self.accommodation_code) == 0
+
+    @property
+    def accommodation_is_skipped(self):
+        return len(self.accommodation_request) == 0
+
+    @property
+    def registration_is_accepted(self):
+        return self.upload_status == TEST_CENTER_STATUS_ACCEPTED
   
-    def is_rejected(self):
-        return self.upload_status == 'Error' or self.testcenter_user.is_rejected()
+    @property
+    def registration_is_rejected(self):
+        return self.upload_status == TEST_CENTER_STATUS_ERROR
     
+    @property
+    def registration_is_pending(self):
+        return not self.registration_is_accepted and not self.registration_is_rejected
+
+    # methods for providing registration status summary on dashboard page:        
+    @property
+    def is_accepted(self):
+        return self.registration_is_accepted and self.demographics_is_accepted
+  
+    @property
+    def is_rejected(self):
+        return self.registration_is_rejected or self.demographics_is_rejected
+
+    @property
+    def is_pending(self):
+        return not self.is_accepted and not self.is_rejected
+    
+    @property
     def is_pending_accommodation(self):
-        return len(self.accommodation_request) > 0 and self.accommodation_code == ''
+        return self.accommodation_is_pending
         
+    @property
     def is_pending_acknowledgement(self):
-        return (self.upload_status == '' or self.testcenter_user.is_pending()) and not self.is_pending_accommodation()
+        return (not self.is_accepted and not self.is_rejected) and not self.is_pending_accommodation
+
 
 class TestCenterRegistrationForm(ModelForm):
     class Meta:
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index ab31de1aed..c210f6e7be 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -234,7 +234,7 @@
                 % endif
                 <!-- display a registration for a current exam, even if the registration period is over -->
                 % if registration is not None:
-                    % if registration.is_accepted():	    
+                    % if registration.is_accepted:  
                 <div class="message message-status is-shown exam-schedule">
                 	<!-- TODO: pull Pearson destination out into a Setting -->
                    <a href="https://www1.pearsonvue.com/testtaker/signin/SignInPage/EDX" class="exam-button">Schedule Pearson exam</a>
@@ -242,7 +242,7 @@
                    <p class="message-copy">Write this down! You’ll need it to schedule your exam.</p>
                 </div>
                     % endif
-                    % if  registration.is_rejected():	    
+                    % if  registration.is_rejected:	    
                 	<!-- TODO: revise rejection text -->
                 <div class="message message-status is-shown exam-schedule">
                   <a href="mailto:exam-help@edx.org?subject=Pearson VUE Exam - ${get_course_about_section(course, 'university')} ${course.number}" class="button contact-button">Contact exam-help@edx.org</a>
@@ -253,7 +253,7 @@
                    
                 </div>
                     % endif
-                   	% if not registration.is_accepted() and not registration.is_rejected():	    
+                   	% if not registration.is_accepted and not registration.is_rejected:	    
 	            <div class="message message-status is-shown">
     	              <p class="message-copy">Your 
                     <a href="${testcenter_register_target}" id="exam_register_link">registration for the Pearson exam</a>
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index 09f25fbb65..f972599b7a 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -103,25 +103,29 @@
   
   % if registration:
 
-  <!-- NOTE: reg rejected -->
+   % if  registration.is_rejected:      
   <section class="status message message-flash registration-rejected message-action">
     <h3 class="message-title">Your registration for the Pearson exam has been rejected</h3>
     <p class="message-copy">Please check the information you provided, and try to correct any demographic errors.  Otherwise contact someone at edX or Pearson, or just scream for help.</p>
     <a href="mailto:exam-help@edx.org?subject=Pearson VUE Exam - ${get_course_about_section(course, 'university')} ${course.number}" class="button contact-button">Contact exam-help@edx.org</a>
   </section>
+   % endif
 
-  <!-- NOTE: reg processed -->
+   % if  registration.is_accepted:
   <section class="status message message-flash registration-processed message-action">
     <h3 class="message-title">Your registration for the Pearson exam has been processed</h3>
-    <p class="message-copy">Your registration number is <strong>12345678901</strong> (Write this down! You’ll need it to schedule your exam.)</p>
+    <p class="message-copy">Your registration number is <strong>${registration.client_authorization_id}</strong> (Write this down! You’ll need it to schedule your exam.)</p>
     <a href="https://www1.pearsonvue.com/testtaker/signin/SignInPage/EDX" class="button exam-button">Schedule Pearson exam</a>
   </section>
+   % endif
 
-  <!-- NOTE: reg pending -->
+   % if  registration.is_pending:
   <section class="status message message-flash registration-pending">
     <h3 class="message-title">Your registration for the Pearson exam is pending</h3>
     <p class="message-copy">Once your information is processed, it will be forwarded to Pearson and you will be able to schedule an exam.</p>
   </section>
+   % endif
+
   % endif
   
   <section class="content">
@@ -141,10 +145,10 @@
       % endif
 
       <!-- include these as pass-throughs -->
-      <input id="id_email" type="hidden" name="email" maxlength="75" value="${user.email}" />
-      <input id="id_username" type="hidden" name="username" maxlength="75" value="${user.username}" />
-      <input id="id_course_id" type="hidden" name="course_id" maxlength="75" value="${course.id}" />
-      <input id="id_course_id" type="hidden" name="exam_series_code" maxlength="75" value="${exam_info.exam_series_code}" />
+      <input id="id_email" type="hidden" name="email" value="${user.email}" />
+      <input id="id_username" type="hidden" name="username" value="${user.username}" />
+      <input id="id_course_id" type="hidden" name="course_id" value="${course.id}" />
+      <input id="id_course_id" type="hidden" name="exam_series_code" value="${exam_info.exam_series_code}" />
 
       <div class="form-fields-primary">
         <fieldset class="group group-form group-form-personalinformation">
@@ -312,6 +316,88 @@
   <aside>
    % if registration:
 
+    % if registration.is_accepted:     
+    <div class="message message-status registration-processed is-shown">
+    % endif     
+    % if registration.is_rejected:     
+    <div class="message message-status registration-rejected is-shown">
+    % endif     
+    % if registration.is_pending:     
+    <div class="message message-status registration-pending is-shown">
+    % endif     
+      <h3>Pearson Exam Registration Status</h3>
+
+      <ol class="status-list">
+        <!-- first provide status of demographics -->
+        % if registration.demographics_is_pending:     
+        <li class="item status status-pending status-demographics">
+          <h4 class="title">Demographic Information</h4>
+          <p class="details">The demographic information you most recently provided is pending. You may edit this information at any point before exam registration closes on <strong>${exam_info.registration_end_date_text}</strong></p>
+        </li>
+        % endif     
+        % if registration.demographics_is_accepted:     
+        <li class="item status status-processed status-demographics">
+          <h4 class="title">Demographic Information</h4>
+          <p class="details">The demographic information you most recently provided has been processed. You may edit this information at any point before exam registration closes on <strong>${exam_info.registration_end_date_text}</strong></p>
+        </li>
+        % endif     
+        % if registration.demographics_is_rejected:     
+        <li class="item status status-rejected status-demographics">
+          <h4 class="title">Demographic Information</h4>
+          <p class="details">The demographic information you most recently provided has been rejected by Pearson. You can correct and submit it again before the exam registration closes on <strong>${exam_info.registration_end_date_text}</strong>.</p>
+        </li>
+        % endif     
+
+        <!-- then provide status of accommodations, if any -->
+        % if registration.accommodation_is_pending:     
+        <li class="item status status-pending status-accommodations">
+          <h4 class="title">Accommodations Request</h4>
+          <p class="details">Your requested accommodations are pending. Within a few days, you should see confirmation here of granted accommodations.</p>
+        </li>
+        % endif     
+        % if registration.accommodation_is_accepted:     
+        <li class="item status status-processed status-accommodations">
+          <h4 class="title">Accommodations Request</h4>
+          <p class="details">Your requested accommodations have been reviewed and processed. You are allowed:</p>
+
+          <ul class="accommodations-list">
+            <li class="item">Extra Time - Double Time</li>
+            <li class="item">Separate Room & Reader/Recorder</li>
+            <li class="item">Equipment</li>
+          </ul>  
+        </li>
+        % endif     
+        % if registration.accommodation_is_rejected:     
+        <li class="item status status-processed status-accommodations">
+          <h4 class="title">Accommodations Request</h4>
+          <p class="details">Your requested accommodations have been reviewed and processed. You are allowed no accommodations.</p>
+        </li>
+        % endif     
+
+        <!-- finally provide status of registration -->
+        % if registration.registration_is_pending:     
+        <li class="item status status-pending status-registration">
+          <h4 class="title">Registration Request</h4>
+          <p class="details">Your exam registration is pending. Once your information is processed, it will be forwarded to Pearson and you will be able to schedule an exam.</p>
+        </li>
+        % endif     
+        % if registration.registration_is_accepted:     
+        <li class="item status status-processed status-registration">
+          <h4 class="title">Registration Request</h4>
+          <p class="details">Your exam registration has been processed and has been forwarded to Pearson. You are now able to schedule an exam.</p>
+        </li>
+        % endif     
+        % if registration.registration_is_rejected:     
+        <li class="item status status-rejected status-registration">
+          <h4 class="title">Registration Request</h4>
+          <p class="details">Your exam registration has been rejected by Pearson. <strong>You currently cannot schedule an exam</strong>.</p>
+        </li>
+        % endif     
+
+      </ol>
+   
+   </div>
+   
     <!-- NOTE: Dem processed, Accom pending, Registration pending --> 
     <div class="message message-status registration-pending is-shown">
       <h3>Pearson Exam Registration Status</h3>

From a5cce4769e5746362ea4f3c81b3f78d8a737516e Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Wed, 9 Jan 2013 02:14:02 -0500
Subject: [PATCH 027/541] add accommodation listing, and revise error messages

---
 common/djangoapps/student/models.py     | 18 +++---
 lms/templates/dashboard.html            |  2 +-
 lms/templates/test_center_register.html | 82 +++++--------------------
 3 files changed, 22 insertions(+), 80 deletions(-)

diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index 955876eb66..d9ac973271 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -53,9 +53,6 @@ from django.forms import ModelForm, forms
 
 import comment_client as cc
 from django_comment_client.models import Role
-from feedparser import binascii
-import os
-
 
 log = logging.getLogger(__name__)
 
@@ -329,7 +326,7 @@ class TestCenterUserForm(ModelForm):
 # our own code to indicate that a request has been rejected. 
 ACCOMMODATION_REJECTED_CODE = 'NONE'        
    
-ACCOMODATION_CODES = (
+ACCOMMODATION_CODES = (
                       (ACCOMMODATION_REJECTED_CODE, 'No Accommodation Granted'), 
                       ('EQPMNT', 'Equipment'),
                       ('ET12ET', 'Extra Time - 1/2 Exam Time'),
@@ -342,6 +339,8 @@ ACCOMODATION_CODES = (
                       ('SRSEAN', 'Separate Room and Service Animal'),
                       ('SRSGNR', 'Separate Room and Sign Language Interpreter'), 
                       )
+
+ACCOMMODATION_CODE_DICT = { code : name for (code, name) in ACCOMMODATION_CODES }
     
 class TestCenterRegistration(models.Model):
     """
@@ -494,14 +493,11 @@ class TestCenterRegistration(models.Model):
     def is_pending(self):
         return not self.is_accepted and not self.is_rejected
     
-    @property
-    def is_pending_accommodation(self):
-        return self.accommodation_is_pending
-        
-    @property
-    def is_pending_acknowledgement(self):
-        return (not self.is_accepted and not self.is_rejected) and not self.is_pending_accommodation
+    def get_accommodation_codes(self):
+        return self.accommodation_code.split('*')
 
+    def get_accommodation_names(self):
+        return [ ACCOMMODATION_CODE_DICT.get(code, "Unknown code " + code) for code in self.get_accommodation_codes() ]         
 
 class TestCenterRegistrationForm(ModelForm):
     class Meta:
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index c210f6e7be..ba827e1219 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -249,7 +249,7 @@
                   <p class="message-copy">Your 
                     <a href="${testcenter_register_target}" id="exam_register_link">registration for the Pearson exam</a>
      has been rejected. Please check the information you provided, and try to correct any demographic errors.  Otherwise
-     contact someone at edX or Pearson, or just scream for help.</p>
+     contact edX for further help.</p>
                    
                 </div>
                     % endif
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index f972599b7a..0db34cec00 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -102,12 +102,14 @@
   </section>
   
   % if registration:
+  
+   <% exam_help_href = "mailto:exam-help@edx.org?subject=Pearson VUE Exam - %s %s".format(get_course_about_section(course, 'university'), course.number) %>
 
    % if  registration.is_rejected:      
   <section class="status message message-flash registration-rejected message-action">
     <h3 class="message-title">Your registration for the Pearson exam has been rejected</h3>
-    <p class="message-copy">Please check the information you provided, and try to correct any demographic errors.  Otherwise contact someone at edX or Pearson, or just scream for help.</p>
-    <a href="mailto:exam-help@edx.org?subject=Pearson VUE Exam - ${get_course_about_section(course, 'university')} ${course.number}" class="button contact-button">Contact exam-help@edx.org</a>
+    <p class="message-copy">Please check the information you provided, and try to correct any demographic errors.  Otherwise contact edX at exam-help@edx.org.</p>
+    <a href="${exam_help_href}" class="button contact-button">Contact exam-help@edx.org</a>
   </section>
    % endif
 
@@ -344,7 +346,10 @@
         % if registration.demographics_is_rejected:     
         <li class="item status status-rejected status-demographics">
           <h4 class="title">Demographic Information</h4>
-          <p class="details">The demographic information you most recently provided has been rejected by Pearson. You can correct and submit it again before the exam registration closes on <strong>${exam_info.registration_end_date_text}</strong>.</p>
+          <p class="details">The demographic information you most recently provided has been rejected by Pearson. You can correct and submit it again before the exam registration closes on <strong>${exam_info.registration_end_date_text}</strong>.
+          The error message is:</p>
+          <p class="details">${registration.testcenter_user.upload_error_message}.</p>
+          <p class="details">If the error is not correctable by revising demographic information and resubmitting, please contact edX at <a href="${exam_help_href}">exam-help@edx.org</a>.</p>
         </li>
         % endif     
 
@@ -361,9 +366,9 @@
           <p class="details">Your requested accommodations have been reviewed and processed. You are allowed:</p>
 
           <ul class="accommodations-list">
-            <li class="item">Extra Time - Double Time</li>
-            <li class="item">Separate Room & Reader/Recorder</li>
-            <li class="item">Equipment</li>
+            % for accommodation_name in registration.get_accommodation_names():
+            <li class="item">${accommodation_name}</li>
+            % endfor
           </ul>  
         </li>
         % endif     
@@ -390,7 +395,9 @@
         % if registration.registration_is_rejected:     
         <li class="item status status-rejected status-registration">
           <h4 class="title">Registration Request</h4>
-          <p class="details">Your exam registration has been rejected by Pearson. <strong>You currently cannot schedule an exam</strong>.</p>
+          <p class="details">Your exam registration has been rejected by Pearson. <strong>You currently cannot schedule an exam</strong>.
+          Please contact edX at <a href="${exam_help_href}">exam-help@edx.org</a>.  The error message is:</p>
+          <p class="details">${registration.upload_error_message}.</p>
         </li>
         % endif     
 
@@ -398,67 +405,6 @@
    
    </div>
    
-    <!-- NOTE: Dem processed, Accom pending, Registration pending --> 
-    <div class="message message-status registration-pending is-shown">
-      <h3>Pearson Exam Registration Status</h3>
-
-      <ol class="status-list">
-        <li class="item status status-processed status-demographics">
-          <h4 class="title">Demographic Information</h4>
-          <p class="details">The demographic information you most recently provided has been processed. You may edit this information at any point before exam registration closes on <strong>${exam_info.registration_end_date_text}</strong></p>
-        </li>
-        <li class="item status status-pending status-accommodations">
-          <h4 class="title">Accommodations Request</h4>
-          <p class="details">Your requested accommodations are pending. Within a few days, you should see confirmation here of granted accommodations.</p>
-        </li>
-        <li class="item status status-pending status-registration">
-          <h4 class="title">Registration Request</h4>
-          <p class="details">Your exam registration is pending. Once your information is processed, it will be forwarded to Pearson and you will be able to schedule an exam.</p>
-        </li>
-      </ol>
-    </div>
-
-    <!-- NOTE: Dem processed, Accom processed, Registration processed --> 
-    <div class="message message-status registration-processed is-shown">
-      <h3>Pearson Exam Registration Status</h3>
-
-      <ol class="status-list">
-        <li class="item status status-processed status-demographics">
-          <h4 class="title">Demographic Information</h4>
-          <p class="details">The demographic information you most recently provided has been processed. You may edit this information at any point before exam registration closes on <strong>${exam_info.registration_end_date_text}</strong></p>
-        </li>
-        <li class="item status status-processed status-accommodations">
-          <h4 class="title">Accommodations Request</h4>
-          <p class="details">Your requested accommodations have been reviewed and processed. You are allowed:</p>
-
-          <ul class="accommodations-list">
-            <li class="item">Extra Time - Double Time</li>
-            <li class="item">Separate Room & Reader/Recorder</li>
-            <li class="item">Equipment</li>
-          </ul>  
-        </li>
-        <li class="item status status-processed status-registration">
-          <h4 class="title">Registration Request</h4>
-          <p class="details">Your exam registration has been processed and has been forwarded to Pearson. You are now able to schedule an exam.</p>
-        </li>
-      </ol>
-    </div>
-
-    <!-- NOTE: Dem rejected, Accom none, Registration rejected --> 
-    <div class="message message-status registration-rejected is-shown">
-      <h3>Pearson Exam Registration Status</h3>
-
-      <ol class="status-list">
-        <li class="item status status-rejected status-demographics">
-          <h4 class="title">Demographic Information</h4>
-          <p class="details">The demographic information you most recently provided has been rejected by Pearson. You can correct and submit it again before the exam registration closes on <strong>${exam_info.registration_end_date_text}</strong>.</p>
-        </li>
-        <li class="item status status-rejected status-registration">
-          <h4 class="title">Registration Request</h4>
-          <p class="details">Your exam registration has been rejected by Pearson. <strong>You currently cannot schedule an exam</strong>.</p>
-        </li>
-      </ol>
-    </div>
 
    % endif
     

From 8ad9bc594955d64edcc71ab49e66b88a4a656f6b Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Wed, 9 Jan 2013 11:26:54 -0500
Subject: [PATCH 028/541] Move Pearson URL to settings.  Fix Register button.
 Other small changes.

---
 common/djangoapps/student/models.py     |  4 ++++
 lms/envs/common.py                      |  3 +++
 lms/templates/dashboard.html            |  4 +---
 lms/templates/test_center_register.html | 12 +++++++-----
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index d9ac973271..f85ebd0625 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -499,6 +499,10 @@ class TestCenterRegistration(models.Model):
     def get_accommodation_names(self):
         return [ ACCOMMODATION_CODE_DICT.get(code, "Unknown code " + code) for code in self.get_accommodation_codes() ]         
 
+    @property
+    def registration_signup_url(self):
+        return settings.PEARSONVUE_SIGNINPAGE_URL
+    
 class TestCenterRegistrationForm(ModelForm):
     class Meta:
         model = TestCenterRegistration
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 1b1be28ead..48badbd325 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -328,6 +328,9 @@ STAFF_GRADING_INTERFACE = None
 # Used for testing, debugging
 MOCK_STAFF_GRADING = False
 
+################################# Pearson TestCenter config  ################
+
+PEARSONVUE_SIGNINPAGE_URL = "https://www1.pearsonvue.com/testtaker/signin/SignInPage/EDX"
 
 ################################# Jasmine ###################################
 JASMINE_TEST_DIRECTORY = PROJECT_ROOT + '/static/coffee'
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index ba827e1219..3dc128e62c 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -236,14 +236,12 @@
                 % if registration is not None:
                     % if registration.is_accepted:  
                 <div class="message message-status is-shown exam-schedule">
-                	<!-- TODO: pull Pearson destination out into a Setting -->
-                   <a href="https://www1.pearsonvue.com/testtaker/signin/SignInPage/EDX" class="exam-button">Schedule Pearson exam</a>
+                   <a href="${registration.registration_signup_url}" class="button exam-button">Schedule Pearson exam</a>
                    <p class="exam-registration-number"><a href="${testcenter_register_target}" id="exam_register_link">Registration</a> number: <strong>${registration.client_authorization_id}</strong></p>
                    <p class="message-copy">Write this down! You’ll need it to schedule your exam.</p>
                 </div>
                     % endif
                     % if  registration.is_rejected:	    
-                	<!-- TODO: revise rejection text -->
                 <div class="message message-status is-shown exam-schedule">
                   <a href="mailto:exam-help@edx.org?subject=Pearson VUE Exam - ${get_course_about_section(course, 'university')} ${course.number}" class="button contact-button">Contact exam-help@edx.org</a>
                   <p class="message-copy">Your 
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index 0db34cec00..ea63b8261a 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -46,7 +46,7 @@
         $(".submission-error").addClass("is-shown");
         for (fieldname in field_errors) {
           // to inform a user of what field the error occurred on, add a class of .error to the .field element.
-          // for convenience, use the "data-field" attribute to identify the one matching the errant field's name.
+          // for convenience, use the "id" attribute to identify the one matching the errant field's name.
           var field_id = "field-" + fieldname;
           var field_label = $("[id='"+field_id+"'] label").text();
 
@@ -117,7 +117,7 @@
   <section class="status message message-flash registration-processed message-action">
     <h3 class="message-title">Your registration for the Pearson exam has been processed</h3>
     <p class="message-copy">Your registration number is <strong>${registration.client_authorization_id}</strong> (Write this down! You’ll need it to schedule your exam.)</p>
-    <a href="https://www1.pearsonvue.com/testtaker/signin/SignInPage/EDX" class="button exam-button">Schedule Pearson exam</a>
+    <a href="${registration.registration_signup_url}" class="button exam-button">Schedule Pearson exam</a>
   </section>
    % endif
 
@@ -138,7 +138,7 @@
       
       % if registration:
       <p class="instructions">
-        Please complete the following form to update your demographic information used in your Pearson VUE Proctored Exam. Required fields are noted by <strong class="indicator">bold text and an asterisk (*)</strong>. 
+        Please use the following form if you need to update your demographic information used in your Pearson VUE Proctored Exam. Required fields are noted by <strong class="indicator">bold text and an asterisk (*)</strong>. 
       </p>
       % else: 
       <p class="instructions">
@@ -264,7 +264,9 @@
       % endif
 
         % if registration:
+          % if registration.accommodation_request and len(registration.accommodation_request) > 0:
         <p class="note"><span class="title">Note</span>: Accomodation requests, which need to be reviewed in detail, <strong>will add significant delay to the registration process</strong>.</p>
+          % endif
         % else: 
         <p class="note"><span class="title">Note</span>: Accommodation requests are not part of your demographic information, <strong>and cannot be changed once submitted</strong>. Accomodation requests, which need to be reviewed in detail, <strong>will add significant delay to the registration process</strong>.</p>
         % endif
@@ -275,13 +277,13 @@
           <ol class="list-input">
             % if registration:
               % if registration.accommodation_request and len(registration.accommodation_request) > 0:
-            <li data-field="accommodation_request" class="field submitted" id="field-accommodation_request">
+            <li class="field submitted" id="field-accommodation_request">
               <label for="accommodation_request">Accommodations Requested</label>
               <p class="value" id="accommodations">${registration.accommodation_request}</p>
             </li>
               % endif
             % else: 
-            <li data-field="accommodation_request" class="field" id="field-accommodation_request">
+            <li class="field" id="field-accommodation_request">
               <label for="accommodation_request">Accommodations Requested</label>
               <textarea class="long" id="accommodation_request" name="accommodation_request" value="" placeholder=""></textarea>             
             </li>

From 21fe582788a00a6a999f500c0328dfe68fc8b351 Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Wed, 9 Jan 2013 11:51:55 -0500
Subject: [PATCH 029/541] No longer need this extra file.

---
 lms/templates/test_center_register_modal.html | 109 ------------------
 1 file changed, 109 deletions(-)
 delete mode 100644 lms/templates/test_center_register_modal.html

diff --git a/lms/templates/test_center_register_modal.html b/lms/templates/test_center_register_modal.html
deleted file mode 100644
index 5638d4750b..0000000000
--- a/lms/templates/test_center_register_modal.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<%namespace name='static' file='static_content.html'/>
-<%! from django.core.urlresolvers import reverse %>
-<%! from django_countries.countries import COUNTRIES %>
-<%! from student.models import UserProfile %>
-<%! from datetime import date %>
-<%! import calendar %>
-
-<section id="testcenter-register-modal" class="modal testcenter-register-modal">
-  <div class="inner-wrapper">
-    <div id="register">
-      <header>
-        <h2>Sign Up for Pearson VUE Test Center Proctoring</h2>
-        <hr>
-      </header>
-
-      <form id="test_register_form" class="test_register_form" method="post" data-remote="true" action="/create_test_registration">
-        <div class="notice"></div>
-        <div id="register_error" class="modal-form-error" name="register_error"></div>
-        <div id="register_error" name="register_error"></div>
-	<!-- include these as pass-throughs -->
-        <input id="id_email" type="hidden" name="email" maxlength="75" value="${user.email}" />
-        <input id="id_username" type="hidden" name="username" maxlength="75" value="${user.username}" />
-	<!-- TODO: add the course somehow... -->
-
-	<!-- we should first start with information that we already know about the user,
-	     though we should also give them the option to fix it. 
-	     Some things don't change, once assigned, like client_candidate_id
-	     or candidate_id. 
-	  -->
-        <div class="input-group">
-          <label data-field="first_name">First Name*</label>
-          <input name="first_name" type="text" value="${testcenteruser.first_name}" maxlength="30" placeholder="e.g. Jane">
-          <label data-field="last_name">Last Name*</label>
-          <input name="last_name" type="text" value="${testcenteruser.last_name}" placeholder="e.g. Smith">
-          <label data-field="middle_name">Middle Name</label>
-          <input name="middle_name" type="text" value="${testcenteruser.middle_name}" placeholder="e.g. Michael">
-          <label data-field="suffix">Suffix</label>
-          <input name="suffix" type="text" value="${testcenteruser.suffix}" placeholder="e.g. Jr.">
-          <label data-field="salutation">Salutation</label>
-          <input name="salutation" type="text" value="${testcenteruser.salutation}" placeholder="e.g. Dr.">
-        </div>
-
-        <div class="input-group">
-          <label data-field="address_1">Address1*</label>
-          <input name="address_1" type="text" value="${testcenteruser.address_1}" placeholder="123 Main St.">
-          <label data-field="address_2">Address2</label>
-          <input name="address_2" type="text" value="${testcenteruser.address_2}" placeholder="Apartment 2B.">
-          <label data-field="address_3">Address3</label>
-          <input name="address_3" type="text" value="${testcenteruser.address_3}" placeholder="Attention: John Smith">
-
-          <label data-field="city">City</label>
-          <input name="city" type="text" value="${testcenteruser.city}" placeholder="Our Fair City">
-          <label data-field="state">State/Province</label>
-          <input name="state" type="text" value="${testcenteruser.state}" placeholder="MA">
-          <label data-field="postal_code">Postal Code</label>
-          <input name="postal_code" type="text" value="${testcenteruser.postal_code}" placeholder="02138">
-          <label data-field="country">Country Code*</label>
-          <input name="country" type="text" value="${testcenteruser.country}" placeholder="USA">
-        </div>
-
-	<!-- for now, just leave off the phone and company information -->
-        <div class="input-group">
-          <label data-field="phone">Phone*</label>
-          <input name="phone" type="text" value="${testcenteruser.phone}" placeholder="1-23-456-7890">
-          <label data-field="phone">Extension</label>
-          <input name="extension" type="text" value="${testcenteruser.extension}" placeholder="x123">
-          <label data-field="phone_country_code">Phone Country Code*</label>
-          <input name="phone_country_code" type="text" value="${testcenteruser.phone_country_code}" placeholder="ABC">
-          <label data-field="fax">Fax</label>
-          <input name="fax" type="text" value="${testcenteruser.fax}" placeholder="1-23-456-7891">
-          <label data-field="fax_country_code">Fax Country Code*</label>
-          <input name="fax_country_code" type="text" value="${testcenteruser.fax_country_code}" placeholder="ABC">
-          <label data-field="company_name">Company</label>
-          <input name="company_name" type="text" value="${testcenteruser.company_name}" placeholder="Acme Corporation">
-        </div>
-
-        <div class="input-group">
-          <label data-field="accommodations">Accommodations Requested</label>
-          <textarea name="accommodations"></textarea>
-        </div>
-
-        <div class="submit">
-          <input name="submit" type="submit" value="Register for Test">
-        </div>
-      </form>
-
-    </div>
-
-    <div class="close-modal">
-      <div class="inner">
-        <p>&#10005;</p>
-      </div>
-    </div>
-  </div>
-</section>
-
-<script type="text/javascript">
-  (function() {
-   $(document).delegate('#test_register_form', 'ajax:success', function(data, json, xhr) {
-     if(json.success) {
-       location.href="${reverse('dashboard')}";
-     } else {
-       $(".field-error").removeClass('field-error');
-       $('#register_error').html(json.value).stop().css("display", "block");
-       $("[data-field='"+json.field+"']").addClass('field-error')
-     }
-    });
-  })(this)
-</script>

From cc8e8ba6c68cc04d3f2ed288b8598bf5120ecad8 Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Wed, 9 Jan 2013 13:31:04 -0500
Subject: [PATCH 030/541] Pearson reg: relax validation of phone country codes.

---
 common/djangoapps/student/models.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index f85ebd0625..95ceb34528 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -287,13 +287,7 @@ class TestCenterUserForm(ModelForm):
         
     def clean_country(self):
         return self.check_country_code('country')
-        
-    def clean_phone_country_code(self):
-        return self.check_country_code('phone_country_code')
-
-    def clean_fax_country_code(self):
-        return self.check_country_code('fax_country_code')
-        
+                
     def clean(self):
         cleaned_data = super(TestCenterUserForm, self).clean()
         
@@ -317,7 +311,7 @@ class TestCenterUserForm(ModelForm):
         cleaned_data_fields = [fieldname for fieldname in cleaned_data]
         for fieldname in cleaned_data_fields:
             if not TestCenterUserForm.can_encode_as_latin(cleaned_data[fieldname]):
-                self._errors[fieldname] = self.error_class([u'Must only use characters in Latin-1 encoding'])                
+                self._errors[fieldname] = self.error_class([u'Must only use characters in Latin-1 (iso-8859-1) encoding'])                
                 del cleaned_data[fieldname]
 
         # Always return the full collection of cleaned data.

From a388263298fc955e3a2cc8baa0a232b98b774df9 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Wed, 9 Jan 2013 16:06:10 -0500
Subject: [PATCH 031/541] pearson registration - giving registration call to
 actions on dashboard a bit more room

---
 lms/static/sass/multicourse/_dashboard.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss
index a309816cb4..a83fbc4658 100644
--- a/lms/static/sass/multicourse/_dashboard.scss
+++ b/lms/static/sass/multicourse/_dashboard.scss
@@ -488,7 +488,7 @@
 
         .message-copy {
           margin-top: 5px;
-          width: 60%;
+          width: 55%;
         }
       }
 

From 468d703b574c87110a8a4e96c81e70c924654c70 Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Wed, 9 Jan 2013 18:08:05 -0500
Subject: [PATCH 032/541] Update CDD export to output only changed records.

---
 .../management/commands/pearson_export_cdd.py | 52 +++++++++++---
 .../commands/pearson_make_tc_user.py          | 72 +++++++++++++++----
 common/djangoapps/student/models.py           | 11 +--
 3 files changed, 109 insertions(+), 26 deletions(-)

diff --git a/common/djangoapps/student/management/commands/pearson_export_cdd.py b/common/djangoapps/student/management/commands/pearson_export_cdd.py
index b10e92d92d..fec2ec9297 100644
--- a/common/djangoapps/student/management/commands/pearson_export_cdd.py
+++ b/common/djangoapps/student/management/commands/pearson_export_cdd.py
@@ -1,14 +1,17 @@
 import csv
 import uuid
-from collections import defaultdict, OrderedDict
+from collections import OrderedDict
 from datetime import datetime
 
-from django.core.management.base import BaseCommand, CommandError
+from django.core.management.base import BaseCommand
 
 from student.models import TestCenterUser
+from os.path import isdir
+from fs.path import pathjoin
 
 class Command(BaseCommand):
     CSV_TO_MODEL_FIELDS = OrderedDict([
+        # Skipping optional field CandidateID
         ("ClientCandidateID", "client_candidate_id"),
         ("FirstName", "first_name"),
         ("LastName", "last_name"),
@@ -44,9 +47,36 @@ class Command(BaseCommand):
             print Command.help
             return
 
-        self.reset_sample_data()
+        # use options to set these:
+        dump_all = False
+        # self.reset_sample_data()
 
-        with open(args[0], "wb") as outfile:
+        # update time should use UTC in order to be comparable to the user_updated_at 
+        # field
+        uploaded_at = datetime.utcnow()
+
+        # if specified destination is an existing directory, then 
+        # create a filename for it automatically.  If it doesn't exist,
+        # or exists as a file, then we will just write to it.
+        # Name will use timestamp -- this is UTC, so it will look funny,
+        # but it should at least be consistent with the other timestamps 
+        # used in the system.
+        dest = args[0]
+        if isdir(dest):
+            destfile = pathjoin(dest, uploaded_at.strftime("cdd-%Y%m%d-%H%M%S.dat"))
+        else:
+            destfile = dest
+        
+        # strings must be in latin-1 format.  CSV parser will
+        # otherwise convert unicode objects to ascii.
+        def ensure_encoding(value):
+            if isinstance(value, unicode):
+                return value.encode('iso-8859-1');
+            else:
+                return value;
+            
+
+        with open(destfile, "wb") as outfile:
             writer = csv.DictWriter(outfile,
                                     Command.CSV_TO_MODEL_FIELDS,
                                     delimiter="\t",
@@ -54,11 +84,15 @@ class Command(BaseCommand):
                                     extrasaction='ignore')
             writer.writeheader()
             for tcu in TestCenterUser.objects.order_by('id'):
-                record = dict((csv_field, getattr(tcu, model_field))
-                              for csv_field, model_field
-                              in Command.CSV_TO_MODEL_FIELDS.items())
-                record["LastUpdate"] = record["LastUpdate"].strftime("%Y/%m/%d %H:%M:%S")
-                writer.writerow(record)
+                if dump_all or tcu.needs_uploading:
+                    record = dict((csv_field, ensure_encoding(getattr(tcu, model_field)))
+                                  for csv_field, model_field
+                                  in Command.CSV_TO_MODEL_FIELDS.items())
+                    record["LastUpdate"] = record["LastUpdate"].strftime("%Y/%m/%d %H:%M:%S")
+                    writer.writerow(record)
+                    tcu.uploaded_at = uploaded_at
+                    tcu.save()
+
 
     def reset_sample_data(self):
         def make_sample(**kwargs):
diff --git a/common/djangoapps/student/management/commands/pearson_make_tc_user.py b/common/djangoapps/student/management/commands/pearson_make_tc_user.py
index d974c25b6b..97e30002c0 100644
--- a/common/djangoapps/student/management/commands/pearson_make_tc_user.py
+++ b/common/djangoapps/student/management/commands/pearson_make_tc_user.py
@@ -1,20 +1,13 @@
-import uuid
-from datetime import datetime
 from optparse import make_option
 
 from django.contrib.auth.models import User
-from django.core.management.base import BaseCommand, CommandError
+from django.core.management.base import BaseCommand
 
-from student.models import TestCenterUser
+from student.models import TestCenterUser, TestCenterUserForm
 
 class Command(BaseCommand):
     option_list = BaseCommand.option_list + (
-        make_option(
-            '--client_candidate_id',
-            action='store',
-            dest='client_candidate_id',
-            help='ID we assign a user to identify them to Pearson'
-        ),        
+        # demographics:     
         make_option(
             '--first_name',
             action='store',
@@ -64,6 +57,25 @@ class Command(BaseCommand):
             dest='phone_country_code',
             help='Phone country code, just "1" for the USA'
         ),
+        # internal values:
+        make_option(
+            '--client_candidate_id',
+            action='store',
+            dest='client_candidate_id',
+            help='ID we assign a user to identify them to Pearson'
+        ),   
+        make_option(
+            '--upload_status',
+            action='store',
+            dest='upload_status',
+            help='status value assigned by Pearson'
+        ),   
+        make_option(
+            '--upload_error_message',
+            action='store',
+            dest='upload_error_message',
+            help='error message provided by Pearson on a failure.'
+        ),   
     )
     args = "<student_username>"
     help = "Create a TestCenterUser entry for a given Student"
@@ -79,7 +91,41 @@ class Command(BaseCommand):
         print username
 
         our_options = dict((k, v) for k, v in options.items()
-                           if Command.is_valid_option(k))
+                           if Command.is_valid_option(k) and v is not None)
         student = User.objects.get(username=username)
-        student.test_center_user = TestCenterUser(**our_options)
-        student.test_center_user.save()
+        try:
+            testcenter_user = TestCenterUser.objects.get(user=student)
+            needs_updating = testcenter_user.needs_update(our_options)    
+        except TestCenterUser.DoesNotExist:
+            # do additional initialization here:
+            testcenter_user = TestCenterUser.create(student)
+            needs_updating = True
+        
+        if needs_updating:
+            form = TestCenterUserForm(instance=testcenter_user, data=our_options)
+            if form.is_valid():
+                form.update_and_save()
+            else:
+                if (len(form.errors) > 0):
+                    print "Field Form errors encountered:"
+                for fielderror in form.errors:
+                    print "Field Form Error:  %s" % fielderror
+                    if (len(form.non_field_errors()) > 0):
+                        print "Non-field Form errors encountered:"
+                        for nonfielderror in form.non_field_errors:
+                            print "Non-field Form Error:  %s" % nonfielderror
+                    
+        else:
+            print "No changes necessary to make to existing user's demographics."
+            
+        # override internal values:
+        change_internal = False
+        testcenter_user = TestCenterUser.objects.get(user=student)
+        for internal_field in [ 'upload_error_message', 'upload_status', 'client_candidate_id']:
+            if internal_field in our_options:
+                testcenter_user = our_options[internal_field]
+                change_internal = True
+                
+        if change_internal:
+            testcenter_user.save()
+            
diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index 95ceb34528..d5058ae92f 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -208,6 +208,9 @@ class TestCenterUser(models.Model):
     candidate_id = models.IntegerField(null=True, db_index=True)
     confirmed_at = models.DateTimeField(null=True, db_index=True)
 
+    @property
+    def needs_uploading(self):
+        return self.uploaded_at is None or self.uploaded_at < self.user_updated_at
     
     @staticmethod
     def user_provided_fields():
@@ -223,7 +226,7 @@ class TestCenterUser(models.Model):
 #        needs_updating = any([__getattribute__(fieldname) != dict[fieldname]
 #                              for fieldname in TestCenterUser.user_provided_fields()])
         for fieldname in TestCenterUser.user_provided_fields():
-            if self.__getattribute__(fieldname) != dict[fieldname]:
+            if fieldname in dict and self.__getattribute__(fieldname) != dict[fieldname]:
                 return True
             
         return False    
@@ -231,7 +234,7 @@ class TestCenterUser(models.Model):
     @staticmethod
     def _generate_candidate_id():
         NUM_DIGITS = 12
-        return u"edX%0d" % randint(1, 10**NUM_DIGITS-1) # binascii.hexlify(os.urandom(8))
+        return u"edX%0d" % randint(1, 10**NUM_DIGITS-1)
         
     @staticmethod
     def create(user):
@@ -266,7 +269,7 @@ class TestCenterUserForm(ModelForm):
     def update_and_save(self):
         new_user = self.save(commit=False)
         # create additional values here:
-        new_user.user_updated_at = datetime.now()
+        new_user.user_updated_at = datetime.utcnow()
         new_user.save()
         
     # add validation:
@@ -505,7 +508,7 @@ class TestCenterRegistrationForm(ModelForm):
     def update_and_save(self):
         registration = self.save(commit=False)
         # create additional values here:
-        registration.user_updated_at = datetime.now()
+        registration.user_updated_at = datetime.utcnow()
         registration.save()
 
     # TODO: add validation code for values added to accommodation_code field.

From 83fdab79ba89843624c9cfebf9cf9ee24bd14dda Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Thu, 10 Jan 2013 15:16:13 -0500
Subject: [PATCH 033/541] pearson_make_tc_user: add support for incremental
 changes, and changes to 'internal' fields for debugging.

---
 .../management/commands/pearson_make_tc_user.py      | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/common/djangoapps/student/management/commands/pearson_make_tc_user.py b/common/djangoapps/student/management/commands/pearson_make_tc_user.py
index 97e30002c0..f4eca62e28 100644
--- a/common/djangoapps/student/management/commands/pearson_make_tc_user.py
+++ b/common/djangoapps/student/management/commands/pearson_make_tc_user.py
@@ -102,7 +102,15 @@ class Command(BaseCommand):
             needs_updating = True
         
         if needs_updating:
-            form = TestCenterUserForm(instance=testcenter_user, data=our_options)
+            # the registration form normally populates the data dict with 
+            # all values from the testcenter_user.  But here we only want to
+            # specify those values that change, so update the dict with existing
+            # values.
+            form_options = dict(our_options)
+            for propname in TestCenterUser.user_provided_fields():
+                if propname not in form_options: 
+                    form_options[propname] = testcenter_user.__getattribute__(propname)
+            form = TestCenterUserForm(instance=testcenter_user, data=form_options)
             if form.is_valid():
                 form.update_and_save()
             else:
@@ -123,7 +131,7 @@ class Command(BaseCommand):
         testcenter_user = TestCenterUser.objects.get(user=student)
         for internal_field in [ 'upload_error_message', 'upload_status', 'client_candidate_id']:
             if internal_field in our_options:
-                testcenter_user = our_options[internal_field]
+                testcenter_user.__setattr__(internal_field, our_options[internal_field])
                 change_internal = True
                 
         if change_internal:

From a74dfdb2e7c49a4e7cbe33eca2dd8451feb7681e Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Thu, 10 Jan 2013 15:19:38 -0500
Subject: [PATCH 034/541] Remove circular dependencies that connect
 student.models and django_comment_client

---
 common/djangoapps/student/models.py            | 10 ----------
 lms/djangoapps/django_comment_client/models.py | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index 2f5bc3ac04..46e316ac0b 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -262,16 +262,6 @@ class CourseEnrollment(models.Model):
         return "[CourseEnrollment] %s: %s (%s)" % (self.user, self.course_id, self.created)
 
 
-@receiver(post_save, sender=CourseEnrollment)
-def assign_default_role(sender, instance, **kwargs):
-    if instance.user.is_staff:
-        role = Role.objects.get_or_create(course_id=instance.course_id, name="Moderator")[0]
-    else:
-        role = Role.objects.get_or_create(course_id=instance.course_id, name="Student")[0]
-
-    logging.info("assign_default_role: adding %s as %s" % (instance.user, role))
-    instance.user.roles.add(role)
-
 #cache_relation(User.profile)
 
 #### Helper methods for use from python manage.py shell.
diff --git a/lms/djangoapps/django_comment_client/models.py b/lms/djangoapps/django_comment_client/models.py
index 628ac21a4a..a6a2c23603 100644
--- a/lms/djangoapps/django_comment_client/models.py
+++ b/lms/djangoapps/django_comment_client/models.py
@@ -2,6 +2,10 @@ import logging
 
 from django.db import models
 from django.contrib.auth.models import User
+from django.dispatch import receiver
+from django.db.models.signals import post_save
+
+from student.models import CourseEnrollment
 
 from courseware.courses import get_course_by_id
 
@@ -45,3 +49,14 @@ class Permission(models.Model):
 
     def __unicode__(self):
         return self.name
+
+
+@receiver(post_save, sender=CourseEnrollment)
+def assign_default_role(sender, instance, **kwargs):
+    if instance.user.is_staff:
+        role = Role.objects.get_or_create(course_id=instance.course_id, name="Moderator")[0]
+    else:
+        role = Role.objects.get_or_create(course_id=instance.course_id, name="Student")[0]
+
+    logging.info("assign_default_role: adding %s as %s" % (instance.user, role))
+    instance.user.roles.add(role)

From 759bb137b4f3f368fa3850aaa119b7e5f0c9534b Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Thu, 10 Jan 2013 17:08:01 -0500
Subject: [PATCH 035/541] pearson registration - adjusted style for rejected
 message state on dashboard

---
 lms/static/sass/multicourse/_dashboard.scss | 13 +++++++------
 lms/templates/dashboard.html                |  3 +--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss
index a83fbc4658..c22bc14105 100644
--- a/lms/static/sass/multicourse/_dashboard.scss
+++ b/lms/static/sass/multicourse/_dashboard.scss
@@ -498,16 +498,19 @@
         }
       }
 
-      .contact-button {
-        @include button(simple, $blue);
+      .exam-button {
+        @include button(simple, $pink);
+        margin-top: 0;
+        float: right;
       }
 
-      .exam-button {
+      .contact-button {
         @include button(simple, $pink);
       }
 
       .button {
-        float: right;
+        display: inline-block;
+        margin-top: 10px;
         padding: 9px 18px 10px;
         font-size: 13px;
         font-weight: bold;
@@ -518,8 +521,6 @@
         }
       }
 
-
-
       &.is-shown {
         display: block;
       }
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index 3dc128e62c..73c7da23f9 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -243,12 +243,11 @@
                     % endif
                     % if  registration.is_rejected:	    
                 <div class="message message-status is-shown exam-schedule">
-                  <a href="mailto:exam-help@edx.org?subject=Pearson VUE Exam - ${get_course_about_section(course, 'university')} ${course.number}" class="button contact-button">Contact exam-help@edx.org</a>
                   <p class="message-copy">Your 
                     <a href="${testcenter_register_target}" id="exam_register_link">registration for the Pearson exam</a>
      has been rejected. Please check the information you provided, and try to correct any demographic errors.  Otherwise
      contact edX for further help.</p>
-                   
+                   <a href="mailto:exam-help@edx.org?subject=Pearson VUE Exam - ${get_course_about_section(course, 'university')} ${course.number}" class="button contact-button">Contact exam-help@edx.org</a>
                 </div>
                     % endif
                    	% if not registration.is_accepted and not registration.is_rejected:	    

From 7d279efd0ee2362773f3a4bf51df06383df841cc Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Thu, 10 Jan 2013 18:31:41 -0500
Subject: [PATCH 036/541] add functionality for exporting EAD files to Pearson
 (and add dump_all option to CDD-dumping).

---
 .../management/commands/pearson_export_cdd.py | 121 ++---------
 .../management/commands/pearson_export_ead.py | 193 ++++++------------
 common/djangoapps/student/models.py           |  12 ++
 3 files changed, 97 insertions(+), 229 deletions(-)

diff --git a/common/djangoapps/student/management/commands/pearson_export_cdd.py b/common/djangoapps/student/management/commands/pearson_export_cdd.py
index fec2ec9297..fedf6dfae1 100644
--- a/common/djangoapps/student/management/commands/pearson_export_cdd.py
+++ b/common/djangoapps/student/management/commands/pearson_export_cdd.py
@@ -1,15 +1,16 @@
 import csv
-import uuid
 from collections import OrderedDict
 from datetime import datetime
+from os.path import isdir
+from fs.path import pathjoin
+from optparse import make_option
 
 from django.core.management.base import BaseCommand
 
 from student.models import TestCenterUser
-from os.path import isdir
-from fs.path import pathjoin
 
 class Command(BaseCommand):
+    
     CSV_TO_MODEL_FIELDS = OrderedDict([
         # Skipping optional field CandidateID
         ("ClientCandidateID", "client_candidate_id"),
@@ -37,9 +38,17 @@ class Command(BaseCommand):
         ("LastUpdate", "user_updated_at"), # in UTC, so same as what we store
     ])
 
-    args = '<output_file>'
+    option_list = BaseCommand.option_list + (
+        make_option(
+            '--dump_all',
+            action='store_true',
+            dest='dump_all',
+        ),
+    )
+    
+    args = '<output_file_or_dir>'
     help = """
-    Export user information from TestCenterUser model into a tab delimited
+    Export user demographic information from TestCenterUser model into a tab delimited
     text file with a format that Pearson expects.
     """
     def handle(self, *args, **kwargs):
@@ -47,10 +56,6 @@ class Command(BaseCommand):
             print Command.help
             return
 
-        # use options to set these:
-        dump_all = False
-        # self.reset_sample_data()
-
         # update time should use UTC in order to be comparable to the user_updated_at 
         # field
         uploaded_at = datetime.utcnow()
@@ -71,10 +76,11 @@ class Command(BaseCommand):
         # otherwise convert unicode objects to ascii.
         def ensure_encoding(value):
             if isinstance(value, unicode):
-                return value.encode('iso-8859-1');
+                return value.encode('iso-8859-1')
             else:
-                return value;
+                return value
             
+        dump_all = kwargs['dump_all']
 
         with open(destfile, "wb") as outfile:
             writer = csv.DictWriter(outfile,
@@ -94,97 +100,4 @@ class Command(BaseCommand):
                     tcu.save()
 
 
-    def reset_sample_data(self):
-        def make_sample(**kwargs):
-            data = dict((model_field, kwargs.get(model_field, ""))
-                        for model_field in Command.CSV_TO_MODEL_FIELDS.values())
-            return TestCenterUser(**data)
-        
-        def generate_id():
-            return "edX{:012}".format(uuid.uuid4().int % (10**12))
-        
-        # TestCenterUser.objects.all().delete()
-        
-        samples = [
-            make_sample(
-                client_candidate_id=generate_id(),
-                first_name="Jack",
-                last_name="Doe",
-                middle_name="C",
-                address_1="11 Cambridge Center",
-                address_2="Suite 101",
-                city="Cambridge",
-                state="MA",
-                postal_code="02140",
-                country="USA",
-                phone="(617)555-5555",
-                phone_country_code="1",
-                user_updated_at=datetime.utcnow()
-            ),
-            make_sample(
-                client_candidate_id=generate_id(),
-                first_name="Clyde",
-                last_name="Smith",
-                middle_name="J",
-                suffix="Jr.",
-                salutation="Mr.",
-                address_1="1 Penny Lane",
-                city="Honolulu",
-                state="HI",
-                postal_code="96792",
-                country="USA",
-                phone="555-555-5555",
-                phone_country_code="1",
-                user_updated_at=datetime.utcnow()
-            ),
-            make_sample(
-                client_candidate_id=generate_id(),
-                first_name="Patty",
-                last_name="Lee",
-                salutation="Dr.",
-                address_1="P.O. Box 555",
-                city="Honolulu",
-                state="HI",
-                postal_code="96792",
-                country="USA",
-                phone="808-555-5555",
-                phone_country_code="1",
-                user_updated_at=datetime.utcnow()
-            ),
-            make_sample(
-                client_candidate_id=generate_id(),
-                first_name="Jimmy",
-                last_name="James",
-                address_1="2020 Palmer Blvd.",
-                city="Springfield",
-                state="MA",
-                postal_code="96792",
-                country="USA",
-                phone="917-555-5555",
-                phone_country_code="1",
-                extension="2039",
-                fax="917-555-5556",
-                fax_country_code="1",
-                company_name="ACME Traps",
-                user_updated_at=datetime.utcnow()
-            ),
-            make_sample(
-                client_candidate_id=generate_id(),
-                first_name="Yeong-Un",
-                last_name="Seo",
-                address_1="Duryu, Lotte 101",
-                address_2="Apt 55",
-                city="Daegu",
-                country="KOR",
-                phone="917-555-5555",
-                phone_country_code="011",
-                user_updated_at=datetime.utcnow()
-            ),
-
-        ]
-        
-        for tcu in samples:
-            tcu.save()
-        
-
         
\ No newline at end of file
diff --git a/common/djangoapps/student/management/commands/pearson_export_ead.py b/common/djangoapps/student/management/commands/pearson_export_ead.py
index 415f0812ae..3a3aa25ea8 100644
--- a/common/djangoapps/student/management/commands/pearson_export_ead.py
+++ b/common/djangoapps/student/management/commands/pearson_export_ead.py
@@ -1,150 +1,93 @@
 import csv
-import uuid
-from collections import defaultdict, OrderedDict
+from collections import OrderedDict
 from datetime import datetime
+from os.path import isdir
+from fs.path import pathjoin
+from optparse import make_option
 
-from django.core.management.base import BaseCommand, CommandError
+from django.core.management.base import BaseCommand
 
-from student.models import TestCenterUser
-
-def generate_id():
-    return "{:012}".format(uuid.uuid4().int % (10**12))
+from student.models import TestCenterRegistration
 
 class Command(BaseCommand):
-    args = '<output_file>'
+    
+    CSV_TO_MODEL_FIELDS = OrderedDict([
+        ('AuthorizationTransactionType', 'authorization_transaction_type'),
+        ('AuthorizationID', 'authorization_id'),
+        ('ClientAuthorizationID', 'client_authorization_id'),
+        ('ClientCandidateID', 'client_candidate_id'),
+        ('ExamAuthorizationCount', 'exam_authorization_count'),
+        ('ExamSeriesCode', 'exam_series_code'),
+        ('Accommodations', 'accommodation_code'),
+        ('EligibilityApptDateFirst', 'eligibility_appointment_date_first'),
+        ('EligibilityApptDateLast', 'eligibility_appointment_date_last'),
+        ("LastUpdate", "user_updated_at"), # in UTC, so same as what we store
+    ])
+
+    args = '<output_file_or_dir>'
     help = """
-    Export user information from TestCenterUser model into a tab delimited
+    Export user registration information from TestCenterRegistration model into a tab delimited
     text file with a format that Pearson expects.
     """
-    FIELDS = [
-        'AuthorizationTransactionType',
-        'AuthorizationID',
-        'ClientAuthorizationID',
-        'ClientCandidateID',
-        'ExamAuthorizationCount',
-        'ExamSeriesCode',
-        'EligibilityApptDateFirst',
-        'EligibilityApptDateLast',
-        'LastUpdate',
-    ]
+
+    option_list = BaseCommand.option_list + (
+        make_option(
+            '--dump_all',
+            action='store_true',
+            dest='dump_all',
+        ),
+        make_option(
+            '--force_add',
+            action='store_true',
+            dest='force_add',
+        ),
+    )
+    
     
     def handle(self, *args, **kwargs):
         if len(args) < 1:
             print Command.help
             return
 
-        # self.reset_sample_data()
+        # update time should use UTC in order to be comparable to the user_updated_at 
+        # field
+        uploaded_at = datetime.utcnow()
 
-        with open(args[0], "wb") as outfile:
+        # if specified destination is an existing directory, then 
+        # create a filename for it automatically.  If it doesn't exist,
+        # or exists as a file, then we will just write to it.
+        # Name will use timestamp -- this is UTC, so it will look funny,
+        # but it should at least be consistent with the other timestamps 
+        # used in the system.
+        dest = args[0]
+        if isdir(dest):
+            destfile = pathjoin(dest, uploaded_at.strftime("ead-%Y%m%d-%H%M%S.dat"))
+        else:
+            destfile = dest
+
+        dump_all = kwargs['dump_all']
+
+        with open(destfile, "wb") as outfile:
             writer = csv.DictWriter(outfile,
-                                    Command.FIELDS,
+                                    Command.CSV_TO_MODEL_FIELDS,
                                     delimiter="\t",
                                     quoting=csv.QUOTE_MINIMAL,
                                     extrasaction='ignore')
             writer.writeheader()
-            for tcu in TestCenterUser.objects.order_by('id')[:5]:
-                record = defaultdict(
-                    lambda: "",
-                    AuthorizationTransactionType="Add",
-                    ClientAuthorizationID=generate_id(),
-                    ClientCandidateID=tcu.client_candidate_id,
-                    ExamAuthorizationCount="1",
-                    ExamSeriesCode="6002x001",
-                    EligibilityApptDateFirst="2012/12/15",
-                    EligibilityApptDateLast="2012/12/30",
-                    LastUpdate=datetime.utcnow().strftime("%Y/%m/%d %H:%M:%S")
-                )
-                writer.writerow(record)
+            for tcr in TestCenterRegistration.objects.order_by('id'):
+                if dump_all or tcr.needs_uploading:
+                    record = dict((csv_field, getattr(tcr, model_field))
+                                  for csv_field, model_field
+                                  in Command.CSV_TO_MODEL_FIELDS.items())
+                    record["LastUpdate"] = record["LastUpdate"].strftime("%Y/%m/%d %H:%M:%S")
+                    if kwargs['force_add']:
+                        record['AuthorizationTransactionType'] = 'Add'
+
+                    writer.writerow(record)
+                    tcr.uploaded_at = uploaded_at
+                    tcr.save()
 
 
-    def reset_sample_data(self):
-        def make_sample(**kwargs):
-            data = dict((model_field, kwargs.get(model_field, ""))
-                        for model_field in Command.CSV_TO_MODEL_FIELDS.values())
-            return TestCenterUser(**data)
-        
-        # TestCenterUser.objects.all().delete()
-        
-        samples = [
-            make_sample(
-                client_candidate_id=generate_id(),
-                first_name="Jack",
-                last_name="Doe",
-                middle_name="C",
-                address_1="11 Cambridge Center",
-                address_2="Suite 101",
-                city="Cambridge",
-                state="MA",
-                postal_code="02140",
-                country="USA",
-                phone="(617)555-5555",
-                phone_country_code="1",
-                user_updated_at=datetime.utcnow()
-            ),
-            make_sample(
-                client_candidate_id=generate_id(),
-                first_name="Clyde",
-                last_name="Smith",
-                middle_name="J",
-                suffix="Jr.",
-                salutation="Mr.",
-                address_1="1 Penny Lane",
-                city="Honolulu",
-                state="HI",
-                postal_code="96792",
-                country="USA",
-                phone="555-555-5555",
-                phone_country_code="1",
-                user_updated_at=datetime.utcnow()
-            ),
-            make_sample(
-                client_candidate_id=generate_id(),
-                first_name="Patty",
-                last_name="Lee",
-                salutation="Dr.",
-                address_1="P.O. Box 555",
-                city="Honolulu",
-                state="HI",
-                postal_code="96792",
-                country="USA",
-                phone="808-555-5555",
-                phone_country_code="1",
-                user_updated_at=datetime.utcnow()
-            ),
-            make_sample(
-                client_candidate_id=generate_id(),
-                first_name="Jimmy",
-                last_name="James",
-                address_1="2020 Palmer Blvd.",
-                city="Springfield",
-                state="MA",
-                postal_code="96792",
-                country="USA",
-                phone="917-555-5555",
-                phone_country_code="1",
-                extension="2039",
-                fax="917-555-5556",
-                fax_country_code="1",
-                company_name="ACME Traps",
-                user_updated_at=datetime.utcnow()
-            ),
-            make_sample(
-                client_candidate_id=generate_id(),
-                first_name="Yeong-Un",
-                last_name="Seo",
-                address_1="Duryu, Lotte 101",
-                address_2="Apt 55",
-                city="Daegu",
-                country="KOR",
-                phone="917-555-5555",
-                phone_country_code="011",
-                user_updated_at=datetime.utcnow()
-            ),
-
-        ]
-        
-        for tcu in samples:
-            tcu.save()
-        
+  
 
         
\ No newline at end of file
diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index d5058ae92f..c916b31ba6 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -406,6 +406,18 @@ class TestCenterRegistration(models.Model):
     def client_candidate_id(self):
         return self.testcenter_user.client_candidate_id
 
+    @property
+    def authorization_transaction_type(self):
+        if self.uploaded_at is None:
+            return 'Add'
+        else:
+            return 'Update'
+        
+    @property
+    def exam_authorization_count(self):
+        # TODO: figure out if this should really go in the database (with a default value).
+        return 1
+    
     @staticmethod
     def create(testcenter_user, exam, accommodation_request):
         registration = TestCenterRegistration(testcenter_user = testcenter_user)

From 60f9143fa5c577a2136d7e027a252be9898dac39 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Wed, 12 Dec 2012 14:04:04 -0500
Subject: [PATCH 037/541] Minor change

---
 common/lib/xmodule/xmodule/capa_module.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py
index d65fa1f40a..08f503f127 100644
--- a/common/lib/xmodule/xmodule/capa_module.py
+++ b/common/lib/xmodule/xmodule/capa_module.py
@@ -445,6 +445,7 @@ class CapaModule(XModule):
 
         return False
 
+
     def update_score(self, get):
         """
         Delivers grading response (e.g. from asynchronous code checking) to

From 5858ec5e0d2a6d7e48ce0f2de6f87461c1c0e892 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 28 Dec 2012 10:18:21 -0500
Subject: [PATCH 038/541] Begin making integrated module

---
 .../xmodule/combined_open_ended_module.py     | 90 +++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 common/lib/xmodule/xmodule/combined_open_ended_module.py

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
new file mode 100644
index 0000000000..044026311f
--- /dev/null
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -0,0 +1,90 @@
+import copy
+from fs.errors import ResourceNotFoundError
+import itertools
+import json
+import logging
+from lxml import etree
+from lxml.html import rewrite_links
+from path import path
+import os
+import sys
+
+from pkg_resources import resource_string
+
+from .capa_module import only_one, ComplexEncoder
+from .editing_module import EditingDescriptor
+from .html_checker import check_html
+from progress import Progress
+from .stringify import stringify_children
+from .x_module import XModule
+from .xml_module import XmlDescriptor
+from xmodule.modulestore import Location
+import self_assessment_module
+
+log = logging.getLogger("mitx.courseware")
+
+# Set the default number of max attempts.  Should be 1 for production
+# Set higher for debugging/testing
+# attempts specified in xml definition overrides this.
+MAX_ATTEMPTS = 1
+
+# Set maximum available number of points.
+# Overriden by max_score specified in xml.
+MAX_SCORE = 1
+
+class CombinedOpenEndedModule(XModule):
+    pass
+
+class CombinedOpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
+    """
+    Module for adding self assessment questions to courses
+    """
+    mako_template = "widgets/html-edit.html"
+    module_class = CombinedOpenEndedModule
+    filename_extension = "xml"
+
+    stores_state = True
+    has_score = True
+    template_dir_name = "combinedopenended"
+
+    js = {'coffee': [resource_string(__name__, 'js/src/html/edit.coffee')]}
+    js_module_name = "HTMLEditingDescriptor"
+
+    @classmethod
+    def definition_from_xml(cls, xml_object, system):
+        """
+        Pull out the rubric, prompt, and submitmessage into a dictionary.
+
+        Returns:
+        {
+        'rubric': 'some-html',
+        'prompt': 'some-html',
+        'submitmessage': 'some-html'
+        'hintprompt': 'some-html'
+        }
+        """
+        expected_children = ['task']
+        for child in expected_children:
+            if len(xml_object.xpath(child)) == 0 :
+                raise ValueError("Combined Open Ended definition must include at least one '{0}' tag".format(child))
+
+        def parse(k):
+            """Assumes that xml_object has child k"""
+            return stringify_children(xml_object.xpath(k)[0])
+
+        return {'task': parse('task')}
+
+
+    def definition_to_xml(self, resource_fs):
+        '''Return an xml element representing this definition.'''
+        elt = etree.Element('selfassessment')
+
+        def add_child(k):
+            child_str = '<{tag}>{body}</{tag}>'.format(tag=k, body=self.definition[k])
+            child_node = etree.fromstring(child_str)
+            elt.append(child_node)
+
+        for child in ['task']:
+            add_child(child)
+
+        return elt
\ No newline at end of file

From e0d12bcbfe426bc34ad4992d82ab0b1939dce2cd Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 28 Dec 2012 10:21:04 -0500
Subject: [PATCH 039/541] Add in some descriptions

---
 .../xmodule/combined_open_ended_module.py     | 57 ++++++++++++++++++-
 1 file changed, 56 insertions(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 044026311f..c85552d442 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -33,7 +33,62 @@ MAX_ATTEMPTS = 1
 MAX_SCORE = 1
 
 class CombinedOpenEndedModule(XModule):
-    pass
+    STATE_VERSION = 1
+
+    # states
+    INITIAL = 'initial'
+    ASSESSING = 'assessing'
+    DONE = 'done'
+    TASK_TYPES=["self", "ml", "instructor", "peer"]
+
+    js = {'coffee': [resource_string(__name__, 'js/src/selfassessment/display.coffee')]}
+    js_module_name = "SelfAssessment"
+
+    def __init__(self, system, location, definition, descriptor,
+                 instance_state=None, shared_state=None, **kwargs):
+        XModule.__init__(self, system, location, definition, descriptor,
+            instance_state, shared_state, **kwargs)
+
+        """
+        Definition file should have multiple task blocks:
+
+        Sample file:
+
+        <combinedopenended>
+            <task type="self">
+                <selfassessment>
+                </selfassessment>
+            </task>
+        </combinedopenended>
+        """
+
+        # Load instance state
+        if instance_state is not None:
+            instance_state = json.loads(instance_state)
+        else:
+            instance_state = {}
+
+        instance_state = self.convert_state_to_current_format(instance_state)
+
+        # History is a list of tuples of (answer, score, hint), where hint may be
+        # None for any element, and score and hint can be None for the last (current)
+        # element.
+        # Scores are on scale from 0 to max_score
+        self.history = instance_state.get('history', [])
+
+        self.state = instance_state.get('state', 'initial')
+
+        self.attempts = instance_state.get('attempts', 0)
+        self.max_attempts = int(self.metadata.get('attempts', MAX_ATTEMPTS))
+
+        # Used for progress / grading.  Currently get credit just for
+        # completion (doesn't matter if you self-assessed correct/incorrect).
+        self._max_score = int(self.metadata.get('max_score', MAX_SCORE))
+
+        self.rubric = definition['rubric']
+        self.prompt = definition['prompt']
+        self.submit_message = definition['submitmessage']
+        self.hint_prompt = definition['hintprompt']
 
 class CombinedOpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
     """

From 0be51cfa2d8e70a011e852c5a5a85b018be0cc95 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 28 Dec 2012 10:52:18 -0500
Subject: [PATCH 040/541] Xmodule combined now working

---
 common/lib/xmodule/setup.py                   |  1 +
 .../xmodule/combined_open_ended_module.py     | 27 +++++++++++--------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/common/lib/xmodule/setup.py b/common/lib/xmodule/setup.py
index d3889bc388..34e4e658c9 100644
--- a/common/lib/xmodule/setup.py
+++ b/common/lib/xmodule/setup.py
@@ -19,6 +19,7 @@ setup(
             "abtest = xmodule.abtest_module:ABTestDescriptor",
             "book = xmodule.backcompat_module:TranslateCustomTagDescriptor",
             "chapter = xmodule.seq_module:SequenceDescriptor",
+            "combinedopenended = xmodule.combined_open_ended_module:CombinedOpenEndedDescriptor"
             "course = xmodule.course_module:CourseDescriptor",
             "customtag = xmodule.template_module:CustomTagDescriptor",
             "discuss = xmodule.backcompat_module:TranslateCustomTagDescriptor",
diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index c85552d442..cbbfe156c3 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -42,7 +42,7 @@ class CombinedOpenEndedModule(XModule):
     TASK_TYPES=["self", "ml", "instructor", "peer"]
 
     js = {'coffee': [resource_string(__name__, 'js/src/selfassessment/display.coffee')]}
-    js_module_name = "SelfAssessment"
+    js_module_name = "CombinedOpenEnded"
 
     def __init__(self, system, location, definition, descriptor,
                  instance_state=None, shared_state=None, **kwargs):
@@ -54,7 +54,7 @@ class CombinedOpenEndedModule(XModule):
 
         Sample file:
 
-        <combinedopenended>
+        <combinedopenended max_score="1" attempts="1">
             <task type="self">
                 <selfassessment>
                 </selfassessment>
@@ -68,15 +68,14 @@ class CombinedOpenEndedModule(XModule):
         else:
             instance_state = {}
 
-        instance_state = self.convert_state_to_current_format(instance_state)
-
         # History is a list of tuples of (answer, score, hint), where hint may be
         # None for any element, and score and hint can be None for the last (current)
         # element.
         # Scores are on scale from 0 to max_score
-        self.history = instance_state.get('history', [])
+        self.current_task = instance_state.get('current_task', 0)
 
         self.state = instance_state.get('state', 'initial')
+        self.problems = instance_state.get('problems', [])
 
         self.attempts = instance_state.get('attempts', 0)
         self.max_attempts = int(self.metadata.get('attempts', MAX_ATTEMPTS))
@@ -85,10 +84,16 @@ class CombinedOpenEndedModule(XModule):
         # completion (doesn't matter if you self-assessed correct/incorrect).
         self._max_score = int(self.metadata.get('max_score', MAX_SCORE))
 
-        self.rubric = definition['rubric']
-        self.prompt = definition['prompt']
-        self.submit_message = definition['submitmessage']
-        self.hint_prompt = definition['hintprompt']
+        self.tasks=definition['tasks']
+        log.debug(self.tasks)
+
+    def setup_next_task(self):
+        pass
+
+    def get_html(self):
+        html = "<html><head></head><body></body></html>"
+
+        return rewrite_links(html, self.rewrite_content_links)
 
 class CombinedOpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
     """
@@ -125,9 +130,9 @@ class CombinedOpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
 
         def parse(k):
             """Assumes that xml_object has child k"""
-            return stringify_children(xml_object.xpath(k)[0])
+            return [stringify_children(xml_object.xpath(k)[i]) for i in xrange(0,len(xml_object.xpath(k)))]
 
-        return {'task': parse('task')}
+        return {'tasks': parse('task')}
 
 
     def definition_to_xml(self, resource_fs):

From 867deae6e36f6bff9a4229a4d549777b52cddccf Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 28 Dec 2012 11:20:45 -0500
Subject: [PATCH 041/541] Bugfixes

---
 .../xmodule/combined_open_ended_module.py     | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index cbbfe156c3..c5714ecc84 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -38,6 +38,7 @@ class CombinedOpenEndedModule(XModule):
     # states
     INITIAL = 'initial'
     ASSESSING = 'assessing'
+    INTERMEDIATE_DONE='intermediate_done'
     DONE = 'done'
     TASK_TYPES=["self", "ml", "instructor", "peer"]
 
@@ -72,7 +73,8 @@ class CombinedOpenEndedModule(XModule):
         # None for any element, and score and hint can be None for the last (current)
         # element.
         # Scores are on scale from 0 to max_score
-        self.current_task = instance_state.get('current_task', 0)
+        self.current_task_number = instance_state.get('current_task_number', 0)
+        self.tasks = instance_state.get('tasks', [])
 
         self.state = instance_state.get('state', 'initial')
         self.problems = instance_state.get('problems', [])
@@ -84,16 +86,31 @@ class CombinedOpenEndedModule(XModule):
         # completion (doesn't matter if you self-assessed correct/incorrect).
         self._max_score = int(self.metadata.get('max_score', MAX_SCORE))
 
-        self.tasks=definition['tasks']
-        log.debug(self.tasks)
+        self.task_xml=definition['task_xml']
+        self.setup_next_task()
+
+    def get_tag_name(self, xml):
+        tag=etree.fromstring(xml).tag
+        return tag
 
     def setup_next_task(self):
-        pass
+        if self.state in [self.ASSESSING, self.DONE]:
+            self.current_task=self.tasks[len(self.tasks)-1]
+            return True
+
+        self.current_task_xml=self.task_xml[self.current_task_number]
+        current_task_type=self.get_tag_name(self.current_task_xml)
+        if current_task_type=="selfassessment":
+            self.current_task_descriptor=self_assessment_module.SelfAssessmentDescriptor(self.system)
+            self.current_task_parsed_xml=self.current_task_descriptor.definition_from_xml(self.current_task_xml,self.system)
+            self.current_task=self_assessment_module.SelfAssessmentModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor)
+        return True
 
     def get_html(self):
-        html = "<html><head></head><body></body></html>"
+        return self.current_task.get_html()
 
-        return rewrite_links(html, self.rewrite_content_links)
+    def handle_ajax(self, dispatch, get):
+        return self.current_task.handle_ajax(dispatch,get)
 
 class CombinedOpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
     """
@@ -132,7 +149,7 @@ class CombinedOpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
             """Assumes that xml_object has child k"""
             return [stringify_children(xml_object.xpath(k)[i]) for i in xrange(0,len(xml_object.xpath(k)))]
 
-        return {'tasks': parse('task')}
+        return {'task_xml': parse('task')}
 
 
     def definition_to_xml(self, resource_fs):

From 4047106e48afb8a49664e7e85d3e8c26f34b7ac7 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 28 Dec 2012 11:38:55 -0500
Subject: [PATCH 042/541] Some progress with rendering

---
 common/lib/xmodule/xmodule/combined_open_ended_module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index c5714ecc84..b8ad5fdaaa 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -102,7 +102,7 @@ class CombinedOpenEndedModule(XModule):
         current_task_type=self.get_tag_name(self.current_task_xml)
         if current_task_type=="selfassessment":
             self.current_task_descriptor=self_assessment_module.SelfAssessmentDescriptor(self.system)
-            self.current_task_parsed_xml=self.current_task_descriptor.definition_from_xml(self.current_task_xml,self.system)
+            self.current_task_parsed_xml=self.current_task_descriptor.definition_from_xml(etree.fromstring(self.current_task_xml),self.system)
             self.current_task=self_assessment_module.SelfAssessmentModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor)
         return True
 

From e975174d662bc18e86528a66afa9ad7fba1e7289 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 28 Dec 2012 11:49:33 -0500
Subject: [PATCH 043/541] Convert self-assessment away from xmodule

---
 common/lib/xmodule/setup.py                    |  1 -
 .../xmodule/combined_open_ended_module.py      |  3 ++-
 .../xmodule/xmodule/self_assessment_module.py  | 18 +++++++-----------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/common/lib/xmodule/setup.py b/common/lib/xmodule/setup.py
index 34e4e658c9..c20b50ec66 100644
--- a/common/lib/xmodule/setup.py
+++ b/common/lib/xmodule/setup.py
@@ -29,7 +29,6 @@ setup(
             "problem = xmodule.capa_module:CapaDescriptor",
             "problemset = xmodule.seq_module:SequenceDescriptor",
             "section = xmodule.backcompat_module:SemanticSectionDescriptor",
-            "selfassessment = xmodule.self_assessment_module:SelfAssessmentDescriptor",
             "sequential = xmodule.seq_module:SequenceDescriptor",
             "slides = xmodule.backcompat_module:TranslateCustomTagDescriptor",
             "vertical = xmodule.vertical_module:VerticalDescriptor",
diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index b8ad5fdaaa..b1585f9c10 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -107,7 +107,8 @@ class CombinedOpenEndedModule(XModule):
         return True
 
     def get_html(self):
-        return self.current_task.get_html()
+        html = self.current_task.get_html(self.system)
+        return rewrite_links(html, self.rewrite_content_links)
 
     def handle_ajax(self, dispatch, get):
         return self.current_task.handle_ajax(dispatch,get)
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index eb8a275d35..eef81182ea 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -38,7 +38,7 @@ MAX_ATTEMPTS = 1
 # Overriden by max_score specified in xml.
 MAX_SCORE = 1
 
-class SelfAssessmentModule(XModule):
+class SelfAssessmentModule():
     """
     States:
 
@@ -66,9 +66,6 @@ class SelfAssessmentModule(XModule):
 
     def __init__(self, system, location, definition, descriptor,
                  instance_state=None, shared_state=None, **kwargs):
-        XModule.__init__(self, system, location, definition, descriptor,
-            instance_state, shared_state, **kwargs)
-
         """
         Definition file should have 4 blocks -- prompt, rubric, submitmessage, hintprompt,
         and two optional attributes:
@@ -116,11 +113,11 @@ class SelfAssessmentModule(XModule):
         self.state = instance_state.get('state', 'initial')
 
         self.attempts = instance_state.get('attempts', 0)
-        self.max_attempts = int(self.metadata.get('attempts', MAX_ATTEMPTS))
+        self.max_attempts = int(instance_state.get('attempts', MAX_ATTEMPTS))
 
         # Used for progress / grading.  Currently get credit just for
         # completion (doesn't matter if you self-assessed correct/incorrect).
-        self._max_score = int(self.metadata.get('max_score', MAX_SCORE))
+        self._max_score = int(instance_state.get('max_score', MAX_SCORE))
 
         self.rubric = definition['rubric']
         self.prompt = definition['prompt']
@@ -224,7 +221,7 @@ class SelfAssessmentModule(XModule):
         """Can the module be reset?"""
         return self.state == self.DONE and self.attempts < self.max_attempts
 
-    def get_html(self):
+    def get_html(self, system):
         #set context variables and render template
         if self.state != self.INITIAL:
             latest = self.latest_answer()
@@ -235,17 +232,16 @@ class SelfAssessmentModule(XModule):
         context = {
             'prompt': self.prompt,
             'previous_answer': previous_answer,
-            'ajax_url': self.system.ajax_url,
+            'ajax_url': system.ajax_url,
             'initial_rubric': self.get_rubric_html(),
             'initial_hint': self.get_hint_html(),
             'initial_message': self.get_message_html(),
             'state': self.state,
             'allow_reset': self._allow_reset(),
         }
-        html = self.system.render_template('self_assessment_prompt.html', context)
 
-        # cdodge: perform link substitutions for any references to course static content (e.g. images)
-        return rewrite_links(html, self.rewrite_content_links)
+        html = system.render_template('self_assessment_prompt.html', context)
+        return html
 
     def max_score(self):
         """

From cd764d3d7c6c2bbf209254427469ecfe9bc3632c Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 28 Dec 2012 11:55:12 -0500
Subject: [PATCH 044/541] Modify self-assessment to not be an xmodule

---
 .../xmodule/combined_open_ended_module.py     |  4 +--
 .../xmodule/xmodule/self_assessment_module.py | 27 +++++++++----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index b1585f9c10..6e3fdc1ddd 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -43,7 +43,7 @@ class CombinedOpenEndedModule(XModule):
     TASK_TYPES=["self", "ml", "instructor", "peer"]
 
     js = {'coffee': [resource_string(__name__, 'js/src/selfassessment/display.coffee')]}
-    js_module_name = "CombinedOpenEnded"
+    js_module_name = "SelfAssessment"
 
     def __init__(self, system, location, definition, descriptor,
                  instance_state=None, shared_state=None, **kwargs):
@@ -111,7 +111,7 @@ class CombinedOpenEndedModule(XModule):
         return rewrite_links(html, self.rewrite_content_links)
 
     def handle_ajax(self, dispatch, get):
-        return self.current_task.handle_ajax(dispatch,get)
+        return self.current_task.handle_ajax(dispatch,get, self.system)
 
 class CombinedOpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
     """
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index eef81182ea..150ad571b7 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -233,8 +233,8 @@ class SelfAssessmentModule():
             'prompt': self.prompt,
             'previous_answer': previous_answer,
             'ajax_url': system.ajax_url,
-            'initial_rubric': self.get_rubric_html(),
-            'initial_hint': self.get_hint_html(),
+            'initial_rubric': self.get_rubric_html(system),
+            'initial_hint': self.get_hint_html(system),
             'initial_message': self.get_message_html(),
             'state': self.state,
             'allow_reset': self._allow_reset(),
@@ -270,7 +270,7 @@ class SelfAssessmentModule():
         return None
 
 
-    def handle_ajax(self, dispatch, get):
+    def handle_ajax(self, dispatch, get, system):
         """
         This is called by courseware.module_render, to handle an AJAX call.
         "get" is request.POST.
@@ -292,7 +292,7 @@ class SelfAssessmentModule():
             return 'Error'
 
         before = self.get_progress()
-        d = handlers[dispatch](get)
+        d = handlers[dispatch](get, system)
         after = self.get_progress()
         d.update({
             'progress_changed': after != before,
@@ -309,7 +309,7 @@ class SelfAssessmentModule():
         return {'success': False,
                 'error': 'The problem state got out-of-sync'}
 
-    def get_rubric_html(self):
+    def get_rubric_html(self,system):
         """
         Return the appropriate version of the rubric, based on the state.
         """
@@ -328,9 +328,9 @@ class SelfAssessmentModule():
         else:
             raise ValueError("Illegal state '%r'" % self.state)
 
-        return self.system.render_template('self_assessment_rubric.html', context)
+        return system.render_template('self_assessment_rubric.html', context)
 
-    def get_hint_html(self):
+    def get_hint_html(self,system):
         """
         Return the appropriate version of the hint view, based on state.
         """
@@ -354,7 +354,7 @@ class SelfAssessmentModule():
         else:
             raise ValueError("Illegal state '%r'" % self.state)
 
-        return self.system.render_template('self_assessment_hint.html', context)
+        return system.render_template('self_assessment_hint.html', context)
 
     def get_message_html(self):
         """
@@ -366,7 +366,7 @@ class SelfAssessmentModule():
         return """<div class="save_message">{0}</div>""".format(self.submit_message)
 
 
-    def save_answer(self, get):
+    def save_answer(self, get, system):
         """
         After the answer is submitted, show the rubric.
 
@@ -397,10 +397,10 @@ class SelfAssessmentModule():
 
         return {
             'success': True,
-            'rubric_html': self.get_rubric_html()
+            'rubric_html': self.get_rubric_html(system)
             }
 
-    def save_assessment(self, get):
+    def save_assessment(self, get, system):
         """
         Save the assessment.  If the student said they're right, don't ask for a
         hint, and go straight to the done state.  Otherwise, do ask for a hint.
@@ -433,13 +433,13 @@ class SelfAssessmentModule():
             d['allow_reset'] = self._allow_reset()
         else:
             self.change_state(self.REQUEST_HINT)
-            d['hint_html'] = self.get_hint_html()
+            d['hint_html'] = self.get_hint_html(system)
 
         d['state'] = self.state
         return d
 
 
-    def save_hint(self, get):
+    def save_hint(self, get, system):
         '''
         Save the hint.
         Returns a dict { 'success': bool,
@@ -465,7 +465,6 @@ class SelfAssessmentModule():
                 'history': self.history,
                 }
             }
-        self.system.track_function('save_hint', event_info)
 
         return {'success': True,
                 'message_html': self.get_message_html(),

From 517c79e00a1110df073d4dbb60c5167d3f7b9edc Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 28 Dec 2012 12:25:10 -0500
Subject: [PATCH 045/541] Fixing state tracking

---
 .../xmodule/combined_open_ended_module.py     | 40 +++++++++++++++----
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 6e3fdc1ddd..67ba54fcc5 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -74,10 +74,9 @@ class CombinedOpenEndedModule(XModule):
         # element.
         # Scores are on scale from 0 to max_score
         self.current_task_number = instance_state.get('current_task_number', 0)
-        self.tasks = instance_state.get('tasks', [])
+        self.task_states= instance_state.get('task_states', [])
 
         self.state = instance_state.get('state', 'initial')
-        self.problems = instance_state.get('problems', [])
 
         self.attempts = instance_state.get('attempts', 0)
         self.max_attempts = int(self.metadata.get('attempts', MAX_ATTEMPTS))
@@ -94,24 +93,51 @@ class CombinedOpenEndedModule(XModule):
         return tag
 
     def setup_next_task(self):
+        current_task_state=None
         if self.state in [self.ASSESSING, self.DONE]:
-            self.current_task=self.tasks[len(self.tasks)-1]
-            return True
+            current_task_state=self.task_states[len(self.task_states)-1]
+
+        log.debug(self.task_states)
 
         self.current_task_xml=self.task_xml[self.current_task_number]
         current_task_type=self.get_tag_name(self.current_task_xml)
         if current_task_type=="selfassessment":
             self.current_task_descriptor=self_assessment_module.SelfAssessmentDescriptor(self.system)
             self.current_task_parsed_xml=self.current_task_descriptor.definition_from_xml(etree.fromstring(self.current_task_xml),self.system)
-            self.current_task=self_assessment_module.SelfAssessmentModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor)
+            if current_task_state is None:
+                self.current_task=self_assessment_module.SelfAssessmentModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor)
+                self.task_states.append(self.current_task.get_instance_state())
+                self.state=self.ASSESSING
+            else:
+                self.current_task=self_assessment_module.SelfAssessmentModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
+
         return True
 
     def get_html(self):
         html = self.current_task.get_html(self.system)
-        return rewrite_links(html, self.rewrite_content_links)
+        return_html = rewrite_links(html, self.rewrite_content_links)
+        self.task_states[len(self.task_states)-1] = self.current_task.get_instance_state()
+        return return_html
 
     def handle_ajax(self, dispatch, get):
-        return self.current_task.handle_ajax(dispatch,get, self.system)
+        return_html = self.current_task.handle_ajax(dispatch,get, self.system)
+        self.task_states[len(self.task_states)-1] = self.current_task.get_instance_state()
+        return return_html
+
+    def get_instance_state(self):
+        """
+        Get the current score and state
+        """
+
+        state = {
+            'version': self.STATE_VERSION,
+            'current_task_number': self.current_task_number,
+            'state': self.state,
+            'task_states': self.task_states,
+            'attempts': self.attempts,
+            }
+
+        return json.dumps(state)
 
 class CombinedOpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
     """

From b009d15dcc7e4f816348fde52fbba2238fbf534e Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 28 Dec 2012 12:28:31 -0500
Subject: [PATCH 046/541] Self assessment wrapped into another module now works

---
 common/lib/xmodule/xmodule/self_assessment_module.py | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index 150ad571b7..0c37384c16 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -457,21 +457,12 @@ class SelfAssessmentModule():
         self.record_latest_hint(get['hint'])
         self.change_state(self.DONE)
 
-        # To the tracking logs!
-        event_info = {
-            'selfassessment_id': self.location.url(),
-            'state': {
-                'version': self.STATE_VERSION,
-                'history': self.history,
-                }
-            }
-
         return {'success': True,
                 'message_html': self.get_message_html(),
                 'allow_reset': self._allow_reset()}
 
 
-    def reset(self, get):
+    def reset(self, get, system):
         """
         If resetting is allowed, reset the state.
 

From 2bbbe12ae8d58f6c3a476b4af5deefc44fca2a5d Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Wed, 2 Jan 2013 13:13:05 -0500
Subject: [PATCH 047/541] Refactor instance state saving

---
 common/lib/xmodule/xmodule/combined_open_ended_module.py | 7 +++++--
 common/lib/xmodule/xmodule/open_ended_module.py          | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 common/lib/xmodule/xmodule/open_ended_module.py

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 67ba54fcc5..aa759ea7dc 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -116,12 +116,15 @@ class CombinedOpenEndedModule(XModule):
     def get_html(self):
         html = self.current_task.get_html(self.system)
         return_html = rewrite_links(html, self.rewrite_content_links)
-        self.task_states[len(self.task_states)-1] = self.current_task.get_instance_state()
+        self.update_task_states()
         return return_html
 
+    def update_task_states(self):
+        self.task_states[len(self.task_states)-1] = self.current_task.get_instance_state()
+
     def handle_ajax(self, dispatch, get):
         return_html = self.current_task.handle_ajax(dispatch,get, self.system)
-        self.task_states[len(self.task_states)-1] = self.current_task.get_instance_state()
+        self.update_task_states()
         return return_html
 
     def get_instance_state(self):
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -0,0 +1 @@
+

From ae0623ab9ba08c7a28f51056fbe14fd917522291 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Wed, 2 Jan 2013 13:18:30 -0500
Subject: [PATCH 048/541] Working on transitions between states

---
 .../lib/xmodule/xmodule/combined_open_ended_module.py  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index aa759ea7dc..04f848f306 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -121,6 +121,16 @@ class CombinedOpenEndedModule(XModule):
 
     def update_task_states(self):
         self.task_states[len(self.task_states)-1] = self.current_task.get_instance_state()
+        current_task_state=json.loads(self.task_states[len(self.task_states)-1])
+        if current_task_state['state']==self.DONE:
+            self.current_task_number+=1
+            if self.current_task_number==len(self.task_xml):
+                self.state=self.DONE
+                self.current_task_number=self.current_task_number-1
+            else:
+                self.state=self.INTERMEDIATE_DONE
+            self.setup_next_task()
+
 
     def handle_ajax(self, dispatch, get):
         return_html = self.current_task.handle_ajax(dispatch,get, self.system)

From 4ea9c738a352d7701d717545412d7c8de1312065 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Thu, 3 Jan 2013 14:24:23 -0500
Subject: [PATCH 049/541] Fix state transitions

---
 .../xmodule/xmodule/combined_open_ended_module.py   | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 04f848f306..50d1a7df0c 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -114,12 +114,13 @@ class CombinedOpenEndedModule(XModule):
         return True
 
     def get_html(self):
+        self.update_task_states()
         html = self.current_task.get_html(self.system)
         return_html = rewrite_links(html, self.rewrite_content_links)
-        self.update_task_states()
         return return_html
 
     def update_task_states(self):
+        changed=False
         self.task_states[len(self.task_states)-1] = self.current_task.get_instance_state()
         current_task_state=json.loads(self.task_states[len(self.task_states)-1])
         if current_task_state['state']==self.DONE:
@@ -129,13 +130,19 @@ class CombinedOpenEndedModule(XModule):
                 self.current_task_number=self.current_task_number-1
             else:
                 self.state=self.INTERMEDIATE_DONE
+            changed=True
             self.setup_next_task()
+        return changed
 
+    def update_task_states_ajax(self,return_html):
+        changed=self.update_task_states()
+        if changed():
+            return_html=self.get_html()
+        return return_html
 
     def handle_ajax(self, dispatch, get):
         return_html = self.current_task.handle_ajax(dispatch,get, self.system)
-        self.update_task_states()
-        return return_html
+        return self.update_task_states_ajax(return_html)
 
     def get_instance_state(self):
         """

From bc6838f8dac0cf628095065920c625205bbba3b7 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Thu, 3 Jan 2013 16:25:39 -0500
Subject: [PATCH 050/541] Minor changes

---
 .../xmodule/combined_open_ended_module.py     | 30 +++++++++++++++++--
 .../js/src/combinedopenended/display.coffee   |  0
 .../xmodule/js/src/openended/display.coffee   |  0
 .../js/src/selfassessment/display.coffee      |  2 --
 lms/templates/self_assessment_prompt.html     |  1 -
 5 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
 create mode 100644 common/lib/xmodule/xmodule/js/src/openended/display.coffee

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 50d1a7df0c..a314c89f01 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -42,7 +42,7 @@ class CombinedOpenEndedModule(XModule):
     DONE = 'done'
     TASK_TYPES=["self", "ml", "instructor", "peer"]
 
-    js = {'coffee': [resource_string(__name__, 'js/src/selfassessment/display.coffee')]}
+    js = {'coffee': [resource_string(__name__, 'js/src/selfassessment/display.coffee'), resource_string(__name__, 'js/src/combinedopenended/display.coffee'), resource_string(__name__, 'js/src/openended/display.coffee')]}
     js_module_name = "SelfAssessment"
 
     def __init__(self, system, location, definition, descriptor,
@@ -92,6 +92,7 @@ class CombinedOpenEndedModule(XModule):
         tag=etree.fromstring(xml).tag
         return tag
 
+
     def setup_next_task(self):
         current_task_state=None
         if self.state in [self.ASSESSING, self.DONE]:
@@ -104,10 +105,18 @@ class CombinedOpenEndedModule(XModule):
         if current_task_type=="selfassessment":
             self.current_task_descriptor=self_assessment_module.SelfAssessmentDescriptor(self.system)
             self.current_task_parsed_xml=self.current_task_descriptor.definition_from_xml(etree.fromstring(self.current_task_xml),self.system)
-            if current_task_state is None:
+            if current_task_state is None and self.current_task_number==0:
                 self.current_task=self_assessment_module.SelfAssessmentModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor)
                 self.task_states.append(self.current_task.get_instance_state())
                 self.state=self.ASSESSING
+            elif current_task_state is None and self.current_task_number>0:
+                last_response=self.get_last_response(self.current_task_number-1)
+                current_task_state = ('{"state": "assessing", "version": 1, "max_score": {max_score}, '
+                                      '"attempts": 0, "history": [{"answer": "{answer}"}]}'
+                                      .format(max_score=self._max_score, answer=last_response))
+                self.current_task=self_assessment_module.SelfAssessmentModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
+                self.task_states.append(self.current_task.get_instance_state())
+                self.state=self.ASSESSING
             else:
                 self.current_task=self_assessment_module.SelfAssessmentModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
 
@@ -119,6 +128,21 @@ class CombinedOpenEndedModule(XModule):
         return_html = rewrite_links(html, self.rewrite_content_links)
         return return_html
 
+    def get_last_response(self, task_number):
+        last_response=""
+        task_state = self.task_states[task_number]
+        task_xml=self.task_xml[task_number]
+        task_type=self.get_tag_name(task_xml)
+
+        if task_type=="selfassessment":
+            task_descriptor=self_assessment_module.SelfAssessmentDescriptor(self.system)
+            task_parsed_xml=task_descriptor.definition_from_xml(etree.fromstring(task_xml),self.system)
+            task=self_assessment_module.SelfAssessmentModule(self.system, self.location, task_parsed_xml, task_descriptor, instance_state=task_state)
+            last_response=task.latest_answer()
+            last_score = task.latest_score()
+
+        return last_response, last_score
+
     def update_task_states(self):
         changed=False
         self.task_states[len(self.task_states)-1] = self.current_task.get_instance_state()
@@ -136,7 +160,7 @@ class CombinedOpenEndedModule(XModule):
 
     def update_task_states_ajax(self,return_html):
         changed=self.update_task_states()
-        if changed():
+        if changed:
             return_html=self.get_html()
         return return_html
 
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/common/lib/xmodule/xmodule/js/src/openended/display.coffee b/common/lib/xmodule/xmodule/js/src/openended/display.coffee
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee b/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee
index 5b70ab29aa..4bf9cc8180 100644
--- a/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee
@@ -15,8 +15,6 @@ class @SelfAssessment
     @hint_wrapper = @$('.hint-wrapper')
     @message_wrapper = @$('.message-wrapper')
     @submit_button = @$('.submit-button')
-    @reset_button = @$('.reset-button')
-    @reset_button.click @reset
 
     @find_assessment_elements()
     @find_hint_elements()
diff --git a/lms/templates/self_assessment_prompt.html b/lms/templates/self_assessment_prompt.html
index 91472cbdaf..e54864c988 100644
--- a/lms/templates/self_assessment_prompt.html
+++ b/lms/templates/self_assessment_prompt.html
@@ -16,5 +16,4 @@
     <div class="message-wrapper">${initial_message}</div>
     
     <input type="button" value="Submit" class="submit-button" name="show"/>
-    <input type="button" value="Reset" class="reset-button" name="reset"/>
 </section>

From cac5b75cf4b6e570b9d94ba20480bb494a9b5d31 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Thu, 3 Jan 2013 16:36:18 -0500
Subject: [PATCH 051/541] Change modules

---
 common/lib/xmodule/xmodule/combined_open_ended_module.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index a314c89f01..46f912a8de 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -42,7 +42,8 @@ class CombinedOpenEndedModule(XModule):
     DONE = 'done'
     TASK_TYPES=["self", "ml", "instructor", "peer"]
 
-    js = {'coffee': [resource_string(__name__, 'js/src/selfassessment/display.coffee'), resource_string(__name__, 'js/src/combinedopenended/display.coffee'), resource_string(__name__, 'js/src/openended/display.coffee')]}
+    #, resource_string(__name__, 'js/src/combinedopenended/display.coffee'), resource_string(__name__, 'js/src/openended/display.coffee')
+    js = {'coffee': [resource_string(__name__, 'js/src/selfassessment/display.coffee')]}
     js_module_name = "SelfAssessment"
 
     def __init__(self, system, location, definition, descriptor,

From 8e03c8f6557c2c50db18743dc82b5986c47ce396 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Thu, 3 Jan 2013 16:50:47 -0500
Subject: [PATCH 052/541] Fix missing comma issue

---
 common/lib/xmodule/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/setup.py b/common/lib/xmodule/setup.py
index c20b50ec66..c867fca228 100644
--- a/common/lib/xmodule/setup.py
+++ b/common/lib/xmodule/setup.py
@@ -19,7 +19,7 @@ setup(
             "abtest = xmodule.abtest_module:ABTestDescriptor",
             "book = xmodule.backcompat_module:TranslateCustomTagDescriptor",
             "chapter = xmodule.seq_module:SequenceDescriptor",
-            "combinedopenended = xmodule.combined_open_ended_module:CombinedOpenEndedDescriptor"
+            "combinedopenended = xmodule.combined_open_ended_module:CombinedOpenEndedDescriptor",
             "course = xmodule.course_module:CourseDescriptor",
             "customtag = xmodule.template_module:CustomTagDescriptor",
             "discuss = xmodule.backcompat_module:TranslateCustomTagDescriptor",

From 8ca12ce50023cf1f1525b100465cf43fcfdb59d8 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Thu, 3 Jan 2013 17:12:58 -0500
Subject: [PATCH 053/541] Make combined open ended a container

---
 .../xmodule/combined_open_ended_module.py     | 14 +++++++++++
 .../combinedopenended.coffee                  | 23 +++++++++++++++++++
 .../js/src/combinedopenended/display.coffee   |  0
 .../xmodule/js/src/openended/display.coffee   |  0
 .../lib/xmodule/xmodule/open_ended_module.py  |  1 -
 lms/templates/combined_open_ended.html        |  9 ++++++++
 6 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 common/lib/xmodule/xmodule/js/src/combinedopenended/combinedopenended.coffee
 delete mode 100644 common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
 delete mode 100644 common/lib/xmodule/xmodule/js/src/openended/display.coffee
 delete mode 100644 common/lib/xmodule/xmodule/open_ended_module.py
 create mode 100644 lms/templates/combined_open_ended.html

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 46f912a8de..5eec8f34fd 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -124,6 +124,20 @@ class CombinedOpenEndedModule(XModule):
         return True
 
     def get_html(self):
+        task_html=self.get_html_base()
+        #set context variables and render template
+
+        context = {
+            'items': [{'content' : task_html}],
+            'ajax_url': self.system.ajax_url,
+            'allow_reset': True,
+            }
+
+        html = system.render_template('combined_open_ended.html', context)
+        return html
+
+
+    def get_html_base(self):
         self.update_task_states()
         html = self.current_task.get_html(self.system)
         return_html = rewrite_links(html, self.rewrite_content_links)
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/combinedopenended.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/combinedopenended.coffee
new file mode 100644
index 0000000000..6e286544a5
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/combinedopenended.coffee
@@ -0,0 +1,23 @@
+class @CombinedOpenEnded
+  constructor: (element) ->
+    @el = $(element).find('section.combined-open-ended')
+    @ajax_url = @el.data('ajax-url')
+    @reset_button = @$('.reset-button')
+    @reset_button.click @reset
+
+  reset: (event) =>
+  event.preventDefault()
+  if @state == 'done'
+    $.postWithPrefix "#{@ajax_url}/reset", {}, (response) =>
+      if response.success
+        @answer_area.val('')
+        @rubric_wrapper.html('')
+        @hint_wrapper.html('')
+        @message_wrapper.html('')
+        @state = 'initial'
+        @rebind()
+        @reset_button.hide()
+      else
+        @errors_area.html(response.error)
+  else
+    @errors_area.html('Problem state got out of sync.  Try reloading the page.')
\ No newline at end of file
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/common/lib/xmodule/xmodule/js/src/openended/display.coffee b/common/lib/xmodule/xmodule/js/src/openended/display.coffee
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
deleted file mode 100644
index 8b13789179..0000000000
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/lms/templates/combined_open_ended.html b/lms/templates/combined_open_ended.html
new file mode 100644
index 0000000000..3d4a69e0be
--- /dev/null
+++ b/lms/templates/combined_open_ended.html
@@ -0,0 +1,9 @@
+<div id="combined-open-ended" class="combined-open-ended" data-ajax-url="${ajax_url}" data-allow_reset="${allow_reset}">
+
+    % for item in items:
+    <div class="item">${item['content'] | h}</div>
+    % endfor
+
+    <input type="button" value="Reset" class="reset-button" name="reset"/>
+</div>
+

From dc0a798941553082fc3c311b6793f2598f5b089e Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Thu, 3 Jan 2013 17:19:13 -0500
Subject: [PATCH 054/541] Javascript fixes to remove reset button from self
 assessment

---
 common/lib/xmodule/xmodule/combined_open_ended_module.py    | 6 +++---
 .../{combinedopenended.coffee => display.coffee}            | 0
 .../xmodule/xmodule/js/src/selfassessment/display.coffee    | 5 -----
 lms/templates/combined_open_ended.html                      | 2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)
 rename common/lib/xmodule/xmodule/js/src/combinedopenended/{combinedopenended.coffee => display.coffee} (100%)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 5eec8f34fd..82086d6b54 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -42,8 +42,8 @@ class CombinedOpenEndedModule(XModule):
     DONE = 'done'
     TASK_TYPES=["self", "ml", "instructor", "peer"]
 
-    #, resource_string(__name__, 'js/src/combinedopenended/display.coffee'), resource_string(__name__, 'js/src/openended/display.coffee')
-    js = {'coffee': [resource_string(__name__, 'js/src/selfassessment/display.coffee')]}
+    #,  resource_string(__name__, 'js/src/openended/display.coffee')
+    js = {'coffee': [resource_string(__name__, 'js/src/selfassessment/display.coffee'), resource_string(__name__, 'js/src/combinedopenended/display.coffee')]}
     js_module_name = "SelfAssessment"
 
     def __init__(self, system, location, definition, descriptor,
@@ -133,7 +133,7 @@ class CombinedOpenEndedModule(XModule):
             'allow_reset': True,
             }
 
-        html = system.render_template('combined_open_ended.html', context)
+        html = self.system.render_template('combined_open_ended.html', context)
         return html
 
 
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/combinedopenended.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
similarity index 100%
rename from common/lib/xmodule/xmodule/js/src/combinedopenended/combinedopenended.coffee
rename to common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
diff --git a/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee b/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee
index 4bf9cc8180..ea1f02c101 100644
--- a/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee
@@ -29,7 +29,6 @@ class @SelfAssessment
     # rebind to the appropriate function for the current state
     @submit_button.unbind('click')
     @submit_button.show()
-    @reset_button.hide()
     @hint_area.attr('disabled', false)
     if @state == 'initial'
       @answer_area.attr("disabled", false)
@@ -47,10 +46,6 @@ class @SelfAssessment
       @answer_area.attr("disabled", true)
       @hint_area.attr('disabled', true)
       @submit_button.hide()
-      if @allow_reset
-        @reset_button.show()
-      else
-        @reset_button.hide()
 
 
   find_assessment_elements: ->
diff --git a/lms/templates/combined_open_ended.html b/lms/templates/combined_open_ended.html
index 3d4a69e0be..76c28b0e31 100644
--- a/lms/templates/combined_open_ended.html
+++ b/lms/templates/combined_open_ended.html
@@ -1,7 +1,7 @@
 <div id="combined-open-ended" class="combined-open-ended" data-ajax-url="${ajax_url}" data-allow_reset="${allow_reset}">
 
     % for item in items:
-    <div class="item">${item['content'] | h}</div>
+    <div class="item">${item['content'] | n}</div>
     % endfor
 
     <input type="button" value="Reset" class="reset-button" name="reset"/>

From 36c55d347bbc917f2ce787a9a541becb212fbb81 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Thu, 3 Jan 2013 17:27:15 -0500
Subject: [PATCH 055/541] Combined JS

---
 .../xmodule/combined_open_ended_module.py     |   4 +-
 .../js/src/combinedopenended/display.coffee   | 137 ++++++++++++++++--
 .../js/src/selfassessment/display.coffee      | 123 ----------------
 3 files changed, 123 insertions(+), 141 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 82086d6b54..e77cd254e2 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -43,8 +43,8 @@ class CombinedOpenEndedModule(XModule):
     TASK_TYPES=["self", "ml", "instructor", "peer"]
 
     #,  resource_string(__name__, 'js/src/openended/display.coffee')
-    js = {'coffee': [resource_string(__name__, 'js/src/selfassessment/display.coffee'), resource_string(__name__, 'js/src/combinedopenended/display.coffee')]}
-    js_module_name = "SelfAssessment"
+    js = {'coffee': [resource_string(__name__, 'js/src/combinedopenended/display.coffee')]}
+    js_module_name = "CombinedOpenEnded"
 
     def __init__(self, system, location, definition, descriptor,
                  instance_state=None, shared_state=None, **kwargs):
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 6e286544a5..897d5f1b67 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -1,23 +1,128 @@
 class @CombinedOpenEnded
   constructor: (element) ->
-    @el = $(element).find('section.combined-open-ended')
+    @el = $(element).find('section.self-assessment')
+    @id = @el.data('id')
     @ajax_url = @el.data('ajax-url')
+    @state = @el.data('state')
+    @allow_reset = @el.data('allow_reset')
+    # valid states: 'initial', 'assessing', 'request_hint', 'done'
+
+    # Where to put the rubric once we load it
+    @errors_area = @$('.error')
+    @answer_area = @$('textarea.answer')
+
+    @rubric_wrapper = @$('.rubric-wrapper')
+    @hint_wrapper = @$('.hint-wrapper')
+    @message_wrapper = @$('.message-wrapper')
+    @submit_button = @$('.submit-button')
+
     @reset_button = @$('.reset-button')
     @reset_button.click @reset
 
+    @find_assessment_elements()
+    @find_hint_elements()
+
+    @rebind()
+
+  # locally scoped jquery.
+  $: (selector) ->
+    $(selector, @el)
+
+  rebind: () =>
+    # rebind to the appropriate function for the current state
+    @submit_button.unbind('click')
+    @submit_button.show()
+    @hint_area.attr('disabled', false)
+    if @state == 'initial'
+      @answer_area.attr("disabled", false)
+      @submit_button.prop('value', 'Submit')
+      @submit_button.click @save_answer
+    else if @state == 'assessing'
+      @answer_area.attr("disabled", true)
+      @submit_button.prop('value', 'Submit assessment')
+      @submit_button.click @save_assessment
+    else if @state == 'request_hint'
+      @answer_area.attr("disabled", true)
+      @submit_button.prop('value', 'Submit hint')
+      @submit_button.click @save_hint
+    else if @state == 'done'
+      @answer_area.attr("disabled", true)
+      @hint_area.attr('disabled', true)
+      @submit_button.hide()
+
+  find_assessment_elements: ->
+    @assessment = @$('select.assessment')
+
+  find_hint_elements: ->
+    @hint_area = @$('textarea.hint')
+
+  save_answer: (event) =>
+    event.preventDefault()
+    if @state == 'initial'
+      data = {'student_answer' : @answer_area.val()}
+      $.postWithPrefix "#{@ajax_url}/save_answer", data, (response) =>
+        if response.success
+          @rubric_wrapper.html(response.rubric_html)
+          @state = 'assessing'
+          @find_assessment_elements()
+          @rebind()
+        else
+          @errors_area.html(response.error)
+    else
+      @errors_area.html('Problem state got out of sync.  Try reloading the page.')
+
+  save_assessment: (event) =>
+    event.preventDefault()
+    if @state == 'assessing'
+      data = {'assessment' : @assessment.find(':selected').text()}
+      $.postWithPrefix "#{@ajax_url}/save_assessment", data, (response) =>
+        if response.success
+          @state = response.state
+
+          if @state == 'request_hint'
+            @hint_wrapper.html(response.hint_html)
+            @find_hint_elements()
+          else if @state == 'done'
+            @message_wrapper.html(response.message_html)
+            @allow_reset = response.allow_reset
+
+          @rebind()
+        else
+          @errors_area.html(response.error)
+    else
+      @errors_area.html('Problem state got out of sync.  Try reloading the page.')
+
+
+  save_hint:  (event) =>
+    event.preventDefault()
+    if @state == 'request_hint'
+      data = {'hint' : @hint_area.val()}
+
+      $.postWithPrefix "#{@ajax_url}/save_hint", data, (response) =>
+        if response.success
+          @message_wrapper.html(response.message_html)
+          @state = 'done'
+          @allow_reset = response.allow_reset
+          @rebind()
+        else
+          @errors_area.html(response.error)
+    else
+      @errors_area.html('Problem state got out of sync.  Try reloading the page.')
+
+
   reset: (event) =>
-  event.preventDefault()
-  if @state == 'done'
-    $.postWithPrefix "#{@ajax_url}/reset", {}, (response) =>
-      if response.success
-        @answer_area.val('')
-        @rubric_wrapper.html('')
-        @hint_wrapper.html('')
-        @message_wrapper.html('')
-        @state = 'initial'
-        @rebind()
-        @reset_button.hide()
-      else
-        @errors_area.html(response.error)
-  else
-    @errors_area.html('Problem state got out of sync.  Try reloading the page.')
\ No newline at end of file
+    event.preventDefault()
+    if @state == 'done'
+      $.postWithPrefix "#{@ajax_url}/reset", {}, (response) =>
+        if response.success
+          @answer_area.val('')
+          @rubric_wrapper.html('')
+          @hint_wrapper.html('')
+          @message_wrapper.html('')
+          @state = 'initial'
+          @rebind()
+          @reset_button.hide()
+        else
+          @errors_area.html(response.error)
+    else
+      @errors_area.html('Problem state got out of sync.  Try reloading the page.')
\ No newline at end of file
diff --git a/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee b/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee
index ea1f02c101..30024478b1 100644
--- a/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee
@@ -1,126 +1,3 @@
 class @SelfAssessment
   constructor: (element) ->
-    @el = $(element).find('section.self-assessment')
-    @id = @el.data('id')
-    @ajax_url = @el.data('ajax-url')
-    @state = @el.data('state')
-    @allow_reset = @el.data('allow_reset')
-    # valid states: 'initial', 'assessing', 'request_hint', 'done'
 
-    # Where to put the rubric once we load it
-    @errors_area = @$('.error')
-    @answer_area = @$('textarea.answer')
-
-    @rubric_wrapper = @$('.rubric-wrapper')
-    @hint_wrapper = @$('.hint-wrapper')
-    @message_wrapper = @$('.message-wrapper')
-    @submit_button = @$('.submit-button')
-
-    @find_assessment_elements()
-    @find_hint_elements()
-
-    @rebind()
-
-  # locally scoped jquery.
-  $: (selector) ->
-    $(selector, @el)
-
-  rebind: () =>
-    # rebind to the appropriate function for the current state
-    @submit_button.unbind('click')
-    @submit_button.show()
-    @hint_area.attr('disabled', false)
-    if @state == 'initial'
-      @answer_area.attr("disabled", false)
-      @submit_button.prop('value', 'Submit')
-      @submit_button.click @save_answer
-    else if @state == 'assessing'
-      @answer_area.attr("disabled", true)
-      @submit_button.prop('value', 'Submit assessment')
-      @submit_button.click @save_assessment
-    else if @state == 'request_hint'
-      @answer_area.attr("disabled", true)
-      @submit_button.prop('value', 'Submit hint')
-      @submit_button.click @save_hint
-    else if @state == 'done'
-      @answer_area.attr("disabled", true)
-      @hint_area.attr('disabled', true)
-      @submit_button.hide()
-
-
-  find_assessment_elements: ->
-    @assessment = @$('select.assessment')
-
-  find_hint_elements: ->
-    @hint_area = @$('textarea.hint')
-
-  save_answer: (event) =>
-    event.preventDefault()
-    if @state == 'initial'
-      data = {'student_answer' : @answer_area.val()}
-      $.postWithPrefix "#{@ajax_url}/save_answer", data, (response) =>
-        if response.success
-          @rubric_wrapper.html(response.rubric_html)
-          @state = 'assessing'
-          @find_assessment_elements()
-          @rebind()
-        else
-          @errors_area.html(response.error)
-    else
-      @errors_area.html('Problem state got out of sync.  Try reloading the page.')
-
-  save_assessment: (event) =>
-    event.preventDefault()
-    if @state == 'assessing'
-      data = {'assessment' : @assessment.find(':selected').text()}
-      $.postWithPrefix "#{@ajax_url}/save_assessment", data, (response) =>
-        if response.success
-          @state = response.state
-
-          if @state == 'request_hint'
-            @hint_wrapper.html(response.hint_html)
-            @find_hint_elements()
-          else if @state == 'done'
-            @message_wrapper.html(response.message_html)
-            @allow_reset = response.allow_reset
-
-          @rebind()
-        else
-          @errors_area.html(response.error)
-    else
-      @errors_area.html('Problem state got out of sync.  Try reloading the page.')
-    
-
-  save_hint:  (event) =>
-    event.preventDefault()
-    if @state == 'request_hint'
-      data = {'hint' : @hint_area.val()}
-      
-      $.postWithPrefix "#{@ajax_url}/save_hint", data, (response) =>
-        if response.success
-          @message_wrapper.html(response.message_html)
-          @state = 'done'
-          @allow_reset = response.allow_reset
-          @rebind()
-        else
-          @errors_area.html(response.error)
-    else
-      @errors_area.html('Problem state got out of sync.  Try reloading the page.')
-      
-
-  reset: (event) =>
-    event.preventDefault()
-    if @state == 'done'
-      $.postWithPrefix "#{@ajax_url}/reset", {}, (response) =>
-        if response.success
-          @answer_area.val('')
-          @rubric_wrapper.html('')
-          @hint_wrapper.html('')
-          @message_wrapper.html('')
-          @state = 'initial'
-          @rebind()
-          @reset_button.hide()
-        else
-          @errors_area.html(response.error)
-    else
-      @errors_area.html('Problem state got out of sync.  Try reloading the page.')

From b8d49511e1415d51270befef773e8f273c9f732b Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Thu, 3 Jan 2013 18:14:43 -0500
Subject: [PATCH 056/541] Fixing javascript display bugs

---
 .../xmodule/combined_open_ended_module.py     |  5 +--
 .../js/src/combinedopenended/display.coffee   | 39 +++++++++++--------
 .../js/src/selfassessment/display.coffee      |  3 --
 .../xmodule/xmodule/self_assessment_module.py |  3 --
 lms/templates/combined_open_ended.html        |  4 +-
 lms/templates/self_assessment_prompt.html     |  2 +-
 6 files changed, 28 insertions(+), 28 deletions(-)
 delete mode 100644 common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index e77cd254e2..c75de86b02 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -112,9 +112,8 @@ class CombinedOpenEndedModule(XModule):
                 self.state=self.ASSESSING
             elif current_task_state is None and self.current_task_number>0:
                 last_response=self.get_last_response(self.current_task_number-1)
-                current_task_state = ('{"state": "assessing", "version": 1, "max_score": {max_score}, '
-                                      '"attempts": 0, "history": [{"answer": "{answer}"}]}'
-                                      .format(max_score=self._max_score, answer=last_response))
+                current_task_state = ("{'state': 'assessing', 'version': 1, 'max_score': {" + str(self._max_score) + "}, " +
+                                      "'attempts': 0, 'history': [{'answer': '{" + str(last_response) + "}'}]}")
                 self.current_task=self_assessment_module.SelfAssessmentModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
                 self.task_states.append(self.current_task.get_instance_state())
                 self.state=self.ASSESSING
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 897d5f1b67..ebb440b996 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -1,13 +1,16 @@
 class @CombinedOpenEnded
   constructor: (element) ->
-    @el = $(element).find('section.self-assessment')
+    @el = $(element).find('section.combined-open-ended')
     @id = @el.data('id')
     @ajax_url = @el.data('ajax-url')
     @state = @el.data('state')
     @allow_reset = @el.data('allow_reset')
+    @reset_button = @$('.reset-button')
+    @reset_button.click @reset
     # valid states: 'initial', 'assessing', 'request_hint', 'done'
 
     # Where to put the rubric once we load it
+    @el = $(element).find('section.open-ended-child')
     @errors_area = @$('.error')
     @answer_area = @$('textarea.answer')
 
@@ -15,9 +18,7 @@ class @CombinedOpenEnded
     @hint_wrapper = @$('.hint-wrapper')
     @message_wrapper = @$('.message-wrapper')
     @submit_button = @$('.submit-button')
-
-    @reset_button = @$('.reset-button')
-    @reset_button.click @reset
+    @child_state = @el.data('state')
 
     @find_assessment_elements()
     @find_hint_elements()
@@ -32,23 +33,28 @@ class @CombinedOpenEnded
     # rebind to the appropriate function for the current state
     @submit_button.unbind('click')
     @submit_button.show()
+    @reset_button.hide()
     @hint_area.attr('disabled', false)
-    if @state == 'initial'
+    if @child_state == 'initial'
       @answer_area.attr("disabled", false)
       @submit_button.prop('value', 'Submit')
       @submit_button.click @save_answer
-    else if @state == 'assessing'
+    else if @child_state == 'assessing'
       @answer_area.attr("disabled", true)
       @submit_button.prop('value', 'Submit assessment')
       @submit_button.click @save_assessment
-    else if @state == 'request_hint'
+    else if @child_state == 'request_hint'
       @answer_area.attr("disabled", true)
       @submit_button.prop('value', 'Submit hint')
       @submit_button.click @save_hint
-    else if @state == 'done'
+    else if @child_state == 'done'
       @answer_area.attr("disabled", true)
       @hint_area.attr('disabled', true)
       @submit_button.hide()
+      if @allow_reset
+        @reset_button.show()
+      else
+        @reset_button.hide()
 
   find_assessment_elements: ->
     @assessment = @$('select.assessment')
@@ -58,12 +64,12 @@ class @CombinedOpenEnded
 
   save_answer: (event) =>
     event.preventDefault()
-    if @state == 'initial'
+    if @child_state == 'initial'
       data = {'student_answer' : @answer_area.val()}
       $.postWithPrefix "#{@ajax_url}/save_answer", data, (response) =>
         if response.success
           @rubric_wrapper.html(response.rubric_html)
-          @state = 'assessing'
+          @child_state = 'assessing'
           @find_assessment_elements()
           @rebind()
         else
@@ -73,16 +79,16 @@ class @CombinedOpenEnded
 
   save_assessment: (event) =>
     event.preventDefault()
-    if @state == 'assessing'
+    if @child_state == 'assessing'
       data = {'assessment' : @assessment.find(':selected').text()}
       $.postWithPrefix "#{@ajax_url}/save_assessment", data, (response) =>
         if response.success
-          @state = response.state
+          @child_state = response.state
 
-          if @state == 'request_hint'
+          if @child_state == 'request_hint'
             @hint_wrapper.html(response.hint_html)
             @find_hint_elements()
-          else if @state == 'done'
+          else if @child_state == 'done'
             @message_wrapper.html(response.message_html)
             @allow_reset = response.allow_reset
 
@@ -95,13 +101,13 @@ class @CombinedOpenEnded
 
   save_hint:  (event) =>
     event.preventDefault()
-    if @state == 'request_hint'
+    if @child_state == 'request_hint'
       data = {'hint' : @hint_area.val()}
 
       $.postWithPrefix "#{@ajax_url}/save_hint", data, (response) =>
         if response.success
           @message_wrapper.html(response.message_html)
-          @state = 'done'
+          @child_state = 'done'
           @allow_reset = response.allow_reset
           @rebind()
         else
@@ -112,6 +118,7 @@ class @CombinedOpenEnded
 
   reset: (event) =>
     event.preventDefault()
+    @errors_area.html('Problem state got out of sync.  Try reloading the page.')
     if @state == 'done'
       $.postWithPrefix "#{@ajax_url}/reset", {}, (response) =>
         if response.success
diff --git a/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee b/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee
deleted file mode 100644
index 30024478b1..0000000000
--- a/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-class @SelfAssessment
-  constructor: (element) ->
-
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index 0c37384c16..a3b4b56e35 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -61,9 +61,6 @@ class SelfAssessmentModule():
     REQUEST_HINT = 'request_hint'
     DONE = 'done'
 
-    js = {'coffee': [resource_string(__name__, 'js/src/selfassessment/display.coffee')]}
-    js_module_name = "SelfAssessment"
-
     def __init__(self, system, location, definition, descriptor,
                  instance_state=None, shared_state=None, **kwargs):
         """
diff --git a/lms/templates/combined_open_ended.html b/lms/templates/combined_open_ended.html
index 76c28b0e31..65a57b98eb 100644
--- a/lms/templates/combined_open_ended.html
+++ b/lms/templates/combined_open_ended.html
@@ -1,9 +1,9 @@
-<div id="combined-open-ended" class="combined-open-ended" data-ajax-url="${ajax_url}" data-allow_reset="${allow_reset}">
+<section id="combined-open-ended" class="combined-open-ended" data-ajax-url="${ajax_url}" data-allow_reset="${allow_reset}">
 
     % for item in items:
     <div class="item">${item['content'] | n}</div>
     % endfor
 
     <input type="button" value="Reset" class="reset-button" name="reset"/>
-</div>
+</section>
 
diff --git a/lms/templates/self_assessment_prompt.html b/lms/templates/self_assessment_prompt.html
index e54864c988..91223fdaa1 100644
--- a/lms/templates/self_assessment_prompt.html
+++ b/lms/templates/self_assessment_prompt.html
@@ -1,4 +1,4 @@
-<section id="self_assessment_${id}" class="self-assessment" data-ajax-url="${ajax_url}"
+<section id="self_assessment_${id}" class="open-ended-child" data-ajax-url="${ajax_url}"
          data-id="${id}" data-state="${state}" data-allow_reset="${allow_reset}">
     <div class="error"></div>
     <div class="prompt">

From beef00c13a4c30c04a0335b09935f0ea8b2121ae Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Thu, 3 Jan 2013 18:31:19 -0500
Subject: [PATCH 057/541] Json instance state fix

---
 common/lib/xmodule/xmodule/combined_open_ended_module.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index c75de86b02..14e04d399e 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -111,9 +111,10 @@ class CombinedOpenEndedModule(XModule):
                 self.task_states.append(self.current_task.get_instance_state())
                 self.state=self.ASSESSING
             elif current_task_state is None and self.current_task_number>0:
-                last_response=self.get_last_response(self.current_task_number-1)
-                current_task_state = ("{'state': 'assessing', 'version': 1, 'max_score': {" + str(self._max_score) + "}, " +
-                                      "'attempts': 0, 'history': [{'answer': '{" + str(last_response) + "}'}]}")
+                last_response, last_score=self.get_last_response(self.current_task_number-1)
+                current_task_state = ('{"state": "assessing", "version": 1, "max_score": ' + str(self._max_score) + ', ' +
+                                      '"attempts": 0, "history": [{"answer": "' + str(last_response) + '"}]}')
+                {"state": "done", "version": 1, "max_score": 1, "attempts": 1, "history": [{"answer": "gdgddg", "score": 0, "hint": "dfdfdf"}]}
                 self.current_task=self_assessment_module.SelfAssessmentModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
                 self.task_states.append(self.current_task.get_instance_state())
                 self.state=self.ASSESSING

From 418c45f4d39a311bd8678e9b21b017f998c14896 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Thu, 3 Jan 2013 18:34:33 -0500
Subject: [PATCH 058/541] Bugfixes

---
 .../lib/xmodule/xmodule/js/src/combinedopenended/display.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index ebb440b996..1636804e71 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -119,7 +119,7 @@ class @CombinedOpenEnded
   reset: (event) =>
     event.preventDefault()
     @errors_area.html('Problem state got out of sync.  Try reloading the page.')
-    if @state == 'done'
+    if @child_state == 'done'
       $.postWithPrefix "#{@ajax_url}/reset", {}, (response) =>
         if response.success
           @answer_area.val('')

From 5d6509dcb5933ff4fac2dbc944be2432a606d058 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Thu, 3 Jan 2013 18:46:48 -0500
Subject: [PATCH 059/541] add in js variables for element wrappers

---
 .../xmodule/xmodule/js/src/combinedopenended/display.coffee    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 1636804e71..0c54e9af46 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -7,6 +7,7 @@ class @CombinedOpenEnded
     @allow_reset = @el.data('allow_reset')
     @reset_button = @$('.reset-button')
     @reset_button.click @reset
+    @combined_open_ended= @$('.combined-open-ended')
     # valid states: 'initial', 'assessing', 'request_hint', 'done'
 
     # Where to put the rubric once we load it
@@ -20,6 +21,8 @@ class @CombinedOpenEnded
     @submit_button = @$('.submit-button')
     @child_state = @el.data('state')
 
+    @open_ended_child= @$('.open-ended-child')
+
     @find_assessment_elements()
     @find_hint_elements()
 

From 406d6c0c85e776b9c975c4ec772909129439a5a4 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Thu, 3 Jan 2013 18:49:27 -0500
Subject: [PATCH 060/541] js name changes

---
 .../lib/xmodule/xmodule/js/src/combinedopenended/display.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 0c54e9af46..031cc5183b 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -129,7 +129,7 @@ class @CombinedOpenEnded
           @rubric_wrapper.html('')
           @hint_wrapper.html('')
           @message_wrapper.html('')
-          @state = 'initial'
+          @child_state = 'initial'
           @rebind()
           @reset_button.hide()
         else

From d5c3b58da394e068cc73af42204be5b7f4f749cd Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 09:56:45 -0500
Subject: [PATCH 061/541] Change reset and next problem code

---
 .../xmodule/combined_open_ended_module.py     | 29 +++++++++++++++++--
 .../js/src/combinedopenended/display.coffee   | 26 ++++++++++++++---
 .../xmodule/xmodule/self_assessment_module.py |  2 +-
 3 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 14e04d399e..58d0cd4560 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -176,12 +176,35 @@ class CombinedOpenEndedModule(XModule):
     def update_task_states_ajax(self,return_html):
         changed=self.update_task_states()
         if changed:
-            return_html=self.get_html()
+            #return_html=self.get_html()
+            pass
         return return_html
 
     def handle_ajax(self, dispatch, get):
-        return_html = self.current_task.handle_ajax(dispatch,get, self.system)
-        return self.update_task_states_ajax(return_html)
+        """
+        This is called by courseware.module_render, to handle an AJAX call.
+        "get" is request.POST.
+
+        Returns a json dictionary:
+        { 'progress_changed' : True/False,
+        'progress': 'none'/'in_progress'/'done',
+        <other request-specific values here > }
+        """
+
+        handlers = {
+            'next_problem': self.next_problem,
+            'reset': self.reset,
+            }
+
+        if dispatch not in handlers:
+            return_html = self.current_task.handle_ajax(dispatch,get, self.system)
+            return self.update_task_states_ajax(return_html)
+
+    def next_problem(self):
+        pass
+
+    def reset(self):
+        pass
 
     def get_instance_state(self):
         """
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 031cc5183b..a7aee1b895 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -8,7 +8,7 @@ class @CombinedOpenEnded
     @reset_button = @$('.reset-button')
     @reset_button.click @reset
     @combined_open_ended= @$('.combined-open-ended')
-    # valid states: 'initial', 'assessing', 'request_hint', 'done'
+    # valid states: 'initial', 'assessing', 'post_assessment', 'done'
 
     # Where to put the rubric once we load it
     @el = $(element).find('section.open-ended-child')
@@ -46,7 +46,7 @@ class @CombinedOpenEnded
       @answer_area.attr("disabled", true)
       @submit_button.prop('value', 'Submit assessment')
       @submit_button.click @save_assessment
-    else if @child_state == 'request_hint'
+    else if @child_state == 'post_assessment'
       @answer_area.attr("disabled", true)
       @submit_button.prop('value', 'Submit hint')
       @submit_button.click @save_hint
@@ -88,7 +88,7 @@ class @CombinedOpenEnded
         if response.success
           @child_state = response.state
 
-          if @child_state == 'request_hint'
+          if @child_state == 'post_assessment'
             @hint_wrapper.html(response.hint_html)
             @find_hint_elements()
           else if @child_state == 'done'
@@ -104,7 +104,7 @@ class @CombinedOpenEnded
 
   save_hint:  (event) =>
     event.preventDefault()
-    if @child_state == 'request_hint'
+    if @child_state == 'post_assessment'
       data = {'hint' : @hint_area.val()}
 
       $.postWithPrefix "#{@ajax_url}/save_hint", data, (response) =>
@@ -134,5 +134,23 @@ class @CombinedOpenEnded
           @reset_button.hide()
         else
           @errors_area.html(response.error)
+    else
+      @errors_area.html('Problem state got out of sync.  Try reloading the page.')
+
+  next_problem (event) =>
+    event.preventDefault()
+    @errors_area.html('Problem state got out of sync.  Try reloading the page.')
+    if @child_state == 'done'
+      $.postWithPrefix "#{@ajax_url}/next_problem", {}, (response) =>
+        if response.success
+          @answer_area.val('')
+          @rubric_wrapper.html('')
+          @hint_wrapper.html('')
+          @message_wrapper.html('')
+          @child_state = 'initial'
+          @rebind()
+          @reset_button.hide()
+        else
+          @errors_area.html(response.error)
     else
       @errors_area.html('Problem state got out of sync.  Try reloading the page.')
\ No newline at end of file
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index a3b4b56e35..cba13c7e54 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -58,7 +58,7 @@ class SelfAssessmentModule():
     # states
     INITIAL = 'initial'
     ASSESSING = 'assessing'
-    REQUEST_HINT = 'request_hint'
+    REQUEST_HINT = 'post_assessment'
     DONE = 'done'
 
     def __init__(self, system, location, definition, descriptor,

From 91a9962bef454d5ef626d3680a515a42a88a498b Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 09:59:25 -0500
Subject: [PATCH 062/541] Improve next problem handling and state tracking

---
 .../xmodule/js/src/combinedopenended/display.coffee | 13 +++++++++----
 lms/templates/combined_open_ended.html              |  1 +
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index a7aee1b895..0e8cadd69f 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -7,6 +7,8 @@ class @CombinedOpenEnded
     @allow_reset = @el.data('allow_reset')
     @reset_button = @$('.reset-button')
     @reset_button.click @reset
+    @next_problem_button = @$('.next-step-button')
+    @next_problem_button.click @next_problem
     @combined_open_ended= @$('.combined-open-ended')
     # valid states: 'initial', 'assessing', 'post_assessment', 'done'
 
@@ -37,6 +39,7 @@ class @CombinedOpenEnded
     @submit_button.unbind('click')
     @submit_button.show()
     @reset_button.hide()
+    @next_problem_button.hide()
     @hint_area.attr('disabled', false)
     if @child_state == 'initial'
       @answer_area.attr("disabled", false)
@@ -54,10 +57,12 @@ class @CombinedOpenEnded
       @answer_area.attr("disabled", true)
       @hint_area.attr('disabled', true)
       @submit_button.hide()
-      if @allow_reset
-        @reset_button.show()
-      else
-        @reset_button.hide()
+      if !@state == 'done'
+        @next_problem_button.show()
+        if @allow_reset
+          @reset_button.show()
+        else
+          @reset_button.hide()
 
   find_assessment_elements: ->
     @assessment = @$('select.assessment')
diff --git a/lms/templates/combined_open_ended.html b/lms/templates/combined_open_ended.html
index 65a57b98eb..51afddcd15 100644
--- a/lms/templates/combined_open_ended.html
+++ b/lms/templates/combined_open_ended.html
@@ -5,5 +5,6 @@
     % endfor
 
     <input type="button" value="Reset" class="reset-button" name="reset"/>
+    <input type="button" value="Next Step" class="next-step-button" name="reset"/>
 </section>
 

From 6ef8713c9406c850c2da21b120cdf822bdb77e4d Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 10:55:05 -0500
Subject: [PATCH 063/541] JS state tracking

---
 .../xmodule/combined_open_ended_module.py     | 27 ++++++++++++++++---
 .../js/src/combinedopenended/display.coffee   |  5 ++--
 .../xmodule/xmodule/self_assessment_module.py |  2 +-
 lms/templates/combined_open_ended.html        |  2 +-
 4 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 58d0cd4560..a57bf965d0 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -131,6 +131,7 @@ class CombinedOpenEndedModule(XModule):
             'items': [{'content' : task_html}],
             'ajax_url': self.system.ajax_url,
             'allow_reset': True,
+            'state' : self.state,
             }
 
         html = self.system.render_template('combined_open_ended.html', context)
@@ -201,12 +202,32 @@ class CombinedOpenEndedModule(XModule):
             return self.update_task_states_ajax(return_html)
 
     def next_problem(self):
-        pass
+        self.setup_next_task()
+        return {'success' : True}
 
     def reset(self):
-        pass
+        """
+        If resetting is allowed, reset the state.
 
-    def get_instance_state(self):
+        Returns {'success': bool, 'error': msg}
+        (error only present if not success)
+        """
+        if self.state != self.DONE:
+            return self.out_of_sync_error(get)
+
+        if self.attempts > self.max_attempts:
+            return {
+                'success': False,
+                'error': 'Too many attempts.'
+            }
+        self.state=self.INITIAL
+        self.current_task_number=0
+        self.setup_next_task()
+        self.current_task.reset(self.system)
+        return {'success': True}
+
+
+def get_instance_state(self):
         """
         Get the current score and state
         """
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 0e8cadd69f..eab904b0a4 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -59,6 +59,7 @@ class @CombinedOpenEnded
       @submit_button.hide()
       if !@state == 'done'
         @next_problem_button.show()
+      if @state == 'done'
         if @allow_reset
           @reset_button.show()
         else
@@ -127,7 +128,7 @@ class @CombinedOpenEnded
   reset: (event) =>
     event.preventDefault()
     @errors_area.html('Problem state got out of sync.  Try reloading the page.')
-    if @child_state == 'done'
+    if @state == 'done'
       $.postWithPrefix "#{@ajax_url}/reset", {}, (response) =>
         if response.success
           @answer_area.val('')
@@ -142,7 +143,7 @@ class @CombinedOpenEnded
     else
       @errors_area.html('Problem state got out of sync.  Try reloading the page.')
 
-  next_problem (event) =>
+  next_problem: (event) =>
     event.preventDefault()
     @errors_area.html('Problem state got out of sync.  Try reloading the page.')
     if @child_state == 'done'
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index cba13c7e54..c1c568af2f 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -459,7 +459,7 @@ class SelfAssessmentModule():
                 'allow_reset': self._allow_reset()}
 
 
-    def reset(self, get, system):
+    def reset(self, system):
         """
         If resetting is allowed, reset the state.
 
diff --git a/lms/templates/combined_open_ended.html b/lms/templates/combined_open_ended.html
index 51afddcd15..a00d5b042f 100644
--- a/lms/templates/combined_open_ended.html
+++ b/lms/templates/combined_open_ended.html
@@ -1,4 +1,4 @@
-<section id="combined-open-ended" class="combined-open-ended" data-ajax-url="${ajax_url}" data-allow_reset="${allow_reset}">
+<section id="combined-open-ended" class="combined-open-ended" data-ajax-url="${ajax_url}" data-allow_reset="${allow_reset}" data-state="${state}">
 
     % for item in items:
     <div class="item">${item['content'] | n}</div>

From 70d0e6a1b601422f4c24e1420924c0a77e4b0455 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 11:11:35 -0500
Subject: [PATCH 064/541] Silly tab error

---
 .../xmodule/xmodule/combined_open_ended_module.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index a57bf965d0..a73886c7e2 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -201,11 +201,14 @@ class CombinedOpenEndedModule(XModule):
             return_html = self.current_task.handle_ajax(dispatch,get, self.system)
             return self.update_task_states_ajax(return_html)
 
-    def next_problem(self):
+        d = handlers[dispatch](get)
+        return json.dumps(d,cls=ComplexEncoder)
+
+    def next_problem(self, get):
         self.setup_next_task()
         return {'success' : True}
 
-    def reset(self):
+    def reset(self, get):
         """
         If resetting is allowed, reset the state.
 
@@ -221,13 +224,15 @@ class CombinedOpenEndedModule(XModule):
                 'error': 'Too many attempts.'
             }
         self.state=self.INITIAL
+        for i in xrange(0,len(self.task_xml)):
+            self.current_task_number=i
+            self.setup_next_task()
+            self.current_task.reset(self.system)
         self.current_task_number=0
-        self.setup_next_task()
-        self.current_task.reset(self.system)
         return {'success': True}
 
 
-def get_instance_state(self):
+    def get_instance_state(self):
         """
         Get the current score and state
         """

From dabc2e0c9d33b0346c348834d003a0fa339e31c8 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 11:21:08 -0500
Subject: [PATCH 065/541] Javascript state transitions

---
 .../js/src/combinedopenended/display.coffee        |  6 +++++-
 .../lib/xmodule/xmodule/self_assessment_module.py  | 14 +++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index eab904b0a4..8e1dff4d99 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -57,8 +57,10 @@ class @CombinedOpenEnded
       @answer_area.attr("disabled", true)
       @hint_area.attr('disabled', true)
       @submit_button.hide()
-      if !@state == 'done'
+      if @state != 'done'
         @next_problem_button.show()
+      else
+        @next_problem_button.hide()
       if @state == 'done'
         if @allow_reset
           @reset_button.show()
@@ -138,6 +140,7 @@ class @CombinedOpenEnded
           @child_state = 'initial'
           @rebind()
           @reset_button.hide()
+          location.reload()
         else
           @errors_area.html(response.error)
     else
@@ -156,6 +159,7 @@ class @CombinedOpenEnded
           @child_state = 'initial'
           @rebind()
           @reset_button.hide()
+          location.reload()
         else
           @errors_area.html(response.error)
     else
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index c1c568af2f..64cf140d38 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -466,14 +466,14 @@ class SelfAssessmentModule():
         Returns {'success': bool, 'error': msg}
         (error only present if not success)
         """
-        if self.state != self.DONE:
-            return self.out_of_sync_error(get)
+        #if self.state != self.DONE:
+        #    return self.out_of_sync_error(get)
 
-        if self.attempts > self.max_attempts:
-            return {
-                'success': False,
-                'error': 'Too many attempts.'
-            }
+        #if self.attempts > self.max_attempts:
+        #    return {
+        #        'success': False,
+        #        'error': 'Too many attempts.'
+        #    }
         self.change_state(self.INITIAL)
         return {'success': True}
 

From d910395c7de4d07b5b1401bf05918ab036eda554 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 11:24:05 -0500
Subject: [PATCH 066/541] Task count tracking

---
 common/lib/xmodule/xmodule/combined_open_ended_module.py | 2 ++
 lms/templates/combined_open_ended.html                   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index a73886c7e2..afa5f61b25 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -132,6 +132,8 @@ class CombinedOpenEndedModule(XModule):
             'ajax_url': self.system.ajax_url,
             'allow_reset': True,
             'state' : self.state,
+            'task_count' : len(self.task_xml),
+            'task_number' : self.current_task_number,
             }
 
         html = self.system.render_template('combined_open_ended.html', context)
diff --git a/lms/templates/combined_open_ended.html b/lms/templates/combined_open_ended.html
index a00d5b042f..5b6823e809 100644
--- a/lms/templates/combined_open_ended.html
+++ b/lms/templates/combined_open_ended.html
@@ -1,4 +1,4 @@
-<section id="combined-open-ended" class="combined-open-ended" data-ajax-url="${ajax_url}" data-allow_reset="${allow_reset}" data-state="${state}">
+<section id="combined-open-ended" class="combined-open-ended" data-ajax-url="${ajax_url}" data-allow_reset="${allow_reset}" data-state="${state}" data-task-count="${task_count}" data-task-number="${task_number}">
 
     % for item in items:
     <div class="item">${item['content'] | n}</div>

From 69d8c4a97719154801d79322b84cfe985255243a Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 11:27:35 -0500
Subject: [PATCH 067/541] javascript state tracking for next problem and reset

---
 common/lib/xmodule/xmodule/combined_open_ended_module.py   | 2 +-
 .../xmodule/js/src/combinedopenended/display.coffee        | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index afa5f61b25..f33439673c 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -133,7 +133,7 @@ class CombinedOpenEndedModule(XModule):
             'allow_reset': True,
             'state' : self.state,
             'task_count' : len(self.task_xml),
-            'task_number' : self.current_task_number,
+            'task_number' : self.current_task_number+1,
             }
 
         html = self.system.render_template('combined_open_ended.html', context)
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 8e1dff4d99..34b9b0c472 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -4,6 +4,9 @@ class @CombinedOpenEnded
     @id = @el.data('id')
     @ajax_url = @el.data('ajax-url')
     @state = @el.data('state')
+    @task_count = @el.data('task-count')
+    @task_number = @el.data('task-number')
+
     @allow_reset = @el.data('allow_reset')
     @reset_button = @$('.reset-button')
     @reset_button.click @reset
@@ -57,16 +60,16 @@ class @CombinedOpenEnded
       @answer_area.attr("disabled", true)
       @hint_area.attr('disabled', true)
       @submit_button.hide()
-      if @state != 'done'
+      if @task_number<@task_count
         @next_problem_button.show()
       else
         @next_problem_button.hide()
-      if @state == 'done'
         if @allow_reset
           @reset_button.show()
         else
           @reset_button.hide()
 
+
   find_assessment_elements: ->
     @assessment = @$('select.assessment')
 

From 844fb03377aa9f70789e261184f1282bcfcf8a3b Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 11:35:27 -0500
Subject: [PATCH 068/541] javascript transitions okay, can integrate open ended
 response now

---
 .../js/src/combinedopenended/display.coffee        | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 34b9b0c472..08c7aafa4d 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -64,10 +64,10 @@ class @CombinedOpenEnded
         @next_problem_button.show()
       else
         @next_problem_button.hide()
-        if @allow_reset
-          @reset_button.show()
-        else
-          @reset_button.hide()
+        #if @allow_reset
+        @reset_button.show()
+        #else
+        #  @reset_button.hide()
 
 
   find_assessment_elements: ->
@@ -132,8 +132,7 @@ class @CombinedOpenEnded
 
   reset: (event) =>
     event.preventDefault()
-    @errors_area.html('Problem state got out of sync.  Try reloading the page.')
-    if @state == 'done'
+    if @child_state == 'done'
       $.postWithPrefix "#{@ajax_url}/reset", {}, (response) =>
         if response.success
           @answer_area.val('')
@@ -151,7 +150,6 @@ class @CombinedOpenEnded
 
   next_problem: (event) =>
     event.preventDefault()
-    @errors_area.html('Problem state got out of sync.  Try reloading the page.')
     if @child_state == 'done'
       $.postWithPrefix "#{@ajax_url}/next_problem", {}, (response) =>
         if response.success
@@ -161,7 +159,7 @@ class @CombinedOpenEnded
           @message_wrapper.html('')
           @child_state = 'initial'
           @rebind()
-          @reset_button.hide()
+          @next_problem_button.hide()
           location.reload()
         else
           @errors_area.html(response.error)

From e3a311d28347a9bd128a26281b914265c93801e6 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 11:40:49 -0500
Subject: [PATCH 069/541] Start creating open ended xmodule

---
 common/lib/xmodule/open_ended_module.py       | 128 ++++++++++++++++++
 .../xmodule/xmodule/self_assessment_module.py |   9 +-
 2 files changed, 134 insertions(+), 3 deletions(-)
 create mode 100644 common/lib/xmodule/open_ended_module.py

diff --git a/common/lib/xmodule/open_ended_module.py b/common/lib/xmodule/open_ended_module.py
new file mode 100644
index 0000000000..e728a8dba3
--- /dev/null
+++ b/common/lib/xmodule/open_ended_module.py
@@ -0,0 +1,128 @@
+"""
+A Self Assessment module that allows students to write open-ended responses,
+submit, then see a rubric and rate themselves.  Persists student supplied
+hints, answers, and assessment judgment (currently only correct/incorrect).
+Parses xml definition file--see below for exact format.
+"""
+
+import copy
+from fs.errors import ResourceNotFoundError
+import itertools
+import json
+import logging
+from lxml import etree
+from lxml.html import rewrite_links
+from path import path
+import os
+import sys
+
+from pkg_resources import resource_string
+
+from .capa_module import only_one, ComplexEncoder
+from .editing_module import EditingDescriptor
+from .html_checker import check_html
+from progress import Progress
+from .stringify import stringify_children
+from .x_module import XModule
+from .xml_module import XmlDescriptor
+from xmodule.modulestore import Location
+
+log = logging.getLogger("mitx.courseware")
+
+# Set the default number of max attempts.  Should be 1 for production
+# Set higher for debugging/testing
+# attempts specified in xml definition overrides this.
+MAX_ATTEMPTS = 1
+
+# Set maximum available number of points.
+# Overriden by max_score specified in xml.
+MAX_SCORE = 1
+
+class OpenEndedModule():
+    """
+    States:
+
+    initial (prompt, textbox shown)
+         |
+    assessing (read-only textbox, rubric + assessment input shown)
+         |
+    request_hint (read-only textbox, read-only rubric and assessment, hint input box shown)
+         |
+    done (submitted msg, green checkmark, everything else read-only.  If attempts < max, shows
+         a reset button that goes back to initial state.  Saves previous
+         submissions too.)
+    """
+
+    DEFAULT_QUEUE = 'open-ended'
+    DEFAULT_MESSAGE_QUEUE = 'open-ended-message'
+    response_tag = 'openendedresponse'
+    allowed_inputfields = ['openendedinput']
+    max_inputfields = 1
+
+    STATE_VERSION = 1
+
+    # states
+    INITIAL = 'initial'
+    ASSESSING = 'assessing'
+    REQUEST_HINT = 'post_assessment'
+    DONE = 'done'
+
+    def __init__(self, system, location, definition, descriptor,
+                 instance_state=None, shared_state=None, **kwargs):
+        """
+        Definition file should have 4 blocks -- prompt, rubric, submitmessage, hintprompt,
+        and two optional attributes:
+        attempts, which should be an integer that defaults to 1.
+        If it's > 1, the student will be able to re-submit after they see
+        the rubric.
+        max_score, which should be an integer that defaults to 1.
+        It defines the maximum number of points a student can get.  Assumed to be integer scale
+        from 0 to max_score, with an interval of 1.
+
+        Note: all the submissions are stored.
+
+        Sample file:
+
+        <selfassessment attempts="1" max_score="1">
+            <prompt>
+                Insert prompt text here.  (arbitrary html)
+            </prompt>
+            <rubric>
+                Insert grading rubric here.  (arbitrary html)
+            </rubric>
+            <hintprompt>
+                Please enter a hint below: (arbitrary html)
+            </hintprompt>
+            <submitmessage>
+                Thanks for submitting!  (arbitrary html)
+            </submitmessage>
+        </selfassessment>
+        """
+
+        # Load instance state
+        if instance_state is not None:
+            instance_state = json.loads(instance_state)
+        else:
+            instance_state = {}
+
+        instance_state = self.convert_state_to_current_format(instance_state)
+
+        # History is a list of tuples of (answer, score, hint), where hint may be
+        # None for any element, and score and hint can be None for the last (current)
+        # element.
+        # Scores are on scale from 0 to max_score
+        self.history = instance_state.get('history', [])
+
+        self.state = instance_state.get('state', 'initial')
+
+        self.attempts = instance_state.get('attempts', 0)
+        self.max_attempts = int(instance_state.get('attempts', MAX_ATTEMPTS))
+
+        # Used for progress / grading.  Currently get credit just for
+        # completion (doesn't matter if you self-assessed correct/incorrect).
+        self._max_score = int(instance_state.get('max_score', MAX_SCORE))
+
+        self.rubric = definition['rubric']
+        self.prompt = definition['prompt']
+        self.submit_message = definition['submitmessage']
+        self.hint_prompt = definition['hintprompt']
\ No newline at end of file
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index 64cf140d38..0b7cc90994 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -93,15 +93,18 @@ class SelfAssessmentModule():
         </selfassessment>
         """
 
+        self.xml = xml
+        self.inputfields = inputfields
+        self.context = context
+        self.system = system
+
         # Load instance state
         if instance_state is not None:
             instance_state = json.loads(instance_state)
         else:
             instance_state = {}
 
-        instance_state = self.convert_state_to_current_format(instance_state)
-
-        # History is a list of tuples of (answer, score, hint), where hint may be
+        # History is a list of tuples of (answer, score, feedback), where hint may be
         # None for any element, and score and hint can be None for the last (current)
         # element.
         # Scores are on scale from 0 to max_score

From 6d61bd469a096eef5eca94cb88dbc3a5f13e9e2e Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 11:47:49 -0500
Subject: [PATCH 070/541] initial setup for open ended xmodule

---
 common/lib/xmodule/open_ended_module.py       | 59 +++++++++++++++++--
 .../xmodule/xmodule/self_assessment_module.py |  5 --
 2 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/common/lib/xmodule/open_ended_module.py b/common/lib/xmodule/open_ended_module.py
index e728a8dba3..62310f1e18 100644
--- a/common/lib/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/open_ended_module.py
@@ -64,7 +64,7 @@ class OpenEndedModule():
     # states
     INITIAL = 'initial'
     ASSESSING = 'assessing'
-    REQUEST_HINT = 'post_assessment'
+    POST_ASSESSMENT = 'post_assessment'
     DONE = 'done'
 
     def __init__(self, system, location, definition, descriptor,
@@ -122,7 +122,56 @@ class OpenEndedModule():
         # completion (doesn't matter if you self-assessed correct/incorrect).
         self._max_score = int(instance_state.get('max_score', MAX_SCORE))
 
-        self.rubric = definition['rubric']
-        self.prompt = definition['prompt']
-        self.submit_message = definition['submitmessage']
-        self.hint_prompt = definition['hintprompt']
\ No newline at end of file
+        oeparam = definition['openendedparam']
+        prompt = definition['prompt']
+        rubric = definition['rubric']
+
+        self.url = definition.get('url', None)
+        self.queue_name = definition.get('queuename', self.DEFAULT_QUEUE)
+        self.message_queue_name = definition.get('message-queuename', self.DEFAULT_MESSAGE_QUEUE)
+
+        #This is needed to attach feedback to specific responses later
+        self.submission_id=None
+        self.grader_id=None
+
+        if oeparam is None:
+            raise ValueError("No oeparam found in problem xml.")
+        if prompt is None:
+            raise ValueError("No prompt found in problem xml.")
+        if rubric is None:
+            raise ValueError("No rubric found in problem xml.")
+
+        self._parse(oeparam, prompt, rubric)
+
+
+    def handle_ajax(self, dispatch, get):
+        '''
+        This is called by courseware.module_render, to handle an AJAX call.
+        "get" is request.POST.
+
+        Returns a json dictionary:
+        { 'progress_changed' : True/False,
+          'progress' : 'none'/'in_progress'/'done',
+          <other request-specific values here > }
+        '''
+        handlers = {
+            'problem_get': self.get_problem,
+            'problem_check': self.check_problem,
+            'problem_reset': self.reset_problem,
+            'problem_save': self.save_problem,
+            'problem_show': self.get_answer,
+            'score_update': self.update_score,
+            'message_post' : self.message_post,
+            }
+
+        if dispatch not in handlers:
+            return 'Error'
+
+        before = self.get_progress()
+        d = handlers[dispatch](get)
+        after = self.get_progress()
+        d.update({
+            'progress_changed': after != before,
+            'progress_status': Progress.to_js_status_str(after),
+            })
+        return json.dumps(d, cls=ComplexEncoder)
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index 0b7cc90994..1b10fab9ac 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -93,11 +93,6 @@ class SelfAssessmentModule():
         </selfassessment>
         """
 
-        self.xml = xml
-        self.inputfields = inputfields
-        self.context = context
-        self.system = system
-
         # Load instance state
         if instance_state is not None:
             instance_state = json.loads(instance_state)

From 6ac90cf9544d89f3cf7da3f5a78066922af6a6fd Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 11:53:33 -0500
Subject: [PATCH 071/541] Fix message post to work with ajax

---
 common/lib/xmodule/open_ended_module.py | 371 ++++++++++++++++++++++++
 1 file changed, 371 insertions(+)

diff --git a/common/lib/xmodule/open_ended_module.py b/common/lib/xmodule/open_ended_module.py
index 62310f1e18..0ce2007c21 100644
--- a/common/lib/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/open_ended_module.py
@@ -15,6 +15,8 @@ from lxml.html import rewrite_links
 from path import path
 import os
 import sys
+import hashlib
+import capa.xqueue_interface as xqueue_interface
 
 from pkg_resources import resource_string
 
@@ -143,6 +145,375 @@ class OpenEndedModule():
 
         self._parse(oeparam, prompt, rubric)
 
+    def _parse(self, oeparam, prompt, rubric):
+        '''
+        Parse OpenEndedResponse XML:
+            self.initial_display
+            self.payload - dict containing keys --
+            'grader' : path to grader settings file, 'problem_id' : id of the problem
+
+            self.answer - What to display when show answer is clicked
+        '''
+        # Note that OpenEndedResponse is agnostic to the specific contents of grader_payload
+        prompt_string = self.stringify_children(prompt)
+        rubric_string = self.stringify_children(rubric)
+
+        grader_payload = oeparam.find('grader_payload')
+        grader_payload = grader_payload.text if grader_payload is not None else ''
+
+        #Update grader payload with student id.  If grader payload not json, error.
+        try:
+            parsed_grader_payload = json.loads(grader_payload)
+            # NOTE: self.system.location is valid because the capa_module
+            # __init__ adds it (easiest way to get problem location into
+            # response types)
+        except TypeError, ValueError:
+            log.exception("Grader payload %r is not a json object!", grader_payload)
+
+        self.initial_display = find_with_default(oeparam, 'initial_display', '')
+        self.answer = find_with_default(oeparam, 'answer_display', 'No answer given.')
+
+        parsed_grader_payload.update({
+            'location' : self.system.location,
+            'course_id' : self.system.course_id,
+            'prompt' : prompt_string,
+            'rubric' : rubric_string,
+            'initial_display' : self.initial_display,
+            'answer' : self.answer,
+            })
+        updated_grader_payload = json.dumps(parsed_grader_payload)
+
+        self.payload = {'grader_payload': updated_grader_payload}
+
+        try:
+            self.max_score = int(find_with_default(oeparam, 'max_score', 1))
+        except ValueError:
+            self.max_score = 1
+
+    def handle_message_post(self,get):
+        """
+        Handles a student message post (a reaction to the grade they received from an open ended grader type)
+        Returns a boolean success/fail and an error message
+        """
+
+        event_info = dict()
+        event_info['problem_id'] = self.location.url()
+        event_info['student_id'] = self.system.anonymous_student_id
+        event_info['survey_responses']= get
+        
+        survey_responses=event_info['survey_responses']
+        for tag in ['feedback', 'submission_id', 'grader_id', 'score']:
+            if tag not in survey_responses:
+                return False, "Could not find needed tag {0}".format(tag)
+        try:
+            submission_id=int(survey_responses['submission_id'])
+            grader_id = int(survey_responses['grader_id'])
+            feedback = str(survey_responses['feedback'].encode('ascii', 'ignore'))
+            score = int(survey_responses['score'])
+        except:
+            error_message=("Could not parse submission id, grader id, "
+                           "or feedback from message_post ajax call.  Here is the message data: {0}".format(survey_responses))
+            log.exception(error_message)
+            return False, "There was an error saving your feedback.  Please contact course staff."
+
+        qinterface = self.system.xqueue['interface']
+        qtime = datetime.strftime(datetime.now(), xqueue_interface.dateformat)
+        anonymous_student_id = self.system.anonymous_student_id
+        queuekey = xqueue_interface.make_hashkey(str(self.system.seed) + qtime +
+                                                 anonymous_student_id +
+                                                 self.answer_id)
+
+        xheader = xqueue_interface.make_xheader(
+            lms_callback_url=self.system.xqueue['callback_url'],
+            lms_key=queuekey,
+            queue_name=self.message_queue_name
+        )
+
+        student_info = {'anonymous_student_id': anonymous_student_id,
+                        'submission_time': qtime,
+                        }
+        contents= {
+            'feedback' : feedback,
+            'submission_id' : submission_id,
+            'grader_id' : grader_id,
+            'score': score,
+            'student_info' : json.dumps(student_info),
+            }
+
+        (error, msg) = qinterface.send_to_queue(header=xheader,
+            body=json.dumps(contents))
+
+        #Convert error to a success value
+        success=True
+        if error:
+            success=False
+
+        return success, "Successfully submitted your feedback."
+
+        def get_score(self, student_answers):
+
+        try:
+            submission = student_answers[self.answer_id]
+        except KeyError:
+            msg = ('Cannot get student answer for answer_id: {0}. student_answers {1}'
+                   .format(self.answer_id, student_answers))
+            log.exception(msg)
+            raise LoncapaProblemError(msg)
+
+        # Prepare xqueue request
+        #------------------------------------------------------------
+
+        qinterface = self.system.xqueue['interface']
+        qtime = datetime.strftime(datetime.now(), xqueue_interface.dateformat)
+
+        anonymous_student_id = self.system.anonymous_student_id
+
+        # Generate header
+        queuekey = xqueue_interface.make_hashkey(str(self.system.seed) + qtime +
+                                                 anonymous_student_id +
+                                                 self.answer_id)
+
+        xheader = xqueue_interface.make_xheader(lms_callback_url=self.system.xqueue['callback_url'],
+            lms_key=queuekey,
+            queue_name=self.queue_name)
+
+        self.context.update({'submission': submission})
+
+        contents = self.payload.copy()
+
+        # Metadata related to the student submission revealed to the external grader
+        student_info = {'anonymous_student_id': anonymous_student_id,
+                        'submission_time': qtime,
+                        }
+
+        #Update contents with student response and student info
+        contents.update({
+            'student_info': json.dumps(student_info),
+            'student_response': submission,
+            'max_score' : self.max_score,
+            })
+
+        # Submit request. When successful, 'msg' is the prior length of the queue
+        (error, msg) = qinterface.send_to_queue(header=xheader,
+            body=json.dumps(contents))
+
+        # State associated with the queueing request
+        queuestate = {'key': queuekey,
+                      'time': qtime,}
+
+        cmap = CorrectMap()
+        if error:
+            cmap.set(self.answer_id, queuestate=None,
+                msg='Unable to deliver your submission to grader. (Reason: {0}.)'
+                    ' Please try again later.'.format(msg))
+        else:
+            # Queueing mechanism flags:
+            #   1) Backend: Non-null CorrectMap['queuestate'] indicates that
+            #      the problem has been queued
+            #   2) Frontend: correctness='incomplete' eventually trickles down
+            #      through inputtypes.textbox and .filesubmission to inform the
+            #      browser that the submission is queued (and it could e.g. poll)
+            cmap.set(self.answer_id, queuestate=queuestate,
+                correctness='incomplete', msg=msg)
+
+        return cmap
+
+    def update_score(self, score_msg, oldcmap, queuekey):
+        log.debug(score_msg)
+        score_msg = self._parse_score_msg(score_msg)
+        if not score_msg.valid:
+            oldcmap.set(self.answer_id,
+                msg = 'Invalid grader reply. Please contact the course staff.')
+            return oldcmap
+
+        correctness = 'correct' if score_msg.correct else 'incorrect'
+
+        # TODO: Find out how this is used elsewhere, if any
+        self.context['correct'] = correctness
+
+        # Replace 'oldcmap' with new grading results if queuekey matches.  If queuekey
+        # does not match, we keep waiting for the score_msg whose key actually matches
+        if oldcmap.is_right_queuekey(self.answer_id, queuekey):
+            # Sanity check on returned points
+            points = score_msg.points
+            if points < 0:
+                points = 0
+
+            # Queuestate is consumed, so reset it to None
+            oldcmap.set(self.answer_id, npoints=points, correctness=correctness,
+                msg = score_msg.msg.replace('&nbsp;', '&#160;'), queuestate=None)
+        else:
+            log.debug('OpenEndedResponse: queuekey {0} does not match for answer_id={1}.'.format(
+                queuekey, self.answer_id))
+
+        return oldcmap
+
+
+    def get_answers(self):
+        anshtml = '<span class="openended-answer"><pre><code>{0}</code></pre></span>'.format(self.answer)
+        return {self.answer_id: anshtml}
+
+    def get_initial_display(self):
+        return {self.answer_id: self.initial_display}
+
+    def _convert_longform_feedback_to_html(self, response_items):
+        """
+        Take in a dictionary, and return html strings for display to student.
+        Input:
+            response_items: Dictionary with keys success, feedback.
+                if success is True, feedback should be a dictionary, with keys for
+                   types of feedback, and the corresponding feedback values.
+                if success is False, feedback is actually an error string.
+
+                NOTE: this will need to change when we integrate peer grading, because
+                that will have more complex feedback.
+
+        Output:
+            String -- html that can be displayed to the student.
+        """
+
+        # We want to display available feedback in a particular order.
+        # This dictionary specifies which goes first--lower first.
+        priorities = {# These go at the start of the feedback
+                      'spelling': 0,
+                      'grammar': 1,
+                      # needs to be after all the other feedback
+                      'markup_text': 3}
+
+        default_priority = 2
+
+        def get_priority(elt):
+            """
+            Args:
+                elt: a tuple of feedback-type, feedback
+            Returns:
+                the priority for this feedback type
+            """
+            return priorities.get(elt[0], default_priority)
+
+        def encode_values(feedback_type,value):
+            feedback_type=str(feedback_type).encode('ascii', 'ignore')
+            if not isinstance(value,basestring):
+                value=str(value)
+            value=value.encode('ascii', 'ignore')
+            return feedback_type,value
+
+        def format_feedback(feedback_type, value):
+            feedback_type,value=encode_values(feedback_type,value)
+            feedback= """
+            <div class="{feedback_type}">
+            {value}
+            </div>
+            """.format(feedback_type=feedback_type, value=value)
+            return feedback
+
+        def format_feedback_hidden(feedback_type , value):
+            feedback_type,value=encode_values(feedback_type,value)
+            feedback = """
+            <div class="{feedback_type}" style="display: none;">
+            {value}
+            </div>
+            """.format(feedback_type=feedback_type, value=value)
+            return feedback
+
+        # TODO (vshnayder): design and document the details of this format so
+        # that we can do proper escaping here (e.g. are the graders allowed to
+        # include HTML?)
+
+        for tag in ['success', 'feedback', 'submission_id', 'grader_id']:
+            if tag not in response_items:
+                return format_feedback('errors', 'Error getting feedback')
+
+        feedback_items = response_items['feedback']
+        try:
+            feedback = json.loads(feedback_items)
+        except (TypeError, ValueError):
+            log.exception("feedback_items have invalid json %r", feedback_items)
+            return format_feedback('errors', 'Could not parse feedback')
+
+        if response_items['success']:
+            if len(feedback) == 0:
+                return format_feedback('errors', 'No feedback available')
+
+            feedback_lst = sorted(feedback.items(), key=get_priority)
+            feedback_list_part1 = u"\n".join(format_feedback(k, v) for k, v in feedback_lst)
+        else:
+            feedback_list_part1 = format_feedback('errors', response_items['feedback'])
+
+        feedback_list_part2=(u"\n".join([format_feedback_hidden(feedback_type,value)
+                                         for feedback_type,value in response_items.items()
+                                         if feedback_type in ['submission_id', 'grader_id']]))
+
+        return u"\n".join([feedback_list_part1,feedback_list_part2])
+
+    def _format_feedback(self, response_items):
+        """
+        Input:
+            Dictionary called feedback.  Must contain keys seen below.
+        Output:
+            Return error message or feedback template
+        """
+
+        feedback = self._convert_longform_feedback_to_html(response_items)
+
+        if not response_items['success']:
+            return self.system.render_template("open_ended_error.html",
+                {'errors' : feedback})
+
+        feedback_template = self.system.render_template("open_ended_feedback.html", {
+            'grader_type': response_items['grader_type'],
+            'score': "{0} / {1}".format(response_items['score'], self.max_score),
+            'feedback': feedback,
+            })
+
+        return feedback_template
+
+
+    def _parse_score_msg(self, score_msg):
+        """
+         Grader reply is a JSON-dump of the following dict
+           { 'correct': True/False,
+             'score': Numeric value (floating point is okay) to assign to answer
+             'msg': grader_msg
+             'feedback' : feedback from grader
+             }
+
+        Returns (valid_score_msg, correct, score, msg):
+            valid_score_msg: Flag indicating valid score_msg format (Boolean)
+            correct:         Correctness of submission (Boolean)
+            score:           Points to be assigned (numeric, can be float)
+        """
+        fail = ScoreMessage(valid=False, correct=False, points=0, msg='')
+        try:
+            score_result = json.loads(score_msg)
+        except (TypeError, ValueError):
+            log.error("External grader message should be a JSON-serialized dict."
+                      " Received score_msg = {0}".format(score_msg))
+            return fail
+
+        if not isinstance(score_result, dict):
+            log.error("External grader message should be a JSON-serialized dict."
+                      " Received score_result = {0}".format(score_result))
+            return fail
+
+        for tag in ['score', 'feedback', 'grader_type', 'success', 'grader_id', 'submission_id']:
+            if tag not in score_result:
+                log.error("External grader message is missing required tag: {0}"
+                .format(tag))
+                return fail
+
+        feedback = self._format_feedback(score_result)
+        self.submission_id=score_result['submission_id']
+        self.grader_id=score_result['grader_id']
+
+        # HACK: for now, just assume it's correct if you got more than 2/3.
+        # Also assumes that score_result['score'] is an integer.
+        score_ratio = int(score_result['score']) / float(self.max_score)
+        correct = (score_ratio >= 0.66)
+
+        #Currently ignore msg and only return feedback (which takes the place of msg)
+        return ScoreMessage(valid=True, correct=correct,
+            points=score_result['score'], msg=feedback)
 
     def handle_ajax(self, dispatch, get):
         '''

From 54c763d8c46db40bdb1a416559b46821385e0c9d Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 12:19:39 -0500
Subject: [PATCH 072/541] set up template for open ended xmodule

---
 common/lib/capa/capa/inputtypes.py      |  2 +-
 common/lib/xmodule/open_ended_module.py | 62 +++++++++++++++++++++++--
 lms/templates/open_ended.html           | 56 ++++++++++++++++++++++
 3 files changed, 116 insertions(+), 4 deletions(-)
 create mode 100644 lms/templates/open_ended.html

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index e3eb47acc5..26c97ed907 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -742,7 +742,7 @@ class OpenEndedInput(InputTypeBase):
     etc.
     """
 
-    template = "openendedinput.html"
+    template =
     tags = ['openendedinput']
 
     # pulled out for testing
diff --git a/common/lib/xmodule/open_ended_module.py b/common/lib/xmodule/open_ended_module.py
index 0ce2007c21..d087b5310c 100644
--- a/common/lib/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/open_ended_module.py
@@ -200,7 +200,7 @@ class OpenEndedModule():
         event_info['problem_id'] = self.location.url()
         event_info['student_id'] = self.system.anonymous_student_id
         event_info['survey_responses']= get
-        
+
         survey_responses=event_info['survey_responses']
         for tag in ['feedback', 'submission_id', 'grader_id', 'score']:
             if tag not in survey_responses:
@@ -318,7 +318,7 @@ class OpenEndedModule():
 
         return cmap
 
-    def update_score(self, score_msg, oldcmap, queuekey):
+    def _update_score(self, score_msg, oldcmap, queuekey):
         log.debug(score_msg)
         score_msg = self._parse_score_msg(score_msg)
         if not score_msg.valid:
@@ -530,7 +530,6 @@ class OpenEndedModule():
             'problem_check': self.check_problem,
             'problem_reset': self.reset_problem,
             'problem_save': self.save_problem,
-            'problem_show': self.get_answer,
             'score_update': self.update_score,
             'message_post' : self.message_post,
             }
@@ -546,3 +545,60 @@ class OpenEndedModule():
             'progress_status': Progress.to_js_status_str(after),
             })
         return json.dumps(d, cls=ComplexEncoder)
+
+    def get_problem:
+        return {'html': self.get_problem_html(encapsulate=False)}
+
+    def check_problem:
+        pass
+
+    def reset_problem:
+        pass
+
+    def save_problem:
+        pass
+
+    def update_score:
+        """
+        Delivers grading response (e.g. from asynchronous code checking) to
+            the capa problem, so its score can be updated
+
+        'get' must have a field 'response' which is a string that contains the
+            grader's response
+
+        No ajax return is needed. Return empty dict.
+        """
+        queuekey = get['queuekey']
+        score_msg = get['xqueue_body']
+        #TODO: Remove need for cmap
+        self._update_score(score_msg, queuekey)
+
+        return dict()  # No AJAX return is needed
+
+    def get_html(self):
+        """
+        Implement special logic: handle queueing state, and default input.
+        """
+        # if no student input yet, then use the default input given by the problem
+        if not self.value:
+            self.value = self.xml.text
+
+        # Check if problem has been queued
+        self.queue_len = 0
+        # Flag indicating that the problem has been queued, 'msg' is length of queue
+        if self.status == 'incomplete':
+            self.status = 'queued'
+            self.queue_len = self.msg
+            self.msg = self.submitted_msg
+
+        context={'rows' : 30,
+                 'cols' : 80,
+                 'hidden' : '',
+                 }
+
+        html=self.system.render_template("openendedinput.html", context)
+
+    def _extra_context(self):
+        """Defined queue_len, add it """
+        return {'queue_len': self.queue_len,}
+
diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html
new file mode 100644
index 0000000000..c42ad73faf
--- /dev/null
+++ b/lms/templates/open_ended.html
@@ -0,0 +1,56 @@
+<section id="openended_${id}" class="openended">
+  <textarea rows="${rows}" cols="${cols}" name="input_${id}" class="short-form-response" id="input_${id}"
+       % if hidden:
+      	    style="display:none;"
+       % endif
+  >${value|h}</textarea>
+
+  <div class="grader-status">
+    % if status == 'unsubmitted':
+      <span class="unanswered" style="display:inline-block;" id="status_${id}">Unanswered</span>
+    % elif status == 'correct':
+      <span class="correct" id="status_${id}">Correct</span>
+    % elif status == 'incorrect':
+      <span class="incorrect" id="status_${id}">Incorrect</span>
+    % elif status == 'queued':
+      <span class="grading" id="status_${id}">Submitted for grading</span>
+    % endif
+
+    % if hidden:
+      <div style="display:none;" name="${hidden}" inputid="input_${id}" />
+    % endif
+  </div>
+
+  <span id="answer_${id}"></span>
+
+    % if status == 'queued':
+    <input name="reload" class="reload" type="button" value="Recheck for Feedback" onclick="document.location.reload(true);" />
+    % endif
+  <div class="external-grader-message">
+      ${msg|n}
+    % if status in ['correct','incorrect']:
+    <div class="collapsible evaluation-response">
+      <header>
+      <a href="#">Respond to Feedback</a>
+      </header>
+    <section id="evaluation_${id}" class="evaluation">
+    <p>How accurate do you find this feedback?</p>
+        <div class="evaluation-scoring">
+            <ul class="scoring-list">
+                <li><input type="radio" name="evaluation-score" id="evaluation-score-5" value="5" /> <label for="evaluation-score-5"> Correct</label></li>
+                <li><input type="radio" name="evaluation-score" id="evaluation-score-4" value="4" /> <label for="evaluation-score-4"> Partially Correct</label></li>
+                <li><input type="radio" name="evaluation-score" id="evaluation-score-3" value="3" /> <label for="evaluation-score-3"> No Opinion</label></li>
+                <li><input type="radio" name="evaluation-score" id="evaluation-score-2" value="2" /> <label for="evaluation-score-2"> Partially Incorrect</label></li>
+                <li><input type="radio" name="evaluation-score" id="evaluation-score-1" value="1" /> <label for="evaluation-score-1"> Incorrect</label></li>
+            </ul>
+        </div>
+        <p>Additional comments:</p>
+        <textarea rows="${rows}" cols="${cols}" name="feedback_${id}" class="feedback-on-feedback" id="feedback_${id}"></textarea>
+        <div class="submit-message-container">
+            <input name="submit-message" class="submit-message" type="button" value="Submit your message"/>
+        </div>
+    </section>
+    </div>
+    % endif
+  </div>
+</section>

From 56f5434bfdb2100e94e8c82424ccb92fe0552d1f Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 12:22:41 -0500
Subject: [PATCH 073/541] Initial html for open ended xmodule

---
 common/lib/xmodule/open_ended_module.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/common/lib/xmodule/open_ended_module.py b/common/lib/xmodule/open_ended_module.py
index d087b5310c..c86b18e639 100644
--- a/common/lib/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/open_ended_module.py
@@ -594,9 +594,14 @@ class OpenEndedModule():
         context={'rows' : 30,
                  'cols' : 80,
                  'hidden' : '',
+                 'id' : 'open_ended',
+                 'msg' : self.msg,
+                 'status' : self.status,
+                 'queue_len' : self.queue_len,
+                 'value' : self.value,
                  }
 
-        html=self.system.render_template("openendedinput.html", context)
+        html=self.system.render_template("open_ended.html", context)
 
     def _extra_context(self):
         """Defined queue_len, add it """

From 1b9deb881bafa3dd7be36a7b94e1771aea8cdbcf Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 12:29:24 -0500
Subject: [PATCH 074/541] Open ended descriptor

---
 common/lib/xmodule/open_ended_module.py | 100 +++++++++++++++++++++---
 1 file changed, 91 insertions(+), 9 deletions(-)

diff --git a/common/lib/xmodule/open_ended_module.py b/common/lib/xmodule/open_ended_module.py
index c86b18e639..6380dc16d8 100644
--- a/common/lib/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/open_ended_module.py
@@ -527,7 +527,6 @@ class OpenEndedModule():
         '''
         handlers = {
             'problem_get': self.get_problem,
-            'problem_check': self.check_problem,
             'problem_reset': self.reset_problem,
             'problem_save': self.save_problem,
             'score_update': self.update_score,
@@ -547,13 +546,12 @@ class OpenEndedModule():
         return json.dumps(d, cls=ComplexEncoder)
 
     def get_problem:
-        return {'html': self.get_problem_html(encapsulate=False)}
-
-    def check_problem:
-        pass
+        return self.get_html()
 
     def reset_problem:
-        pass
+        self.change_state(self.INITIAL)
+        return {'success': True}
+
 
     def save_problem:
         pass
@@ -602,8 +600,92 @@ class OpenEndedModule():
                  }
 
         html=self.system.render_template("open_ended.html", context)
+        return html
+
+    def change_state(self, new_state):
+            """
+            A centralized place for state changes--allows for hooks.  If the
+            current state matches the old state, don't run any hooks.
+            """
+        if self.state == new_state:
+            return
+
+        self.state = new_state
+
+        if self.state == self.DONE:
+            self.attempts += 1
+
+    def get_instance_state(self):
+        """
+        Get the current score and state
+        """
+
+        state = {
+            'version': self.STATE_VERSION,
+            'history': self.history,
+            'state': self.state,
+            'max_score': self._max_score,
+            'attempts': self.attempts,
+            }
+        return json.dumps(state)
+
+
+class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
+    """
+    Module for adding self assessment questions to courses
+    """
+    mako_template = "widgets/html-edit.html"
+    module_class = OpenEndedModule
+    filename_extension = "xml"
+
+    stores_state = True
+    has_score = True
+    template_dir_name = openended"
+
+    js = {'coffee': [resource_string(__name__, 'js/src/html/edit.coffee')]}
+    js_module_name = "HTMLEditingDescriptor"
+    expected_children = ['rubric', 'prompt', 'oeparam']
+
+    @classmethod
+    def definition_from_xml(cls, xml_object, system):
+        """
+        Pull out the rubric, prompt, and submitmessage into a dictionary.
+
+        Returns:
+        {
+        'rubric': 'some-html',
+        'prompt': 'some-html',
+        'submitmessage': 'some-html'
+        'hintprompt': 'some-html'
+        }
+        """
+
+        for child in self.expected_children:
+            if len(xml_object.xpath(child)) != 1:
+                raise ValueError("Open Ended definition must include exactly one '{0}' tag".format(child))
+
+        def parse(k):
+            """Assumes that xml_object has child k"""
+            return stringify_children(xml_object.xpath(k)[0])
+
+        return {'rubric': parse('rubric'),
+                'prompt': parse('prompt'),
+                'oeparam': parse('oeparam'),
+                }
+
+
+    def definition_to_xml(self, resource_fs):
+        '''Return an xml element representing this definition.'''
+        elt = etree.Element('openended')
+
+        def add_child(k):
+            child_str = '<{tag}>{body}</{tag}>'.format(tag=k, body=self.definition[k])
+            child_node = etree.fromstring(child_str)
+            elt.append(child_node)
+
+        for child in self.expected_children:
+            add_child(child)
+
+        return elt
 
-    def _extra_context(self):
-        """Defined queue_len, add it """
-        return {'queue_len': self.queue_len,}
 

From 9d3f8ed0e52a09ecdc02bdea4edac0679fac9a68 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 12:37:10 -0500
Subject: [PATCH 075/541] Support open ended in combined open ended module

---
 common/lib/capa/capa/inputtypes.py            |  2 +-
 .../xmodule/combined_open_ended_module.py     | 27 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index 26c97ed907..e3eb47acc5 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -742,7 +742,7 @@ class OpenEndedInput(InputTypeBase):
     etc.
     """
 
-    template =
+    template = "openendedinput.html"
     tags = ['openendedinput']
 
     # pulled out for testing
diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index f33439673c..e544ebe3ae 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -20,6 +20,7 @@ from .x_module import XModule
 from .xml_module import XmlDescriptor
 from xmodule.modulestore import Location
 import self_assessment_module
+import open_ended_module
 
 log = logging.getLogger("mitx.courseware")
 
@@ -120,6 +121,24 @@ class CombinedOpenEndedModule(XModule):
                 self.state=self.ASSESSING
             else:
                 self.current_task=self_assessment_module.SelfAssessmentModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
+        elif current_task_type=="openended":
+            self.current_task_descriptor=open_ended_module.OpenEndedDescriptor(self.system)
+            self.current_task_parsed_xml=self.current_task_descriptor.definition_from_xml(etree.fromstring(self.current_task_xml),self.system)
+            if current_task_state is None and self.current_task_number==0:
+                self.current_task=open_ended_module.OpenEndedModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor)
+                self.task_states.append(self.current_task.get_instance_state())
+                self.state=self.ASSESSING
+            elif current_task_state is None and self.current_task_number>0:
+                last_response, last_score=self.get_last_response(self.current_task_number-1)
+                current_task_state = ('{"state": "assessing", "version": 1, "max_score": ' + str(self._max_score) + ', ' +
+                                      '"attempts": 0, "history": [{"answer": "' + str(last_response) + '"}]}')
+                {"state": "done", "version": 1, "max_score": 1, "attempts": 1, "history": [{"answer": "gdgddg", "score": 0, "hint": "dfdfdf"}]}
+                self.current_task=open_ended_module.OpenEndedModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
+                self.task_states.append(self.current_task.get_instance_state())
+                self.state=self.ASSESSING
+            else:
+                self.current_task=open_ended_module.OpenEndedModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
+
 
         return True
 
@@ -158,6 +177,12 @@ class CombinedOpenEndedModule(XModule):
             task=self_assessment_module.SelfAssessmentModule(self.system, self.location, task_parsed_xml, task_descriptor, instance_state=task_state)
             last_response=task.latest_answer()
             last_score = task.latest_score()
+        elif task_type=="openended":
+            task_descriptor=open_ended_module.OpenEndedDescriptor(self.system)
+            task_parsed_xml=task_descriptor.definition_from_xml(etree.fromstring(task_xml),self.system)
+            task=open_ended_module.OpenEndedModule(self.system, self.location, task_parsed_xml, task_descriptor, instance_state=task_state)
+            last_response=task.latest_answer()
+            last_score = task.latest_score()
 
         return last_response, last_score
 
@@ -291,7 +316,7 @@ class CombinedOpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
 
     def definition_to_xml(self, resource_fs):
         '''Return an xml element representing this definition.'''
-        elt = etree.Element('selfassessment')
+        elt = etree.Element('combinedopenended')
 
         def add_child(k):
             child_str = '<{tag}>{body}</{tag}>'.format(tag=k, body=self.definition[k])

From dabb5ee758f32ffa45164fe252a7733a397fd37b Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 12:38:56 -0500
Subject: [PATCH 076/541] fix tab issue

---
 common/lib/xmodule/open_ended_module.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/common/lib/xmodule/open_ended_module.py b/common/lib/xmodule/open_ended_module.py
index 6380dc16d8..163c518444 100644
--- a/common/lib/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/open_ended_module.py
@@ -250,8 +250,7 @@ class OpenEndedModule():
 
         return success, "Successfully submitted your feedback."
 
-        def get_score(self, student_answers):
-
+    def get_score(self, student_answers):
         try:
             submission = student_answers[self.answer_id]
         except KeyError:

From 0e81f916e1a06710ec70502419b392a38fed034a Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 12:42:25 -0500
Subject: [PATCH 077/541] Move open ended module file

---
 .../xmodule/combined_open_ended_module.py     |  4 ++--
 .../{ => xmodule}/open_ended_module.py        | 19 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)
 rename common/lib/xmodule/{ => xmodule}/open_ended_module.py (98%)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index e544ebe3ae..9218de1baf 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -12,6 +12,7 @@ import sys
 from pkg_resources import resource_string
 
 from .capa_module import only_one, ComplexEncoder
+from common.lib.xmodule.xmodule import open_ended_module
 from .editing_module import EditingDescriptor
 from .html_checker import check_html
 from progress import Progress
@@ -20,7 +21,6 @@ from .x_module import XModule
 from .xml_module import XmlDescriptor
 from xmodule.modulestore import Location
 import self_assessment_module
-import open_ended_module
 
 log = logging.getLogger("mitx.courseware")
 
@@ -122,7 +122,7 @@ class CombinedOpenEndedModule(XModule):
             else:
                 self.current_task=self_assessment_module.SelfAssessmentModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
         elif current_task_type=="openended":
-            self.current_task_descriptor=open_ended_module.OpenEndedDescriptor(self.system)
+            self.current_task_descriptor= open_ended_module.OpenEndedDescriptor(self.system)
             self.current_task_parsed_xml=self.current_task_descriptor.definition_from_xml(etree.fromstring(self.current_task_xml),self.system)
             if current_task_state is None and self.current_task_number==0:
                 self.current_task=open_ended_module.OpenEndedModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor)
diff --git a/common/lib/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
similarity index 98%
rename from common/lib/xmodule/open_ended_module.py
rename to common/lib/xmodule/xmodule/open_ended_module.py
index 163c518444..f5d6cbf8b5 100644
--- a/common/lib/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -544,18 +544,17 @@ class OpenEndedModule():
             })
         return json.dumps(d, cls=ComplexEncoder)
 
-    def get_problem:
+    def get_problem(self, get):
         return self.get_html()
 
-    def reset_problem:
+    def reset_problem(self, get):
         self.change_state(self.INITIAL)
         return {'success': True}
 
-
-    def save_problem:
+    def save_problem(self, get):
         pass
 
-    def update_score:
+    def update_score(self, get):
         """
         Delivers grading response (e.g. from asynchronous code checking) to
             the capa problem, so its score can be updated
@@ -602,10 +601,10 @@ class OpenEndedModule():
         return html
 
     def change_state(self, new_state):
-            """
-            A centralized place for state changes--allows for hooks.  If the
-            current state matches the old state, don't run any hooks.
-            """
+        """
+        A centralized place for state changes--allows for hooks.  If the
+        current state matches the old state, don't run any hooks.
+        """
         if self.state == new_state:
             return
 
@@ -639,7 +638,7 @@ class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
 
     stores_state = True
     has_score = True
-    template_dir_name = openended"
+    template_dir_name = "openended"
 
     js = {'coffee': [resource_string(__name__, 'js/src/html/edit.coffee')]}
     js_module_name = "HTMLEditingDescriptor"

From 480978cf3439f3a54ccbdea1f85c38456d14e3ba Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 12:45:33 -0500
Subject: [PATCH 078/541] Fix invalid import statement

---
 common/lib/xmodule/xmodule/combined_open_ended_module.py | 2 +-
 common/lib/xmodule/xmodule/open_ended_module.py          | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 9218de1baf..6692dd4947 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -12,7 +12,6 @@ import sys
 from pkg_resources import resource_string
 
 from .capa_module import only_one, ComplexEncoder
-from common.lib.xmodule.xmodule import open_ended_module
 from .editing_module import EditingDescriptor
 from .html_checker import check_html
 from progress import Progress
@@ -21,6 +20,7 @@ from .x_module import XModule
 from .xml_module import XmlDescriptor
 from xmodule.modulestore import Location
 import self_assessment_module
+import open_ended_module
 
 log = logging.getLogger("mitx.courseware")
 
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index f5d6cbf8b5..5e8a4b3bec 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -57,8 +57,6 @@ class OpenEndedModule():
 
     DEFAULT_QUEUE = 'open-ended'
     DEFAULT_MESSAGE_QUEUE = 'open-ended-message'
-    response_tag = 'openendedresponse'
-    allowed_inputfields = ['openendedinput']
     max_inputfields = 1
 
     STATE_VERSION = 1

From e9d24ad742be1f5ca71c50565a4cb11a41afa27c Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 12:48:51 -0500
Subject: [PATCH 079/541] Fix descriptor

---
 common/lib/xmodule/xmodule/open_ended_module.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 5e8a4b3bec..2ccb89f2cb 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -640,7 +640,6 @@ class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
 
     js = {'coffee': [resource_string(__name__, 'js/src/html/edit.coffee')]}
     js_module_name = "HTMLEditingDescriptor"
-    expected_children = ['rubric', 'prompt', 'oeparam']
 
     @classmethod
     def definition_from_xml(cls, xml_object, system):
@@ -656,7 +655,7 @@ class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
         }
         """
 
-        for child in self.expected_children:
+        for child in ['rubric', 'prompt', 'oeparam']:
             if len(xml_object.xpath(child)) != 1:
                 raise ValueError("Open Ended definition must include exactly one '{0}' tag".format(child))
 
@@ -679,7 +678,7 @@ class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
             child_node = etree.fromstring(child_str)
             elt.append(child_node)
 
-        for child in self.expected_children:
+        for child in ['rubric', 'prompt', 'oeparam']:
             add_child(child)
 
         return elt

From 7351317c8ed732327360ec1a58daceeca789c4e8 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 12:51:24 -0500
Subject: [PATCH 080/541] Fix tag naming

---
 common/lib/xmodule/xmodule/open_ended_module.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 2ccb89f2cb..d6de77d5f4 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -655,7 +655,7 @@ class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
         }
         """
 
-        for child in ['rubric', 'prompt', 'oeparam']:
+        for child in ['openendedrubric', 'prompt', 'openendedparam']:
             if len(xml_object.xpath(child)) != 1:
                 raise ValueError("Open Ended definition must include exactly one '{0}' tag".format(child))
 
@@ -663,9 +663,9 @@ class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
             """Assumes that xml_object has child k"""
             return stringify_children(xml_object.xpath(k)[0])
 
-        return {'rubric': parse('rubric'),
+        return {'rubric': parse('openendedrubric'),
                 'prompt': parse('prompt'),
-                'oeparam': parse('oeparam'),
+                'oeparam': parse('openendedparam'),
                 }
 
 
@@ -678,7 +678,7 @@ class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
             child_node = etree.fromstring(child_str)
             elt.append(child_node)
 
-        for child in ['rubric', 'prompt', 'oeparam']:
+        for child in ['openendedrubric', 'prompt', 'openendedparam']:
             add_child(child)
 
         return elt

From 6e7dae4f670a51c96018a0b41d8e2b25e0b98f4f Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 12:53:12 -0500
Subject: [PATCH 081/541] Naming bugfixes

---
 common/lib/xmodule/xmodule/open_ended_module.py      | 4 +---
 common/lib/xmodule/xmodule/self_assessment_module.py | 4 +++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index d6de77d5f4..4768f53656 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -105,8 +105,6 @@ class OpenEndedModule():
         else:
             instance_state = {}
 
-        instance_state = self.convert_state_to_current_format(instance_state)
-
         # History is a list of tuples of (answer, score, hint), where hint may be
         # None for any element, and score and hint can be None for the last (current)
         # element.
@@ -122,7 +120,7 @@ class OpenEndedModule():
         # completion (doesn't matter if you self-assessed correct/incorrect).
         self._max_score = int(instance_state.get('max_score', MAX_SCORE))
 
-        oeparam = definition['openendedparam']
+        oeparam = definition['oeparam']
         prompt = definition['prompt']
         rubric = definition['rubric']
 
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index 1b10fab9ac..64cf140d38 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -99,7 +99,9 @@ class SelfAssessmentModule():
         else:
             instance_state = {}
 
-        # History is a list of tuples of (answer, score, feedback), where hint may be
+        instance_state = self.convert_state_to_current_format(instance_state)
+
+        # History is a list of tuples of (answer, score, hint), where hint may be
         # None for any element, and score and hint can be None for the last (current)
         # element.
         # Scores are on scale from 0 to max_score

From 2891ea4bff3378ea02b01efbf33caad4637be5cc Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 13:03:09 -0500
Subject: [PATCH 082/541] Convert away from self.system to just using system

---
 .../lib/xmodule/xmodule/open_ended_module.py  | 59 ++++++++++---------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 4768f53656..3da03520ab 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -28,6 +28,7 @@ from .stringify import stringify_children
 from .x_module import XModule
 from .xml_module import XmlDescriptor
 from xmodule.modulestore import Location
+from capa.util import *
 
 log = logging.getLogger("mitx.courseware")
 
@@ -139,9 +140,9 @@ class OpenEndedModule():
         if rubric is None:
             raise ValueError("No rubric found in problem xml.")
 
-        self._parse(oeparam, prompt, rubric)
+        self._parse(oeparam, prompt, rubric, system)
 
-    def _parse(self, oeparam, prompt, rubric):
+    def _parse(self, oeparam, prompt, rubric, system):
         '''
         Parse OpenEndedResponse XML:
             self.initial_display
@@ -151,8 +152,8 @@ class OpenEndedModule():
             self.answer - What to display when show answer is clicked
         '''
         # Note that OpenEndedResponse is agnostic to the specific contents of grader_payload
-        prompt_string = self.stringify_children(prompt)
-        rubric_string = self.stringify_children(rubric)
+        prompt_string = stringify_children(prompt)
+        rubric_string = stringify_children(rubric)
 
         grader_payload = oeparam.find('grader_payload')
         grader_payload = grader_payload.text if grader_payload is not None else ''
@@ -170,8 +171,8 @@ class OpenEndedModule():
         self.answer = find_with_default(oeparam, 'answer_display', 'No answer given.')
 
         parsed_grader_payload.update({
-            'location' : self.system.location,
-            'course_id' : self.system.course_id,
+            'location' : system.location,
+            'course_id' : system.course_id,
             'prompt' : prompt_string,
             'rubric' : rubric_string,
             'initial_display' : self.initial_display,
@@ -186,15 +187,15 @@ class OpenEndedModule():
         except ValueError:
             self.max_score = 1
 
-    def handle_message_post(self,get):
+    def handle_message_post(self,get, system):
         """
         Handles a student message post (a reaction to the grade they received from an open ended grader type)
         Returns a boolean success/fail and an error message
         """
 
         event_info = dict()
-        event_info['problem_id'] = self.location.url()
-        event_info['student_id'] = self.system.anonymous_student_id
+        event_info['problem_id'] = system.location.url()
+        event_info['student_id'] = system.anonymous_student_id
         event_info['survey_responses']= get
 
         survey_responses=event_info['survey_responses']
@@ -212,15 +213,15 @@ class OpenEndedModule():
             log.exception(error_message)
             return False, "There was an error saving your feedback.  Please contact course staff."
 
-        qinterface = self.system.xqueue['interface']
+        qinterface = system.xqueue['interface']
         qtime = datetime.strftime(datetime.now(), xqueue_interface.dateformat)
-        anonymous_student_id = self.system.anonymous_student_id
-        queuekey = xqueue_interface.make_hashkey(str(self.system.seed) + qtime +
+        anonymous_student_id = system.anonymous_student_id
+        queuekey = xqueue_interface.make_hashkey(str(system.seed) + qtime +
                                                  anonymous_student_id +
                                                  self.answer_id)
 
         xheader = xqueue_interface.make_xheader(
-            lms_callback_url=self.system.xqueue['callback_url'],
+            lms_callback_url=system.xqueue['callback_url'],
             lms_key=queuekey,
             queue_name=self.message_queue_name
         )
@@ -246,7 +247,7 @@ class OpenEndedModule():
 
         return success, "Successfully submitted your feedback."
 
-    def get_score(self, student_answers):
+    def get_score(self, student_answers, system):
         try:
             submission = student_answers[self.answer_id]
         except KeyError:
@@ -258,17 +259,17 @@ class OpenEndedModule():
         # Prepare xqueue request
         #------------------------------------------------------------
 
-        qinterface = self.system.xqueue['interface']
+        qinterface = system.xqueue['interface']
         qtime = datetime.strftime(datetime.now(), xqueue_interface.dateformat)
 
-        anonymous_student_id = self.system.anonymous_student_id
+        anonymous_student_id = system.anonymous_student_id
 
         # Generate header
-        queuekey = xqueue_interface.make_hashkey(str(self.system.seed) + qtime +
+        queuekey = xqueue_interface.make_hashkey(str(system.seed) + qtime +
                                                  anonymous_student_id +
                                                  self.answer_id)
 
-        xheader = xqueue_interface.make_xheader(lms_callback_url=self.system.xqueue['callback_url'],
+        xheader = xqueue_interface.make_xheader(lms_callback_url=system.xqueue['callback_url'],
             lms_key=queuekey,
             queue_name=self.queue_name)
 
@@ -510,7 +511,7 @@ class OpenEndedModule():
         return ScoreMessage(valid=True, correct=correct,
             points=score_result['score'], msg=feedback)
 
-    def handle_ajax(self, dispatch, get):
+    def handle_ajax(self, dispatch, get, system):
         '''
         This is called by courseware.module_render, to handle an AJAX call.
         "get" is request.POST.
@@ -532,7 +533,7 @@ class OpenEndedModule():
             return 'Error'
 
         before = self.get_progress()
-        d = handlers[dispatch](get)
+        d = handlers[dispatch](get, system)
         after = self.get_progress()
         d.update({
             'progress_changed': after != before,
@@ -540,17 +541,17 @@ class OpenEndedModule():
             })
         return json.dumps(d, cls=ComplexEncoder)
 
-    def get_problem(self, get):
-        return self.get_html()
+    def get_problem(self, get, system):
+        return self.get_html(system)
 
-    def reset_problem(self, get):
+    def reset_problem(self, get, system):
         self.change_state(self.INITIAL)
         return {'success': True}
 
-    def save_problem(self, get):
+    def save_problem(self, get, system):
         pass
 
-    def update_score(self, get):
+    def update_score(self, get, system):
         """
         Delivers grading response (e.g. from asynchronous code checking) to
             the capa problem, so its score can be updated
@@ -563,11 +564,11 @@ class OpenEndedModule():
         queuekey = get['queuekey']
         score_msg = get['xqueue_body']
         #TODO: Remove need for cmap
-        self._update_score(score_msg, queuekey)
+        self._update_score(score_msg, queuekey, system)
 
         return dict()  # No AJAX return is needed
 
-    def get_html(self):
+    def get_html(self, system):
         """
         Implement special logic: handle queueing state, and default input.
         """
@@ -593,7 +594,7 @@ class OpenEndedModule():
                  'value' : self.value,
                  }
 
-        html=self.system.render_template("open_ended.html", context)
+        html=system.render_template("open_ended.html", context)
         return html
 
     def change_state(self, new_state):
@@ -659,7 +660,7 @@ class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
 
         def parse(k):
             """Assumes that xml_object has child k"""
-            return stringify_children(xml_object.xpath(k)[0])
+            return xml_object.xpath(k)[0]
 
         return {'rubric': parse('openendedrubric'),
                 'prompt': parse('prompt'),

From a5eec6d60b609ba059b1b871a541d2cb034d1da2 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 13:07:12 -0500
Subject: [PATCH 083/541] set location in system

---
 common/lib/xmodule/xmodule/combined_open_ended_module.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 6692dd4947..f5014af948 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -75,6 +75,7 @@ class CombinedOpenEndedModule(XModule):
         # None for any element, and score and hint can be None for the last (current)
         # element.
         # Scores are on scale from 0 to max_score
+        system.set('location', location)
         self.current_task_number = instance_state.get('current_task_number', 0)
         self.task_states= instance_state.get('task_states', [])
 

From ef27788cf5cdf784f746a1dbf787f2872bf845cd Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 13:14:58 -0500
Subject: [PATCH 084/541] Initial display for open ended problem

---
 .../lib/xmodule/xmodule/open_ended_module.py  | 50 +++++++++++++++----
 lms/templates/open_ended.html                 | 10 ++--
 2 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 3da03520ab..8edf7e0828 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -573,25 +573,26 @@ class OpenEndedModule():
         Implement special logic: handle queueing state, and default input.
         """
         # if no student input yet, then use the default input given by the problem
-        if not self.value:
-            self.value = self.xml.text
+        latest_answer=self.latest_answer()
+        if latest_answer is None:
+            value = self.initial_display
 
         # Check if problem has been queued
         self.queue_len = 0
         # Flag indicating that the problem has been queued, 'msg' is length of queue
-        if self.status == 'incomplete':
-            self.status = 'queued'
-            self.queue_len = self.msg
-            self.msg = self.submitted_msg
+        if self.state == self.ASSESSING:
+            #self.queue_len = self.msg
+            #self.msg = self.submitted_msg
+            pass
 
         context={'rows' : 30,
                  'cols' : 80,
                  'hidden' : '',
                  'id' : 'open_ended',
-                 'msg' : self.msg,
-                 'status' : self.status,
+                 'msg' : "This is a message",
+                 'state' : self.state,
                  'queue_len' : self.queue_len,
-                 'value' : self.value,
+                 'value' : value,
                  }
 
         html=system.render_template("open_ended.html", context)
@@ -624,6 +625,37 @@ class OpenEndedModule():
             }
         return json.dumps(state)
 
+    def latest_answer(self):
+        """None if not available"""
+        if not self.history:
+            return None
+        return self.history[-1].get('answer')
+
+    def latest_score(self):
+        """None if not available"""
+        if not self.history:
+            return None
+        return self.history[-1].get('score')
+
+    def latest_hint(self):
+        """None if not available"""
+        if not self.history:
+            return None
+        return self.history[-1].get('hint')
+
+    def new_history_entry(self, answer):
+        self.history.append({'answer': answer})
+
+    def record_latest_score(self, score):
+        """Assumes that state is right, so we're adding a score to the latest
+        history element"""
+        self.history[-1]['score'] = score
+
+    def record_latest_hint(self, hint):
+        """Assumes that state is right, so we're adding a score to the latest
+        history element"""
+        self.history[-1]['hint'] = hint
+
 
 class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
     """
diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html
index c42ad73faf..a6ffc684da 100644
--- a/lms/templates/open_ended.html
+++ b/lms/templates/open_ended.html
@@ -1,4 +1,4 @@
-<section id="openended_${id}" class="openended">
+<section id="openended_${id}" class="openended" data-state="${state}">
   <textarea rows="${rows}" cols="${cols}" name="input_${id}" class="short-form-response" id="input_${id}"
        % if hidden:
       	    style="display:none;"
@@ -6,13 +6,13 @@
   >${value|h}</textarea>
 
   <div class="grader-status">
-    % if status == 'unsubmitted':
+    % if state == 'initial':
       <span class="unanswered" style="display:inline-block;" id="status_${id}">Unanswered</span>
-    % elif status == 'correct':
+    % elif state == 'done':
       <span class="correct" id="status_${id}">Correct</span>
-    % elif status == 'incorrect':
+    % elif state == 'incorrect':
       <span class="incorrect" id="status_${id}">Incorrect</span>
-    % elif status == 'queued':
+    % elif state == 'assessing':
       <span class="grading" id="status_${id}">Submitted for grading</span>
     % endif
 

From 6a5352620cf1aad9645384fa780fd5e96a8535a6 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 13:20:51 -0500
Subject: [PATCH 085/541] Fix display errors

---
 .../lib/xmodule/xmodule/open_ended_module.py  | 83 ++++++++++++-------
 lms/templates/open_ended.html                 |  2 +-
 2 files changed, 54 insertions(+), 31 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 8edf7e0828..bce571ebfc 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -154,6 +154,7 @@ class OpenEndedModule():
         # Note that OpenEndedResponse is agnostic to the specific contents of grader_payload
         prompt_string = stringify_children(prompt)
         rubric_string = stringify_children(rubric)
+        self.prompt=prompt_string
 
         grader_payload = oeparam.find('grader_payload')
         grader_payload = grader_payload.text if grader_payload is not None else ''
@@ -568,36 +569,6 @@ class OpenEndedModule():
 
         return dict()  # No AJAX return is needed
 
-    def get_html(self, system):
-        """
-        Implement special logic: handle queueing state, and default input.
-        """
-        # if no student input yet, then use the default input given by the problem
-        latest_answer=self.latest_answer()
-        if latest_answer is None:
-            value = self.initial_display
-
-        # Check if problem has been queued
-        self.queue_len = 0
-        # Flag indicating that the problem has been queued, 'msg' is length of queue
-        if self.state == self.ASSESSING:
-            #self.queue_len = self.msg
-            #self.msg = self.submitted_msg
-            pass
-
-        context={'rows' : 30,
-                 'cols' : 80,
-                 'hidden' : '',
-                 'id' : 'open_ended',
-                 'msg' : "This is a message",
-                 'state' : self.state,
-                 'queue_len' : self.queue_len,
-                 'value' : value,
-                 }
-
-        html=system.render_template("open_ended.html", context)
-        return html
-
     def change_state(self, new_state):
         """
         A centralized place for state changes--allows for hooks.  If the
@@ -656,6 +627,58 @@ class OpenEndedModule():
         history element"""
         self.history[-1]['hint'] = hint
 
+    def _allow_reset(self):
+        """Can the module be reset?"""
+        return self.state == self.DONE and self.attempts < self.max_attempts
+
+    def get_html(self, system):
+        #set context variables and render template
+        if self.state != self.INITIAL:
+            latest = self.latest_answer()
+            previous_answer = latest if latest is not None else ''
+        else:
+            previous_answer = ''
+
+        context = {
+            'prompt': self.prompt,
+            'previous_answer': previous_answer,
+            'state': self.state,
+            'allow_reset': self._allow_reset(),
+            'rows' : 30,
+            'cols' : 80,
+            'hidden' : '',
+            'id' : 'open_ended',
+            }
+
+        html = system.render_template('open_ended.html', context)
+        return html
+
+    def max_score(self):
+        """
+        Return max_score
+        """
+        return self._max_score
+
+    def get_score(self):
+        """
+        Returns the last score in the list
+        """
+        score = self.latest_score()
+        return {'score': score if score is not None else 0,
+                'total': self._max_score}
+
+    def get_progress(self):
+        '''
+        For now, just return last score / max_score
+        '''
+        if self._max_score > 0:
+            try:
+                return Progress(self.get_score()['score'], self._max_score)
+            except Exception as err:
+                log.exception("Got bad progress")
+                return None
+        return None
+
 
 class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
     """
diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html
index a6ffc684da..a3e148d36b 100644
--- a/lms/templates/open_ended.html
+++ b/lms/templates/open_ended.html
@@ -1,4 +1,4 @@
-<section id="openended_${id}" class="openended" data-state="${state}">
+<section id="openended_${id}" class="open-ended-child" data-state="${state}">
   <textarea rows="${rows}" cols="${cols}" name="input_${id}" class="short-form-response" id="input_${id}"
        % if hidden:
       	    style="display:none;"

From c04455c546dea68556b0db967aebdfd6d6574950 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 13:30:33 -0500
Subject: [PATCH 086/541] Fix html display

---
 common/lib/xmodule/xmodule/open_ended_module.py | 5 +++--
 lms/templates/open_ended.html                   | 9 ++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index bce571ebfc..b8f3bf8278 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -635,9 +635,9 @@ class OpenEndedModule():
         #set context variables and render template
         if self.state != self.INITIAL:
             latest = self.latest_answer()
-            previous_answer = latest if latest is not None else ''
+            previous_answer = latest if latest is not None else self.initial_display
         else:
-            previous_answer = ''
+            previous_answer = self.initial_display
 
         context = {
             'prompt': self.prompt,
@@ -648,6 +648,7 @@ class OpenEndedModule():
             'cols' : 80,
             'hidden' : '',
             'id' : 'open_ended',
+            'msg' : "",
             }
 
         html = system.render_template('open_ended.html', context)
diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html
index a3e148d36b..3456b61068 100644
--- a/lms/templates/open_ended.html
+++ b/lms/templates/open_ended.html
@@ -1,9 +1,10 @@
 <section id="openended_${id}" class="open-ended-child" data-state="${state}">
+    ${prompt|n}
   <textarea rows="${rows}" cols="${cols}" name="input_${id}" class="short-form-response" id="input_${id}"
        % if hidden:
       	    style="display:none;"
        % endif
-  >${value|h}</textarea>
+  >${previous_answer|h}</textarea>
 
   <div class="grader-status">
     % if state == 'initial':
@@ -21,14 +22,16 @@
     % endif
   </div>
 
+  <input type="button" value="Submit" class="submit-button" name="show"/>
+    
   <span id="answer_${id}"></span>
 
-    % if status == 'queued':
+    % if state == 'assessing':
     <input name="reload" class="reload" type="button" value="Recheck for Feedback" onclick="document.location.reload(true);" />
     % endif
   <div class="external-grader-message">
       ${msg|n}
-    % if status in ['correct','incorrect']:
+    % if state == 'done':
     <div class="collapsible evaluation-response">
       <header>
       <a href="#">Respond to Feedback</a>

From a4ad7800ed7b195019e5d05d9acfb3275b266b40 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 13:51:15 -0500
Subject: [PATCH 087/541] Add proper queue handling

---
 .../lib/xmodule/xmodule/open_ended_module.py  | 48 ++++++++-----------
 lms/templates/open_ended.html                 |  2 +-
 2 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index b8f3bf8278..9b1b3463c1 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -188,7 +188,7 @@ class OpenEndedModule():
         except ValueError:
             self.max_score = 1
 
-    def handle_message_post(self,get, system):
+    def message_post(self,get, system):
         """
         Handles a student message post (a reaction to the grade they received from an open ended grader type)
         Returns a boolean success/fail and an error message
@@ -248,14 +248,7 @@ class OpenEndedModule():
 
         return success, "Successfully submitted your feedback."
 
-    def get_score(self, student_answers, system):
-        try:
-            submission = student_answers[self.answer_id]
-        except KeyError:
-            msg = ('Cannot get student answer for answer_id: {0}. student_answers {1}'
-                   .format(self.answer_id, student_answers))
-            log.exception(msg)
-            raise LoncapaProblemError(msg)
+    def get_score(self, submission, system):
 
         # Prepare xqueue request
         #------------------------------------------------------------
@@ -297,23 +290,7 @@ class OpenEndedModule():
         # State associated with the queueing request
         queuestate = {'key': queuekey,
                       'time': qtime,}
-
-        cmap = CorrectMap()
-        if error:
-            cmap.set(self.answer_id, queuestate=None,
-                msg='Unable to deliver your submission to grader. (Reason: {0}.)'
-                    ' Please try again later.'.format(msg))
-        else:
-            # Queueing mechanism flags:
-            #   1) Backend: Non-null CorrectMap['queuestate'] indicates that
-            #      the problem has been queued
-            #   2) Frontend: correctness='incomplete' eventually trickles down
-            #      through inputtypes.textbox and .filesubmission to inform the
-            #      browser that the submission is queued (and it could e.g. poll)
-            cmap.set(self.answer_id, queuestate=queuestate,
-                correctness='incomplete', msg=msg)
-
-        return cmap
+        return True
 
     def _update_score(self, score_msg, oldcmap, queuekey):
         log.debug(score_msg)
@@ -550,7 +527,24 @@ class OpenEndedModule():
         return {'success': True}
 
     def save_problem(self, get, system):
-        pass
+        if self.attempts > self.max_attempts:
+            # If too many attempts, prevent student from saving answer and
+            # seeing rubric.  In normal use, students shouldn't see this because
+            # they won't see the reset button once they're out of attempts.
+            return {
+                'success': False,
+                'error': 'Too many attempts.'
+            }
+
+        if self.state != self.INITIAL:
+            return self.out_of_sync_error(get)
+
+        # add new history element with answer and empty score and hint.
+        self.new_history_entry(get['student_answer'])
+        self.get_score(get['student_answer'], system)
+        self.change_state(self.ASSESSING)
+
+        return {'success': True,}
 
     def update_score(self, get, system):
         """
diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html
index 3456b61068..876d9a5ca1 100644
--- a/lms/templates/open_ended.html
+++ b/lms/templates/open_ended.html
@@ -23,7 +23,7 @@
   </div>
 
   <input type="button" value="Submit" class="submit-button" name="show"/>
-    
+
   <span id="answer_${id}"></span>
 
     % if state == 'assessing':

From fc02e7e2692c4aa37ebeaf38003e31ee0f83dd1c Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 14:00:15 -0500
Subject: [PATCH 088/541] Working on bugfixing

---
 common/lib/xmodule/xmodule/open_ended_module.py | 17 ++++++-----------
 lms/templates/open_ended.html                   |  8 ++++++--
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 9b1b3463c1..3dc4a787d5 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -30,6 +30,8 @@ from .xml_module import XmlDescriptor
 from xmodule.modulestore import Location
 from capa.util import *
 
+from datetime import datetime
+
 log = logging.getLogger("mitx.courseware")
 
 # Set the default number of max attempts.  Should be 1 for production
@@ -261,7 +263,7 @@ class OpenEndedModule():
         # Generate header
         queuekey = xqueue_interface.make_hashkey(str(system.seed) + qtime +
                                                  anonymous_student_id +
-                                                 self.answer_id)
+                                                 1)
 
         xheader = xqueue_interface.make_xheader(lms_callback_url=system.xqueue['callback_url'],
             lms_key=queuekey,
@@ -499,10 +501,11 @@ class OpenEndedModule():
           'progress' : 'none'/'in_progress'/'done',
           <other request-specific values here > }
         '''
+        log.debug(get)
         handlers = {
             'problem_get': self.get_problem,
             'problem_reset': self.reset_problem,
-            'problem_save': self.save_problem,
+            'save_answer': self.save_answer,
             'score_update': self.update_score,
             'message_post' : self.message_post,
             }
@@ -526,7 +529,7 @@ class OpenEndedModule():
         self.change_state(self.INITIAL)
         return {'success': True}
 
-    def save_problem(self, get, system):
+    def save_answer(self, get, system):
         if self.attempts > self.max_attempts:
             # If too many attempts, prevent student from saving answer and
             # seeing rubric.  In normal use, students shouldn't see this because
@@ -654,14 +657,6 @@ class OpenEndedModule():
         """
         return self._max_score
 
-    def get_score(self):
-        """
-        Returns the last score in the list
-        """
-        score = self.latest_score()
-        return {'score': score if score is not None else 0,
-                'total': self._max_score}
-
     def get_progress(self):
         '''
         For now, just return last score / max_score
diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html
index 876d9a5ca1..d682de5291 100644
--- a/lms/templates/open_ended.html
+++ b/lms/templates/open_ended.html
@@ -1,12 +1,16 @@
 <section id="openended_${id}" class="open-ended-child" data-state="${state}">
+
+   <div class="error"></div>
+   <div class="prompt">
     ${prompt|n}
-  <textarea rows="${rows}" cols="${cols}" name="input_${id}" class="short-form-response" id="input_${id}"
+   </prompt>
+  <textarea rows="${rows}" cols="${cols}" name="answer" class="answer short-form-response" id="input_${id}"
        % if hidden:
       	    style="display:none;"
        % endif
   >${previous_answer|h}</textarea>
 
-  <div class="grader-status">
+  <div class="message-wrapper">
     % if state == 'initial':
       <span class="unanswered" style="display:inline-block;" id="status_${id}">Unanswered</span>
     % elif state == 'done':

From 825821ae885b178e1a70a481385356358e786d8f Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 14:05:34 -0500
Subject: [PATCH 089/541] Fix key generation

---
 common/lib/xmodule/xmodule/open_ended_module.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 3dc4a787d5..fbd0662a63 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -263,14 +263,12 @@ class OpenEndedModule():
         # Generate header
         queuekey = xqueue_interface.make_hashkey(str(system.seed) + qtime +
                                                  anonymous_student_id +
-                                                 1)
+                                                 str(len(self.history)))
 
         xheader = xqueue_interface.make_xheader(lms_callback_url=system.xqueue['callback_url'],
             lms_key=queuekey,
             queue_name=self.queue_name)
 
-        self.context.update({'submission': submission})
-
         contents = self.payload.copy()
 
         # Metadata related to the student submission revealed to the external grader
@@ -657,13 +655,21 @@ class OpenEndedModule():
         """
         return self._max_score
 
+    def get_score_value(self):
+        """
+        Returns the last score in the list
+        """
+        score = self.latest_score()
+        return {'score': score if score is not None else 0,
+                'total': self._max_score}
+
     def get_progress(self):
         '''
         For now, just return last score / max_score
         '''
         if self._max_score > 0:
             try:
-                return Progress(self.get_score()['score'], self._max_score)
+                return Progress(self.get_score_value()['score'], self._max_score)
             except Exception as err:
                 log.exception("Got bad progress")
                 return None

From c3a91f59083191462ee0b74b22fd553c811ddc65 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 14:08:51 -0500
Subject: [PATCH 090/541] Replace score message with dictionary

---
 common/lib/xmodule/xmodule/open_ended_module.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index fbd0662a63..dcc5e2a3da 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -457,7 +457,7 @@ class OpenEndedModule():
             correct:         Correctness of submission (Boolean)
             score:           Points to be assigned (numeric, can be float)
         """
-        fail = ScoreMessage(valid=False, correct=False, points=0, msg='')
+        fail = {'valid' : False, 'correct' : False, 'points' : 0, 'msg' : ''}
         try:
             score_result = json.loads(score_msg)
         except (TypeError, ValueError):
@@ -486,8 +486,7 @@ class OpenEndedModule():
         correct = (score_ratio >= 0.66)
 
         #Currently ignore msg and only return feedback (which takes the place of msg)
-        return ScoreMessage(valid=True, correct=correct,
-            points=score_result['score'], msg=feedback)
+        return {'valid' : True, 'correct' : correct, 'points' : score_result['score'], 'msg' : feedback}
 
     def handle_ajax(self, dispatch, get, system):
         '''

From d02b9d9ce67484226a23786d4ce0f92253e581c1 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 14:15:39 -0500
Subject: [PATCH 091/541] Remove correct map and place state changes in its
 place

---
 .../lib/xmodule/xmodule/open_ended_module.py  | 38 ++++++-------------
 1 file changed, 11 insertions(+), 27 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index dcc5e2a3da..4b7dd8e95b 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -295,32 +295,17 @@ class OpenEndedModule():
     def _update_score(self, score_msg, oldcmap, queuekey):
         log.debug(score_msg)
         score_msg = self._parse_score_msg(score_msg)
-        if not score_msg.valid:
-            oldcmap.set(self.answer_id,
-                msg = 'Invalid grader reply. Please contact the course staff.')
+        if not score_msg['valid']:
+               score_msg['msg'] = 'Invalid grader reply. Please contact the course staff.'
             return oldcmap
 
         correctness = 'correct' if score_msg.correct else 'incorrect'
 
-        # TODO: Find out how this is used elsewhere, if any
-        self.context['correct'] = correctness
+        self._record_latest_score(score_msg['points'])
+        self._record_latest_feedback(score_msg['msg'])
+        self.state=self.POST_ASSESSMENT
 
-        # Replace 'oldcmap' with new grading results if queuekey matches.  If queuekey
-        # does not match, we keep waiting for the score_msg whose key actually matches
-        if oldcmap.is_right_queuekey(self.answer_id, queuekey):
-            # Sanity check on returned points
-            points = score_msg.points
-            if points < 0:
-                points = 0
-
-            # Queuestate is consumed, so reset it to None
-            oldcmap.set(self.answer_id, npoints=points, correctness=correctness,
-                msg = score_msg.msg.replace('&nbsp;', '&#160;'), queuestate=None)
-        else:
-            log.debug('OpenEndedResponse: queuekey {0} does not match for answer_id={1}.'.format(
-                queuekey, self.answer_id))
-
-        return oldcmap
+        return True
 
 
     def get_answers(self):
@@ -602,11 +587,11 @@ class OpenEndedModule():
             return None
         return self.history[-1].get('score')
 
-    def latest_hint(self):
+    def latest_feedback(self):
         """None if not available"""
         if not self.history:
             return None
-        return self.history[-1].get('hint')
+        return self.history[-1].get('feedback')
 
     def new_history_entry(self, answer):
         self.history.append({'answer': answer})
@@ -616,10 +601,10 @@ class OpenEndedModule():
         history element"""
         self.history[-1]['score'] = score
 
-    def record_latest_hint(self, hint):
+    def record_latest_feedback(self, feedback):
         """Assumes that state is right, so we're adding a score to the latest
         history element"""
-        self.history[-1]['hint'] = hint
+        self.history[-1]['feedback'] = feedback
 
     def _allow_reset(self):
         """Can the module be reset?"""
@@ -699,8 +684,7 @@ class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
         {
         'rubric': 'some-html',
         'prompt': 'some-html',
-        'submitmessage': 'some-html'
-        'hintprompt': 'some-html'
+        'oeparam': 'some-html'
         }
         """
 

From a6c273bd05160e415cc1d939194713f2ce7909c5 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 14:18:07 -0500
Subject: [PATCH 092/541] More informative dictionary keys

---
 .../lib/xmodule/xmodule/open_ended_module.py  | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 4b7dd8e95b..38180ebb5b 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -296,13 +296,10 @@ class OpenEndedModule():
         log.debug(score_msg)
         score_msg = self._parse_score_msg(score_msg)
         if not score_msg['valid']:
-               score_msg['msg'] = 'Invalid grader reply. Please contact the course staff.'
-            return oldcmap
+            score_msg['feedback'] = 'Invalid grader reply. Please contact the course staff.'
 
-        correctness = 'correct' if score_msg.correct else 'incorrect'
-
-        self._record_latest_score(score_msg['points'])
-        self._record_latest_feedback(score_msg['msg'])
+        self._record_latest_score(score_msg['score'])
+        self._record_latest_feedback(score_msg['feedback'])
         self.state=self.POST_ASSESSMENT
 
         return True
@@ -465,13 +462,12 @@ class OpenEndedModule():
         self.submission_id=score_result['submission_id']
         self.grader_id=score_result['grader_id']
 
-        # HACK: for now, just assume it's correct if you got more than 2/3.
-        # Also assumes that score_result['score'] is an integer.
-        score_ratio = int(score_result['score']) / float(self.max_score)
-        correct = (score_ratio >= 0.66)
+        return {'valid' : True, 'score' : score_result['score'], 'feedback' : feedback}
 
-        #Currently ignore msg and only return feedback (which takes the place of msg)
-        return {'valid' : True, 'correct' : correct, 'points' : score_result['score'], 'msg' : feedback}
+    def is_submission_correct(self, score):
+        score_ratio = int(score) / float(self.max_score)
+        correct = (score_ratio >= 0.66)
+        return correct
 
     def handle_ajax(self, dispatch, get, system):
         '''

From 9cf4dc52f18779d6f644e380efa6476d6dbee34e Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 14:20:57 -0500
Subject: [PATCH 093/541] Fix passing of system object

---
 common/lib/xmodule/xmodule/open_ended_module.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 38180ebb5b..defbd17ad3 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -292,9 +292,9 @@ class OpenEndedModule():
                       'time': qtime,}
         return True
 
-    def _update_score(self, score_msg, oldcmap, queuekey):
+    def _update_score(self, score_msg, queuekey, system):
         log.debug(score_msg)
-        score_msg = self._parse_score_msg(score_msg)
+        score_msg = self._parse_score_msg(score_msg, system)
         if not score_msg['valid']:
             score_msg['feedback'] = 'Invalid grader reply. Please contact the course staff.'
 
@@ -402,7 +402,7 @@ class OpenEndedModule():
 
         return u"\n".join([feedback_list_part1,feedback_list_part2])
 
-    def _format_feedback(self, response_items):
+    def _format_feedback(self, response_items, system):
         """
         Input:
             Dictionary called feedback.  Must contain keys seen below.
@@ -413,10 +413,10 @@ class OpenEndedModule():
         feedback = self._convert_longform_feedback_to_html(response_items)
 
         if not response_items['success']:
-            return self.system.render_template("open_ended_error.html",
+            return system.render_template("open_ended_error.html",
                 {'errors' : feedback})
 
-        feedback_template = self.system.render_template("open_ended_feedback.html", {
+        feedback_template = system.render_template("open_ended_feedback.html", {
             'grader_type': response_items['grader_type'],
             'score': "{0} / {1}".format(response_items['score'], self.max_score),
             'feedback': feedback,
@@ -425,7 +425,7 @@ class OpenEndedModule():
         return feedback_template
 
 
-    def _parse_score_msg(self, score_msg):
+    def _parse_score_msg(self, score_msg, system):
         """
          Grader reply is a JSON-dump of the following dict
            { 'correct': True/False,
@@ -458,7 +458,7 @@ class OpenEndedModule():
                 .format(tag))
                 return fail
 
-        feedback = self._format_feedback(score_result)
+        feedback = self._format_feedback(score_result, system)
         self.submission_id=score_result['submission_id']
         self.grader_id=score_result['grader_id']
 

From 507457dc59aab7d0d7af6d377332ee28832e81c8 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 14:22:14 -0500
Subject: [PATCH 094/541] Fix function naming

---
 common/lib/xmodule/xmodule/open_ended_module.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index defbd17ad3..febc74895a 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -298,8 +298,8 @@ class OpenEndedModule():
         if not score_msg['valid']:
             score_msg['feedback'] = 'Invalid grader reply. Please contact the course staff.'
 
-        self._record_latest_score(score_msg['score'])
-        self._record_latest_feedback(score_msg['feedback'])
+        self.record_latest_score(score_msg['score'])
+        self.record_latest_feedback(score_msg['feedback'])
         self.state=self.POST_ASSESSMENT
 
         return True

From 3a6c660b522bca09926ce1f08d0c7b6060b030e5 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 14:24:30 -0500
Subject: [PATCH 095/541] Now display grader message

---
 common/lib/xmodule/xmodule/open_ended_module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index febc74895a..919bc9a0dc 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -623,7 +623,7 @@ class OpenEndedModule():
             'cols' : 80,
             'hidden' : '',
             'id' : 'open_ended',
-            'msg' : "",
+            'msg' : self.latest_feedback(),
             }
 
         html = system.render_template('open_ended.html', context)

From 254eae034be05c881645a4c9c7367b74c7c8824f Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 14:47:00 -0500
Subject: [PATCH 096/541] Add in support for passing problem type to javascript

---
 .../js/src/combinedopenended/display.coffee   | 39 +++++++++++++++++--
 .../lib/xmodule/xmodule/open_ended_module.py  |  3 +-
 .../xmodule/xmodule/self_assessment_module.py |  3 +-
 lms/templates/open_ended.html                 |  7 +---
 lms/templates/self_assessment_hint.html       |  2 +-
 lms/templates/self_assessment_prompt.html     |  2 +-
 6 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 08c7aafa4d..b0eed2e896 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -25,6 +25,7 @@ class @CombinedOpenEnded
     @message_wrapper = @$('.message-wrapper')
     @submit_button = @$('.submit-button')
     @child_state = @el.data('state')
+    @child_type = @el.data('child-type')
 
     @open_ended_child= @$('.open-ended-child')
 
@@ -54,7 +55,7 @@ class @CombinedOpenEnded
       @submit_button.click @save_assessment
     else if @child_state == 'post_assessment'
       @answer_area.attr("disabled", true)
-      @submit_button.prop('value', 'Submit hint')
+      @submit_button.prop('value', 'Submit post-assessment')
       @submit_button.click @save_hint
     else if @child_state == 'done'
       @answer_area.attr("disabled", true)
@@ -74,7 +75,8 @@ class @CombinedOpenEnded
     @assessment = @$('select.assessment')
 
   find_hint_elements: ->
-    @hint_area = @$('textarea.hint')
+    @hint_area = @$('textarea.post_assessment')
+    @hint_box = @$('')
 
   save_answer: (event) =>
     event.preventDefault()
@@ -118,7 +120,7 @@ class @CombinedOpenEnded
     if @child_state == 'post_assessment'
       data = {'hint' : @hint_area.val()}
 
-      $.postWithPrefix "#{@ajax_url}/save_hint", data, (response) =>
+      $.postWithPrefix "#{@ajax_url}/save_post_assessment", data, (response) =>
         if response.success
           @message_wrapper.html(response.message_html)
           @child_state = 'done'
@@ -164,4 +166,33 @@ class @CombinedOpenEnded
         else
           @errors_area.html(response.error)
     else
-      @errors_area.html('Problem state got out of sync.  Try reloading the page.')
\ No newline at end of file
+      @errors_area.html('Problem state got out of sync.  Try reloading the page.')
+
+  message_post: =>
+    Logger.log 'message_post', @answers
+
+    fd = new FormData()
+    feedback = @$('section.evaluation textarea.feedback-on-feedback')[0].value
+    submission_id = $('div.external-grader-message div.submission_id')[0].innerHTML
+    grader_id = $('div.external-grader-message div.grader_id')[0].innerHTML
+    score = $(".evaluation-scoring input:radio[name='evaluation-score']:checked").val()
+    fd.append('feedback', feedback)
+    fd.append('submission_id', submission_id)
+    fd.append('grader_id', grader_id)
+    if(!score)
+      @gentle_alert "You need to pick a rating before you can submit."
+      return
+    else
+      fd.append('score', score)
+
+
+    settings =
+      type: "POST"
+      data: fd
+      processData: false
+      contentType: false
+      success: (response) =>
+        @gentle_alert response.message
+        @$('section.evaluation').slideToggle()
+
+    $.ajaxWithPrefix("#{@url}/message_post", settings)
\ No newline at end of file
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 919bc9a0dc..24b00a0126 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -485,7 +485,7 @@ class OpenEndedModule():
             'problem_reset': self.reset_problem,
             'save_answer': self.save_answer,
             'score_update': self.update_score,
-            'message_post' : self.message_post,
+            'save_post_assessment' : self.message_post,
             }
 
         if dispatch not in handlers:
@@ -624,6 +624,7 @@ class OpenEndedModule():
             'hidden' : '',
             'id' : 'open_ended',
             'msg' : self.latest_feedback(),
+            'child_type' : 'openended',
             }
 
         html = system.render_template('open_ended.html', context)
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index 64cf140d38..ee35ff801c 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -235,6 +235,7 @@ class SelfAssessmentModule():
             'initial_message': self.get_message_html(),
             'state': self.state,
             'allow_reset': self._allow_reset(),
+            'child_type' : 'selfassessment',
         }
 
         html = system.render_template('self_assessment_prompt.html', context)
@@ -281,7 +282,7 @@ class SelfAssessmentModule():
         handlers = {
             'save_answer': self.save_answer,
             'save_assessment': self.save_assessment,
-            'save_hint': self.save_hint,
+            'save_post_assessment': self.save_hint,
             'reset': self.reset,
         }
 
diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html
index d682de5291..a40f0e189e 100644
--- a/lms/templates/open_ended.html
+++ b/lms/templates/open_ended.html
@@ -1,4 +1,4 @@
-<section id="openended_${id}" class="open-ended-child" data-state="${state}">
+<section id="openended_${id}" class="open-ended-child" data-state="${state}" data-child-type="${child_type}">
 
    <div class="error"></div>
    <div class="prompt">
@@ -35,7 +35,7 @@
     % endif
   <div class="external-grader-message">
       ${msg|n}
-    % if state == 'done':
+    % if state == 'post_assessment':
     <div class="collapsible evaluation-response">
       <header>
       <a href="#">Respond to Feedback</a>
@@ -53,9 +53,6 @@
         </div>
         <p>Additional comments:</p>
         <textarea rows="${rows}" cols="${cols}" name="feedback_${id}" class="feedback-on-feedback" id="feedback_${id}"></textarea>
-        <div class="submit-message-container">
-            <input name="submit-message" class="submit-message" type="button" value="Submit your message"/>
-        </div>
     </section>
     </div>
     % endif
diff --git a/lms/templates/self_assessment_hint.html b/lms/templates/self_assessment_hint.html
index 64c45b809e..1adfc69e39 100644
--- a/lms/templates/self_assessment_hint.html
+++ b/lms/templates/self_assessment_hint.html
@@ -2,6 +2,6 @@
     <div class="hint-prompt">
     ${hint_prompt}
     </div>
-    <textarea name="hint" class="hint" cols="70" rows="5"
+    <textarea name="post_assessment" class="post_assessment" cols="70" rows="5"
      ${'readonly="true"' if read_only else ''}>${hint}</textarea>
 </div>
diff --git a/lms/templates/self_assessment_prompt.html b/lms/templates/self_assessment_prompt.html
index 91223fdaa1..479e42a126 100644
--- a/lms/templates/self_assessment_prompt.html
+++ b/lms/templates/self_assessment_prompt.html
@@ -1,5 +1,5 @@
 <section id="self_assessment_${id}" class="open-ended-child" data-ajax-url="${ajax_url}"
-         data-id="${id}" data-state="${state}" data-allow_reset="${allow_reset}">
+         data-id="${id}" data-state="${state}" data-allow_reset="${allow_reset}" data-child-type="${child_type}">
     <div class="error"></div>
     <div class="prompt">
     ${prompt}

From ca234dc900136e50981e2e150081f765c061dc86 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 14:59:11 -0500
Subject: [PATCH 097/541] Fixing message post

---
 .../js/src/combinedopenended/display.coffee        | 14 +++++++++++---
 common/lib/xmodule/xmodule/open_ended_module.py    |  6 +++---
 lms/templates/open_ended.html                      |  1 +
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index b0eed2e896..30b2e6b965 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -56,7 +56,10 @@ class @CombinedOpenEnded
     else if @child_state == 'post_assessment'
       @answer_area.attr("disabled", true)
       @submit_button.prop('value', 'Submit post-assessment')
-      @submit_button.click @save_hint
+      if @child_type=="selfassessment"
+         @submit_button.click @save_hint
+      else
+        @submit_button.click @message_post
     else if @child_state == 'done'
       @answer_area.attr("disabled", true)
       @hint_area.attr('disabled', true)
@@ -76,7 +79,6 @@ class @CombinedOpenEnded
 
   find_hint_elements: ->
     @hint_area = @$('textarea.post_assessment')
-    @hint_box = @$('')
 
   save_answer: (event) =>
     event.preventDefault()
@@ -195,4 +197,10 @@ class @CombinedOpenEnded
         @gentle_alert response.message
         @$('section.evaluation').slideToggle()
 
-    $.ajaxWithPrefix("#{@url}/message_post", settings)
\ No newline at end of file
+    $.ajaxWithPrefix("#{@ajax_url}/save_post_assessment", settings)
+
+  gentle_alert: (msg) =>
+    if @el.find('.open-ended-alert').length
+      @el.find('.open-ended-alert').remove()
+    alert_elem = "<div class='open-ended-alert'>" + msg + "</div>"
+    @el.find('.open-ended-alert').css(opacity: 0).animate(opacity: 1, 700)
\ No newline at end of file
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 24b00a0126..a7d34b5636 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -204,7 +204,7 @@ class OpenEndedModule():
         survey_responses=event_info['survey_responses']
         for tag in ['feedback', 'submission_id', 'grader_id', 'score']:
             if tag not in survey_responses:
-                return False, "Could not find needed tag {0}".format(tag)
+                return {'success' : False, 'msg' : "Could not find needed tag {0}".format(tag)}
         try:
             submission_id=int(survey_responses['submission_id'])
             grader_id = int(survey_responses['grader_id'])
@@ -214,7 +214,7 @@ class OpenEndedModule():
             error_message=("Could not parse submission id, grader id, "
                            "or feedback from message_post ajax call.  Here is the message data: {0}".format(survey_responses))
             log.exception(error_message)
-            return False, "There was an error saving your feedback.  Please contact course staff."
+            return {'success' : False, 'msg' : "There was an error saving your feedback.  Please contact course staff."}
 
         qinterface = system.xqueue['interface']
         qtime = datetime.strftime(datetime.now(), xqueue_interface.dateformat)
@@ -248,7 +248,7 @@ class OpenEndedModule():
         if error:
             success=False
 
-        return success, "Successfully submitted your feedback."
+        return {'success' : success, 'msg' : "Successfully submitted your feedback."}
 
     def get_score(self, submission, system):
 
diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html
index a40f0e189e..fae2b45041 100644
--- a/lms/templates/open_ended.html
+++ b/lms/templates/open_ended.html
@@ -57,4 +57,5 @@
     </div>
     % endif
   </div>
+  <div class="open-ended-alert"></div>
 </section>

From 45036cb6544b829aad147ec642c6dc74c3269df8 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 15:01:48 -0500
Subject: [PATCH 098/541] Message post queuekey change

---
 common/lib/xmodule/xmodule/open_ended_module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index a7d34b5636..5bee2e67a6 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -221,7 +221,7 @@ class OpenEndedModule():
         anonymous_student_id = system.anonymous_student_id
         queuekey = xqueue_interface.make_hashkey(str(system.seed) + qtime +
                                                  anonymous_student_id +
-                                                 self.answer_id)
+                                                 str(len(self.history)))
 
         xheader = xqueue_interface.make_xheader(
             lms_callback_url=system.xqueue['callback_url'],

From d2ef85cce54058de7fbb70807fc1427231e4c35b Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 15:03:07 -0500
Subject: [PATCH 099/541] Finalize submission after message post

---
 .../xmodule/xmodule/js/src/combinedopenended/display.coffee   | 4 ++++
 common/lib/xmodule/xmodule/open_ended_module.py               | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 30b2e6b965..d02db0b932 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -196,6 +196,10 @@ class @CombinedOpenEnded
       success: (response) =>
         @gentle_alert response.message
         @$('section.evaluation').slideToggle()
+        @message_wrapper.html(response.message_html)
+        @child_state = 'done'
+        @allow_reset = response.allow_reset
+        @rebind()
 
     $.ajaxWithPrefix("#{@ajax_url}/save_post_assessment", settings)
 
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 5bee2e67a6..96cc87da3a 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -248,6 +248,8 @@ class OpenEndedModule():
         if error:
             success=False
 
+        self.state=self.DONE
+
         return {'success' : success, 'msg' : "Successfully submitted your feedback."}
 
     def get_score(self, submission, system):

From 79fdb79ed4fb0189023f26d1c46758c7fd789d5c Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 15:17:06 -0500
Subject: [PATCH 100/541] Fixing states and html display

---
 .../xmodule/xmodule/combined_open_ended_module.py    |  2 +-
 common/lib/xmodule/xmodule/open_ended_module.py      | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index f5014af948..cb05074b34 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -131,7 +131,7 @@ class CombinedOpenEndedModule(XModule):
                 self.state=self.ASSESSING
             elif current_task_state is None and self.current_task_number>0:
                 last_response, last_score=self.get_last_response(self.current_task_number-1)
-                current_task_state = ('{"state": "assessing", "version": 1, "max_score": ' + str(self._max_score) + ', ' +
+                current_task_state = ('{"state": "initial", "version": 1, "max_score": ' + str(self._max_score) + ', ' +
                                       '"attempts": 0, "history": [{"answer": "' + str(last_response) + '"}]}')
                 {"state": "done", "version": 1, "max_score": 1, "attempts": 1, "history": [{"answer": "gdgddg", "score": 0, "hint": "dfdfdf"}]}
                 self.current_task=open_ended_module.OpenEndedModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 96cc87da3a..2cc436a808 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -576,20 +576,20 @@ class OpenEndedModule():
     def latest_answer(self):
         """None if not available"""
         if not self.history:
-            return None
-        return self.history[-1].get('answer')
+            return ""
+        return self.history[-1].get('answer', "")
 
     def latest_score(self):
         """None if not available"""
         if not self.history:
-            return None
-        return self.history[-1].get('score')
+            return ""
+        return self.history[-1].get('score', "")
 
     def latest_feedback(self):
         """None if not available"""
         if not self.history:
-            return None
-        return self.history[-1].get('feedback')
+            return ""
+        return self.history[-1].get('feedback', "")
 
     def new_history_entry(self, answer):
         self.history.append({'answer': answer})

From 85776fbe3064bfd7cd7a328653a702c9fe608905 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 15:23:41 -0500
Subject: [PATCH 101/541] Fix reset in open ended

---
 .../lib/xmodule/xmodule/open_ended_module.py  | 21 ++++++++++++++++++-
 .../xmodule/xmodule/self_assessment_module.py |  1 -
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 2cc436a808..7127ef2388 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -484,7 +484,6 @@ class OpenEndedModule():
         log.debug(get)
         handlers = {
             'problem_get': self.get_problem,
-            'problem_reset': self.reset_problem,
             'save_answer': self.save_answer,
             'score_update': self.update_score,
             'save_post_assessment' : self.message_post,
@@ -509,6 +508,16 @@ class OpenEndedModule():
         self.change_state(self.INITIAL)
         return {'success': True}
 
+    def out_of_sync_error(self, get, msg=''):
+        """
+        return dict out-of-sync error message, and also log.
+        """
+        log.warning("Assessment module state out sync. state: %r, get: %r. %s",
+            self.state, get, msg)
+        return {'success': False,
+                'error': 'The problem state got out-of-sync'}
+
+
     def save_answer(self, get, system):
         if self.attempts > self.max_attempts:
             # If too many attempts, prevent student from saving answer and
@@ -658,6 +667,16 @@ class OpenEndedModule():
                 return None
         return None
 
+    def reset(self, system):
+        """
+        If resetting is allowed, reset the state.
+
+        Returns {'success': bool, 'error': msg}
+        (error only present if not success)
+        """
+        self.change_state(self.INITIAL)
+        return {'success': True}
+
 
 class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
     """
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index ee35ff801c..925083c97a 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -283,7 +283,6 @@ class SelfAssessmentModule():
             'save_answer': self.save_answer,
             'save_assessment': self.save_assessment,
             'save_post_assessment': self.save_hint,
-            'reset': self.reset,
         }
 
         if dispatch not in handlers:

From f3ca5f456fc94bb2a9305374535722cbc84fad7a Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 15:32:56 -0500
Subject: [PATCH 102/541] Save answer based on history

---
 common/lib/xmodule/xmodule/open_ended_module.py | 7 +++++--
 lms/templates/open_ended.html                   | 6 +-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 7127ef2388..ad338203f1 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -532,7 +532,11 @@ class OpenEndedModule():
             return self.out_of_sync_error(get)
 
         # add new history element with answer and empty score and hint.
-        self.new_history_entry(get['student_answer'])
+        if(len(self.history)>0):
+            if(len(self.history[-1].keys())>1):
+                self.new_history_entry(get['student_answer'])
+            else:
+                get['student_answer']=self.latest_answer()
         self.get_score(get['student_answer'], system)
         self.change_state(self.ASSESSING)
 
@@ -632,7 +636,6 @@ class OpenEndedModule():
             'allow_reset': self._allow_reset(),
             'rows' : 30,
             'cols' : 80,
-            'hidden' : '',
             'id' : 'open_ended',
             'msg' : self.latest_feedback(),
             'child_type' : 'openended',
diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html
index fae2b45041..fbf8d74d16 100644
--- a/lms/templates/open_ended.html
+++ b/lms/templates/open_ended.html
@@ -4,11 +4,7 @@
    <div class="prompt">
     ${prompt|n}
    </prompt>
-  <textarea rows="${rows}" cols="${cols}" name="answer" class="answer short-form-response" id="input_${id}"
-       % if hidden:
-      	    style="display:none;"
-       % endif
-  >${previous_answer|h}</textarea>
+  <textarea rows="${rows}" cols="${cols}" name="answer" class="answer short-form-response" id="input_${id}">${previous_answer|h}</textarea>
 
   <div class="message-wrapper">
     % if state == 'initial':

From f131b8673d7c6f93dd404d8d43e721f042c0bdea Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 15:54:53 -0500
Subject: [PATCH 103/541] Handle multiple chained submissions

---
 .../xmodule/xmodule/combined_open_ended_module.py |  8 +++-----
 common/lib/xmodule/xmodule/open_ended_module.py   | 15 ++++++++++-----
 .../lib/xmodule/xmodule/self_assessment_module.py |  3 +++
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index cb05074b34..d08eef7253 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -115,8 +115,7 @@ class CombinedOpenEndedModule(XModule):
             elif current_task_state is None and self.current_task_number>0:
                 last_response, last_score=self.get_last_response(self.current_task_number-1)
                 current_task_state = ('{"state": "assessing", "version": 1, "max_score": ' + str(self._max_score) + ', ' +
-                                      '"attempts": 0, "history": [{"answer": "' + str(last_response) + '"}]}')
-                {"state": "done", "version": 1, "max_score": 1, "attempts": 1, "history": [{"answer": "gdgddg", "score": 0, "hint": "dfdfdf"}]}
+                                      '"attempts": 0, "created": True, "history": [{"answer": "' + str(last_response) + '"}]}')
                 self.current_task=self_assessment_module.SelfAssessmentModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
                 self.task_states.append(self.current_task.get_instance_state())
                 self.state=self.ASSESSING
@@ -131,9 +130,8 @@ class CombinedOpenEndedModule(XModule):
                 self.state=self.ASSESSING
             elif current_task_state is None and self.current_task_number>0:
                 last_response, last_score=self.get_last_response(self.current_task_number-1)
-                current_task_state = ('{"state": "initial", "version": 1, "max_score": ' + str(self._max_score) + ', ' +
-                                      '"attempts": 0, "history": [{"answer": "' + str(last_response) + '"}]}')
-                {"state": "done", "version": 1, "max_score": 1, "attempts": 1, "history": [{"answer": "gdgddg", "score": 0, "hint": "dfdfdf"}]}
+                current_task_state = ('{"state": "assessing", "version": 1, "max_score": ' + str(self._max_score) + ', ' +
+                                      '"attempts": 0, "created": True, "history": [{"answer": "' + str(last_response) + '"}]}')
                 self.current_task=open_ended_module.OpenEndedModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
                 self.task_states.append(self.current_task.get_instance_state())
                 self.state=self.ASSESSING
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index ad338203f1..02ce31cea0 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -116,6 +116,14 @@ class OpenEndedModule():
 
         self.state = instance_state.get('state', 'initial')
 
+        self.created = instance_state.get('created', False)
+
+        if self.created and self.state == self.ASSESSING:
+            self.created=False
+            self.get_score(self.latest_answer(), system)
+
+        self.created=False
+
         self.attempts = instance_state.get('attempts', 0)
         self.max_attempts = int(instance_state.get('attempts', MAX_ATTEMPTS))
 
@@ -532,11 +540,7 @@ class OpenEndedModule():
             return self.out_of_sync_error(get)
 
         # add new history element with answer and empty score and hint.
-        if(len(self.history)>0):
-            if(len(self.history[-1].keys())>1):
-                self.new_history_entry(get['student_answer'])
-            else:
-                get['student_answer']=self.latest_answer()
+        self.new_history_entry(get['student_answer'])
         self.get_score(get['student_answer'], system)
         self.change_state(self.ASSESSING)
 
@@ -583,6 +587,7 @@ class OpenEndedModule():
             'state': self.state,
             'max_score': self._max_score,
             'attempts': self.attempts,
+            'created' : self.created,
             }
         return json.dumps(state)
 
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index 925083c97a..56178acee4 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -107,6 +107,8 @@ class SelfAssessmentModule():
         # Scores are on scale from 0 to max_score
         self.history = instance_state.get('history', [])
 
+        self.created = instance_state.get('created', False)
+
         self.state = instance_state.get('state', 'initial')
 
         self.attempts = instance_state.get('attempts', 0)
@@ -489,6 +491,7 @@ class SelfAssessmentModule():
                  'state': self.state,
                  'max_score': self._max_score,
                  'attempts': self.attempts,
+                 'created' : self.created,
         }
         return json.dumps(state)
 

From d3ccc64846ebd33ffc43992d2d7f507f5a8b9dfb Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 16:06:41 -0500
Subject: [PATCH 104/541] Remove some unneeded log statements

---
 .../xmodule/combined_open_ended_module.py      |  6 +++---
 .../lib/xmodule/xmodule/open_ended_module.py   | 18 ++++++++----------
 .../xmodule/xmodule/self_assessment_module.py  |  4 ++--
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index d08eef7253..a5fa059a37 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -101,7 +101,6 @@ class CombinedOpenEndedModule(XModule):
         if self.state in [self.ASSESSING, self.DONE]:
             current_task_state=self.task_states[len(self.task_states)-1]
 
-        log.debug(self.task_states)
 
         self.current_task_xml=self.task_xml[self.current_task_number]
         current_task_type=self.get_tag_name(self.current_task_xml)
@@ -115,7 +114,7 @@ class CombinedOpenEndedModule(XModule):
             elif current_task_state is None and self.current_task_number>0:
                 last_response, last_score=self.get_last_response(self.current_task_number-1)
                 current_task_state = ('{"state": "assessing", "version": 1, "max_score": ' + str(self._max_score) + ', ' +
-                                      '"attempts": 0, "created": True, "history": [{"answer": "' + str(last_response) + '"}]}')
+                                      '"attempts": 0, "created": "True", "history": [{"answer": "' + str(last_response) + '"}]}')
                 self.current_task=self_assessment_module.SelfAssessmentModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
                 self.task_states.append(self.current_task.get_instance_state())
                 self.state=self.ASSESSING
@@ -131,7 +130,8 @@ class CombinedOpenEndedModule(XModule):
             elif current_task_state is None and self.current_task_number>0:
                 last_response, last_score=self.get_last_response(self.current_task_number-1)
                 current_task_state = ('{"state": "assessing", "version": 1, "max_score": ' + str(self._max_score) + ', ' +
-                                      '"attempts": 0, "created": True, "history": [{"answer": "' + str(last_response) + '"}]}')
+                                      '"attempts": 0, "created": "True", "history": [{"answer": "' + str(last_response) + '"}]}')
+                log.debug(current_task_state)
                 self.current_task=open_ended_module.OpenEndedModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
                 self.task_states.append(self.current_task.get_instance_state())
                 self.state=self.ASSESSING
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 02ce31cea0..d3d04fe2ec 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -104,6 +104,7 @@ class OpenEndedModule():
 
         # Load instance state
         if instance_state is not None:
+            log.debug(instance_state)
             instance_state = json.loads(instance_state)
         else:
             instance_state = {}
@@ -116,13 +117,7 @@ class OpenEndedModule():
 
         self.state = instance_state.get('state', 'initial')
 
-        self.created = instance_state.get('created', False)
-
-        if self.created and self.state == self.ASSESSING:
-            self.created=False
-            self.get_score(self.latest_answer(), system)
-
-        self.created=False
+        self.created = instance_state.get('created', "False")
 
         self.attempts = instance_state.get('attempts', 0)
         self.max_attempts = int(instance_state.get('attempts', MAX_ATTEMPTS))
@@ -152,6 +147,11 @@ class OpenEndedModule():
 
         self._parse(oeparam, prompt, rubric, system)
 
+        if self.created=="True" and self.state == self.ASSESSING:
+            self.created="False"
+            self.get_score(self.latest_answer(), system)
+            self.created="False"
+
     def _parse(self, oeparam, prompt, rubric, system):
         '''
         Parse OpenEndedResponse XML:
@@ -303,7 +303,6 @@ class OpenEndedModule():
         return True
 
     def _update_score(self, score_msg, queuekey, system):
-        log.debug(score_msg)
         score_msg = self._parse_score_msg(score_msg, system)
         if not score_msg['valid']:
             score_msg['feedback'] = 'Invalid grader reply. Please contact the course staff.'
@@ -489,7 +488,6 @@ class OpenEndedModule():
           'progress' : 'none'/'in_progress'/'done',
           <other request-specific values here > }
         '''
-        log.debug(get)
         handlers = {
             'problem_get': self.get_problem,
             'save_answer': self.save_answer,
@@ -587,7 +585,7 @@ class OpenEndedModule():
             'state': self.state,
             'max_score': self._max_score,
             'attempts': self.attempts,
-            'created' : self.created,
+            'created' : "False",
             }
         return json.dumps(state)
 
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index 56178acee4..64edb2bb8a 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -107,7 +107,7 @@ class SelfAssessmentModule():
         # Scores are on scale from 0 to max_score
         self.history = instance_state.get('history', [])
 
-        self.created = instance_state.get('created', False)
+        self.created = instance_state.get('created', "False")
 
         self.state = instance_state.get('state', 'initial')
 
@@ -491,7 +491,7 @@ class SelfAssessmentModule():
                  'state': self.state,
                  'max_score': self._max_score,
                  'attempts': self.attempts,
-                 'created' : self.created,
+                 'created' : "False",
         }
         return json.dumps(state)
 

From a39ce505d8486167234fb798837c3cfff11c5720 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 16:34:55 -0500
Subject: [PATCH 105/541] Fix loading for responses after attempt 1

---
 .../xmodule/combined_open_ended_module.py     | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index a5fa059a37..a94eb1f170 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -101,7 +101,6 @@ class CombinedOpenEndedModule(XModule):
         if self.state in [self.ASSESSING, self.DONE]:
             current_task_state=self.task_states[len(self.task_states)-1]
 
-
         self.current_task_xml=self.task_xml[self.current_task_number]
         current_task_type=self.get_tag_name(self.current_task_xml)
         if current_task_type=="selfassessment":
@@ -119,7 +118,14 @@ class CombinedOpenEndedModule(XModule):
                 self.task_states.append(self.current_task.get_instance_state())
                 self.state=self.ASSESSING
             else:
+                if self.current_task_number>0:
+                    last_response, last_score=self.get_last_response(self.current_task_number-1)
+                    loaded_task_state=json.loads(current_task_state)
+                    loaded_task_state['state']=self.ASSESSING
+                    loaded_task_state['created'] = "True"
+                    loaded_task_state['history'].append({'answer' : last_response})
                 self.current_task=self_assessment_module.SelfAssessmentModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
+
         elif current_task_type=="openended":
             self.current_task_descriptor= open_ended_module.OpenEndedDescriptor(self.system)
             self.current_task_parsed_xml=self.current_task_descriptor.definition_from_xml(etree.fromstring(self.current_task_xml),self.system)
@@ -131,14 +137,19 @@ class CombinedOpenEndedModule(XModule):
                 last_response, last_score=self.get_last_response(self.current_task_number-1)
                 current_task_state = ('{"state": "assessing", "version": 1, "max_score": ' + str(self._max_score) + ', ' +
                                       '"attempts": 0, "created": "True", "history": [{"answer": "' + str(last_response) + '"}]}')
-                log.debug(current_task_state)
                 self.current_task=open_ended_module.OpenEndedModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
                 self.task_states.append(self.current_task.get_instance_state())
                 self.state=self.ASSESSING
             else:
+                if self.current_task_number>0:
+                    last_response, last_score=self.get_last_response(self.current_task_number-1)
+                    loaded_task_state=json.loads(current_task_state)
+                    loaded_task_state['state']=self.ASSESSING
+                    loaded_task_state['created'] = "True"
+                    loaded_task_state['history'].append({'answer' : last_response})
                 self.current_task=open_ended_module.OpenEndedModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
 
-
+        log.debug(self.current_task.get_instance_state())
         return True
 
     def get_html(self):
@@ -231,7 +242,7 @@ class CombinedOpenEndedModule(XModule):
         return json.dumps(d,cls=ComplexEncoder)
 
     def next_problem(self, get):
-        self.setup_next_task()
+        self.update_task_states()
         return {'success' : True}
 
     def reset(self, get):

From 54db9fd03ce78964d05a7185add5352d615d4063 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 16:47:52 -0500
Subject: [PATCH 106/541] Fix state tracking?

---
 .../xmodule/combined_open_ended_module.py     | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index a94eb1f170..006014700e 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -98,8 +98,8 @@ class CombinedOpenEndedModule(XModule):
 
     def setup_next_task(self):
         current_task_state=None
-        if self.state in [self.ASSESSING, self.DONE]:
-            current_task_state=self.task_states[len(self.task_states)-1]
+        if len(self.task_states)>self.current_task_number:
+            current_task_state=self.task_states[self.current_task_number]
 
         self.current_task_xml=self.task_xml[self.current_task_number]
         current_task_type=self.get_tag_name(self.current_task_xml)
@@ -121,9 +121,11 @@ class CombinedOpenEndedModule(XModule):
                 if self.current_task_number>0:
                     last_response, last_score=self.get_last_response(self.current_task_number-1)
                     loaded_task_state=json.loads(current_task_state)
-                    loaded_task_state['state']=self.ASSESSING
-                    loaded_task_state['created'] = "True"
-                    loaded_task_state['history'].append({'answer' : last_response})
+                    if loaded_task_state['state']== self.INITIAL:
+                        loaded_task_state['state']=self.ASSESSING
+                        loaded_task_state['created'] = "True"
+                        loaded_task_state['history'].append({'answer' : last_response})
+                        current_task_state=json.dumps(loaded_task_state)
                 self.current_task=self_assessment_module.SelfAssessmentModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
 
         elif current_task_type=="openended":
@@ -144,9 +146,11 @@ class CombinedOpenEndedModule(XModule):
                 if self.current_task_number>0:
                     last_response, last_score=self.get_last_response(self.current_task_number-1)
                     loaded_task_state=json.loads(current_task_state)
-                    loaded_task_state['state']=self.ASSESSING
-                    loaded_task_state['created'] = "True"
-                    loaded_task_state['history'].append({'answer' : last_response})
+                    if loaded_task_state['state']== self.INITIAL:
+                        loaded_task_state['state']=self.ASSESSING
+                        loaded_task_state['created'] = "True"
+                        loaded_task_state['history'].append({'answer' : last_response})
+                        current_task_state=json.dumps(loaded_task_state)
                 self.current_task=open_ended_module.OpenEndedModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
 
         log.debug(self.current_task.get_instance_state())

From 332ad89b6ab34b56c55ba3f43088863a13cc0d7b Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 17:01:41 -0500
Subject: [PATCH 107/541] Streamline modules

---
 .../xmodule/combined_open_ended_module.py     | 92 +++++++++----------
 1 file changed, 44 insertions(+), 48 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 006014700e..db69c2dae3 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -95,6 +95,30 @@ class CombinedOpenEndedModule(XModule):
         tag=etree.fromstring(xml).tag
         return tag
 
+    def overwrite_state(self, current_task_state):
+        last_response, last_score=self.get_last_response(self.current_task_number-1)
+        loaded_task_state=json.loads(current_task_state)
+        if loaded_task_state['state']== self.INITIAL:
+            loaded_task_state['state']=self.ASSESSING
+            loaded_task_state['created'] = "True"
+            loaded_task_state['history'].append({'answer' : last_response})
+            current_task_state=json.dumps(loaded_task_state)
+        return current_task_state
+
+    def child_modules(self):
+        child_modules={
+            'openended' : open_ended_module.OpenEndedModule,
+            'selfassessment' : self_assessment_module.SelfAssessmentModule,
+        }
+        child_descriptors={
+            'openended' : open_ended_module.OpenEndedDescriptor,
+            'selfassessment' : self_assessment_module.SelfAssessmentDescriptor,
+        }
+        children={
+            'modules' : child_modules,
+            'descriptors' : child_descriptors,
+        }
+        return children
 
     def setup_next_task(self):
         current_task_state=None
@@ -103,55 +127,26 @@ class CombinedOpenEndedModule(XModule):
 
         self.current_task_xml=self.task_xml[self.current_task_number]
         current_task_type=self.get_tag_name(self.current_task_xml)
-        if current_task_type=="selfassessment":
-            self.current_task_descriptor=self_assessment_module.SelfAssessmentDescriptor(self.system)
-            self.current_task_parsed_xml=self.current_task_descriptor.definition_from_xml(etree.fromstring(self.current_task_xml),self.system)
-            if current_task_state is None and self.current_task_number==0:
-                self.current_task=self_assessment_module.SelfAssessmentModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor)
-                self.task_states.append(self.current_task.get_instance_state())
-                self.state=self.ASSESSING
-            elif current_task_state is None and self.current_task_number>0:
-                last_response, last_score=self.get_last_response(self.current_task_number-1)
-                current_task_state = ('{"state": "assessing", "version": 1, "max_score": ' + str(self._max_score) + ', ' +
-                                      '"attempts": 0, "created": "True", "history": [{"answer": "' + str(last_response) + '"}]}')
-                self.current_task=self_assessment_module.SelfAssessmentModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
-                self.task_states.append(self.current_task.get_instance_state())
-                self.state=self.ASSESSING
-            else:
-                if self.current_task_number>0:
-                    last_response, last_score=self.get_last_response(self.current_task_number-1)
-                    loaded_task_state=json.loads(current_task_state)
-                    if loaded_task_state['state']== self.INITIAL:
-                        loaded_task_state['state']=self.ASSESSING
-                        loaded_task_state['created'] = "True"
-                        loaded_task_state['history'].append({'answer' : last_response})
-                        current_task_state=json.dumps(loaded_task_state)
-                self.current_task=self_assessment_module.SelfAssessmentModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
 
-        elif current_task_type=="openended":
-            self.current_task_descriptor= open_ended_module.OpenEndedDescriptor(self.system)
-            self.current_task_parsed_xml=self.current_task_descriptor.definition_from_xml(etree.fromstring(self.current_task_xml),self.system)
-            if current_task_state is None and self.current_task_number==0:
-                self.current_task=open_ended_module.OpenEndedModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor)
-                self.task_states.append(self.current_task.get_instance_state())
-                self.state=self.ASSESSING
-            elif current_task_state is None and self.current_task_number>0:
-                last_response, last_score=self.get_last_response(self.current_task_number-1)
-                current_task_state = ('{"state": "assessing", "version": 1, "max_score": ' + str(self._max_score) + ', ' +
-                                      '"attempts": 0, "created": "True", "history": [{"answer": "' + str(last_response) + '"}]}')
-                self.current_task=open_ended_module.OpenEndedModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
-                self.task_states.append(self.current_task.get_instance_state())
-                self.state=self.ASSESSING
-            else:
-                if self.current_task_number>0:
-                    last_response, last_score=self.get_last_response(self.current_task_number-1)
-                    loaded_task_state=json.loads(current_task_state)
-                    if loaded_task_state['state']== self.INITIAL:
-                        loaded_task_state['state']=self.ASSESSING
-                        loaded_task_state['created'] = "True"
-                        loaded_task_state['history'].append({'answer' : last_response})
-                        current_task_state=json.dumps(loaded_task_state)
-                self.current_task=open_ended_module.OpenEndedModule(self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
+        children=self.child_modules()
+
+        self.current_task_descriptor=children['descriptors'][current_task_type](self.system)
+        self.current_task_parsed_xml=self.current_task_descriptor.definition_from_xml(etree.fromstring(self.current_task_xml),self.system)
+        if current_task_state is None and self.current_task_number==0:
+            self.current_task=children['modules'][current_task_type](self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor)
+            self.task_states.append(self.current_task.get_instance_state())
+            self.state=self.ASSESSING
+        elif current_task_state is None and self.current_task_number>0:
+            last_response, last_score=self.get_last_response(self.current_task_number-1)
+            current_task_state = ('{"state": "assessing", "version": 1, "max_score": ' + str(self._max_score) + ', ' +
+                                  '"attempts": 0, "created": "True", "history": [{"answer": "' + str(last_response) + '"}]}')
+            self.current_task=children['modules'][current_task_type](self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
+            self.task_states.append(self.current_task.get_instance_state())
+            self.state=self.ASSESSING
+        else:
+            if self.current_task_number>0:
+                current_task_state=self.overwrite_state(current_task_state)
+            self.current_task=children['modules'][current_task_type](self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
 
         log.debug(self.current_task.get_instance_state())
         return True
@@ -270,6 +265,7 @@ class CombinedOpenEndedModule(XModule):
             self.setup_next_task()
             self.current_task.reset(self.system)
         self.current_task_number=0
+        self.setup_next_task()
         return {'success': True}
 
 

From 2fff83f8813c7a731133dd34f7c177340c6494a3 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 17:03:19 -0500
Subject: [PATCH 108/541] More streamlining

---
 .../xmodule/combined_open_ended_module.py     | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index db69c2dae3..22ac3aa0b7 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -180,18 +180,13 @@ class CombinedOpenEndedModule(XModule):
         task_xml=self.task_xml[task_number]
         task_type=self.get_tag_name(task_xml)
 
-        if task_type=="selfassessment":
-            task_descriptor=self_assessment_module.SelfAssessmentDescriptor(self.system)
-            task_parsed_xml=task_descriptor.definition_from_xml(etree.fromstring(task_xml),self.system)
-            task=self_assessment_module.SelfAssessmentModule(self.system, self.location, task_parsed_xml, task_descriptor, instance_state=task_state)
-            last_response=task.latest_answer()
-            last_score = task.latest_score()
-        elif task_type=="openended":
-            task_descriptor=open_ended_module.OpenEndedDescriptor(self.system)
-            task_parsed_xml=task_descriptor.definition_from_xml(etree.fromstring(task_xml),self.system)
-            task=open_ended_module.OpenEndedModule(self.system, self.location, task_parsed_xml, task_descriptor, instance_state=task_state)
-            last_response=task.latest_answer()
-            last_score = task.latest_score()
+        children=self.child_modules()
+
+        task_descriptor=children['descriptors'][task_type](self.system)
+        task_parsed_xml=task_descriptor.definition_from_xml(etree.fromstring(task_xml),self.system)
+        task=children['modules'][task_type](self.system, self.location, task_parsed_xml, task_descriptor, instance_state=task_state)
+        last_response=task.latest_answer()
+        last_score = task.latest_score()
 
         return last_response, last_score
 

From 1f1fdc2360bc736faa2cb00805ac8dec41dbbe22 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 17:04:16 -0500
Subject: [PATCH 109/541] Add back in support for reset

---
 common/lib/xmodule/xmodule/combined_open_ended_module.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 22ac3aa0b7..9384eb9d27 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -120,7 +120,7 @@ class CombinedOpenEndedModule(XModule):
         }
         return children
 
-    def setup_next_task(self):
+    def setup_next_task(self, reset=False):
         current_task_state=None
         if len(self.task_states)>self.current_task_number:
             current_task_state=self.task_states[self.current_task_number]
@@ -144,7 +144,7 @@ class CombinedOpenEndedModule(XModule):
             self.task_states.append(self.current_task.get_instance_state())
             self.state=self.ASSESSING
         else:
-            if self.current_task_number>0:
+            if self.current_task_number>0 and not reset:
                 current_task_state=self.overwrite_state(current_task_state)
             self.current_task=children['modules'][current_task_type](self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
 
@@ -257,7 +257,7 @@ class CombinedOpenEndedModule(XModule):
         self.state=self.INITIAL
         for i in xrange(0,len(self.task_xml)):
             self.current_task_number=i
-            self.setup_next_task()
+            self.setup_next_task(reset=True)
             self.current_task.reset(self.system)
         self.current_task_number=0
         self.setup_next_task()

From ccefeccecc65f92ee1d04d407b9a1a8402a2f755 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 17:28:50 -0500
Subject: [PATCH 110/541] Several bug fixes

---
 .../xmodule/xmodule/combined_open_ended_module.py  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 9384eb9d27..7b20bf053c 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -27,7 +27,7 @@ log = logging.getLogger("mitx.courseware")
 # Set the default number of max attempts.  Should be 1 for production
 # Set higher for debugging/testing
 # attempts specified in xml definition overrides this.
-MAX_ATTEMPTS = 1
+MAX_ATTEMPTS = 10000
 
 # Set maximum available number of points.
 # Overriden by max_score specified in xml.
@@ -149,6 +149,7 @@ class CombinedOpenEndedModule(XModule):
             self.current_task=children['modules'][current_task_type](self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
 
         log.debug(self.current_task.get_instance_state())
+        log.debug(self.get_instance_state())
         return True
 
     def get_html(self):
@@ -192,15 +193,15 @@ class CombinedOpenEndedModule(XModule):
 
     def update_task_states(self):
         changed=False
-        self.task_states[len(self.task_states)-1] = self.current_task.get_instance_state()
-        current_task_state=json.loads(self.task_states[len(self.task_states)-1])
+        self.task_states[self.current_task_number] = self.current_task.get_instance_state()
+        current_task_state=json.loads(self.task_states[self.current_task_number])
         if current_task_state['state']==self.DONE:
             self.current_task_number+=1
-            if self.current_task_number==len(self.task_xml):
+            if self.current_task_number>=(len(self.task_xml)):
                 self.state=self.DONE
-                self.current_task_number=self.current_task_number-1
+                self.current_task_number=len(self.task_xml)-1
             else:
-                self.state=self.INTERMEDIATE_DONE
+                self.state=self.INITIAL
             changed=True
             self.setup_next_task()
         return changed
@@ -259,6 +260,7 @@ class CombinedOpenEndedModule(XModule):
             self.current_task_number=i
             self.setup_next_task(reset=True)
             self.current_task.reset(self.system)
+            self.task_states[self.current_task_number]=self.current_task.get_instance_state()
         self.current_task_number=0
         self.setup_next_task()
         return {'success': True}

From 9ba57ad5df27810f485f5b45175c7e3d61aeee38 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 17:42:42 -0500
Subject: [PATCH 111/541] Add in correctness display for open ended response

---
 common/lib/xmodule/xmodule/open_ended_module.py | 8 +++++++-
 lms/templates/open_ended.html                   | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index d3d04fe2ec..2f8e49e868 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -629,7 +629,12 @@ class OpenEndedModule():
         if self.state != self.INITIAL:
             latest = self.latest_answer()
             previous_answer = latest if latest is not None else self.initial_display
+            feedback = self.latest_feedback()
+            score= self.latest_score()
+            correct = "correct" if is_submission_correct else 'incorrect'
         else:
+            feedback=""
+            correct=""
             previous_answer = self.initial_display
 
         context = {
@@ -640,8 +645,9 @@ class OpenEndedModule():
             'rows' : 30,
             'cols' : 80,
             'id' : 'open_ended',
-            'msg' : self.latest_feedback(),
+            'msg' : feedback,
             'child_type' : 'openended',
+            'correct' : correct,
             }
 
         html = system.render_template('open_ended.html', context)
diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html
index fbf8d74d16..d98e10276d 100644
--- a/lms/templates/open_ended.html
+++ b/lms/templates/open_ended.html
@@ -9,9 +9,9 @@
   <div class="message-wrapper">
     % if state == 'initial':
       <span class="unanswered" style="display:inline-block;" id="status_${id}">Unanswered</span>
-    % elif state == 'done':
+    % elif state == 'done' and correct=='incorrect':
       <span class="correct" id="status_${id}">Correct</span>
-    % elif state == 'incorrect':
+    % elif state == 'done' and correct=='correct':
       <span class="incorrect" id="status_${id}">Incorrect</span>
     % elif state == 'assessing':
       <span class="grading" id="status_${id}">Submitted for grading</span>

From 41ba6dde3543505cbcaca7c7848a745a67fc896d Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 18:47:52 -0500
Subject: [PATCH 112/541] Make things looks slightly prettier

---
 .../xmodule/combined_open_ended_module.py     |   2 +
 .../css/combinedopenended/display.scss        | 510 ++++++++++++++++++
 .../js/src/combinedopenended/display.coffee   |   9 +
 .../lib/xmodule/xmodule/open_ended_module.py  |  10 +-
 lms/templates/open_ended.html                 |  10 +-
 5 files changed, 531 insertions(+), 10 deletions(-)
 create mode 100644 common/lib/xmodule/xmodule/css/combinedopenended/display.scss

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 7b20bf053c..4fcff80214 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -47,6 +47,8 @@ class CombinedOpenEndedModule(XModule):
     js = {'coffee': [resource_string(__name__, 'js/src/combinedopenended/display.coffee')]}
     js_module_name = "CombinedOpenEnded"
 
+    css = {'scss': [resource_string(__name__, 'css/combinedopenended/display.scss')]}
+
     def __init__(self, system, location, definition, descriptor,
                  instance_state=None, shared_state=None, **kwargs):
         XModule.__init__(self, system, location, definition, descriptor,
diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
new file mode 100644
index 0000000000..73fa4018d2
--- /dev/null
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -0,0 +1,510 @@
+h2 {
+  margin-top: 0;
+  margin-bottom: 15px;
+
+  &.problem-header {
+    section.staff {
+      margin-top: 30px;
+      font-size: 80%;
+    }
+  }
+
+  @media print {
+    display: block;
+    width: auto;
+    border-right: 0;
+  }
+}
+
+.inline-error {
+  color: darken($error-red, 10%);
+}
+
+section.open-ended-child {
+  @media print {
+    display: block;
+    width: auto;
+    padding: 0;
+
+    canvas, img {
+      page-break-inside: avoid;
+    }
+  }
+
+  .inline {
+      display: inline;
+  }
+
+  ol.enumerate {
+    li {
+      &:before {
+        content: " ";
+        display: block;
+        height: 0;
+        visibility: hidden;
+      }
+    }
+  }
+
+  .solution-span {
+    > span {
+      margin: 20px 0;
+      display: block;
+      border: 1px solid #ddd;
+      padding: 9px 15px 20px;
+      background: #FFF;
+      position: relative;
+      @include box-shadow(inset 0 0 0 1px #eee);
+      @include border-radius(3px);
+
+      &:empty {
+        display: none;
+      }
+    }
+  }
+
+  div {
+    p {
+      &.answer {
+        margin-top: -2px;
+      }
+      &.status {
+        text-indent: -9999px;
+        margin: 8px 0 0 10px;
+      }
+    }
+
+    &.unanswered {
+      p.status {
+        @include inline-block();
+        background: url('../images/unanswered-icon.png') center center no-repeat;
+        height: 14px;
+        width: 14px;
+      }
+    }
+
+    &.correct, &.ui-icon-check {
+      p.status {
+        @include inline-block();
+        background: url('../images/correct-icon.png') center center no-repeat;
+        height: 20px;
+        width: 25px;
+      }
+
+      input {
+        border-color: green;
+      }
+    }
+
+    &.processing {
+      p.status {
+        @include inline-block();
+        background: url('../images/spinner.gif') center center no-repeat;
+        height: 20px;
+        width: 20px;
+      }
+
+      input {
+        border-color: #aaa;
+      }
+    }
+
+    &.incorrect, &.ui-icon-close {
+      p.status {
+        @include inline-block();
+        background: url('../images/incorrect-icon.png') center center no-repeat;
+        height: 20px;
+        width: 20px;
+        text-indent: -9999px;
+      }
+
+      input {
+        border-color: red;
+      }
+    }
+
+    > span {
+      display: block;
+      margin-bottom: lh(.5);
+    }
+
+    p.answer {
+      @include inline-block();
+      margin-bottom: 0;
+      margin-left: 10px;
+
+      &:before {
+        content: "Answer: ";
+        font-weight: bold;
+        display: inline;
+
+      }
+      &:empty {
+        &:before {
+          display: none;
+        }
+      }
+    }
+
+    span {
+      &.unanswered, &.ui-icon-bullet {
+        @include inline-block();
+        background: url('../images/unanswered-icon.png') center center no-repeat;
+        height: 14px;
+        position: relative;
+        top: 4px;
+        width: 14px;
+      }
+
+      &.processing, &.ui-icon-processing {
+        @include inline-block();
+        background: url('../images/spinner.gif') center center no-repeat;
+        height: 20px;
+        position: relative;
+        top: 6px;
+        width: 25px;
+      }
+
+      &.correct, &.ui-icon-check {
+        @include inline-block();
+        background: url('../images/correct-icon.png') center center no-repeat;
+        height: 20px;
+        position: relative;
+        top: 6px;
+        width: 25px;
+      }
+
+      &.incorrect, &.ui-icon-close {
+        @include inline-block();
+        background: url('../images/incorrect-icon.png') center center no-repeat;
+        height: 20px;
+        width: 20px;
+        position: relative;
+        top: 6px;
+      }
+    }
+
+    .reload
+    {
+      float:right;
+      margin: 10px;
+    }
+
+
+    .grader-status {
+      padding: 9px;
+      background: #F6F6F6;
+      border: 1px solid #ddd;
+      border-top: 0;
+      margin-bottom: 20px;
+      @include clearfix;
+
+      span {
+        text-indent: -9999px;
+        overflow: hidden;
+        display: block;
+        float: left;
+        margin: -7px 7px 0 0;
+      }
+
+      .grading {
+        background: url('../images/info-icon.png') left center no-repeat;
+        padding-left: 25px;
+        text-indent: 0px;
+        margin: 0px 7px 0 0;
+      }
+
+      p {
+        line-height: 20px;
+        text-transform: capitalize;
+        margin-bottom: 0;
+        float: left;
+      }
+
+      &.file {
+        background: #FFF;
+        margin-top: 20px;
+        padding: 20px 0 0 0;
+
+        border: {
+          top: 1px solid #eee;
+          right: 0;
+          bottom: 0;
+          left: 0;
+        }
+
+        p.debug {
+          display: none;
+        }
+
+        input {
+          float: left;
+        }
+      }
+
+    }
+    .evaluation {
+        p {
+            margin-bottom: 4px;
+        }
+    }
+
+
+    .feedback-on-feedback {
+        height: 100px;
+        margin-right: 20px;
+    }
+
+    .evaluation-response {
+        header {
+            text-align: right;
+            a {
+                font-size: .85em;
+            }
+        }
+    }
+
+    .evaluation-scoring {
+        .scoring-list {
+            list-style-type: none;
+            margin-left: 3px;
+
+            li {
+                &:first-child {
+                    margin-left: 0px;
+                }
+                display:inline;
+                margin-left: 50px;
+
+                label {
+                    font-size: .9em;
+                }
+
+            }
+        }
+
+    }
+    .submit-message-container {
+        margin: 10px 0px ;
+    }
+  }
+
+  form.option-input {
+    margin: -10px 0 20px;
+    padding-bottom: 20px;
+
+    select {
+      margin-right: flex-gutter();
+    }
+  }
+
+  ul {
+    list-style: disc outside none;
+    margin-bottom: lh();
+    margin-left: .75em;
+    margin-left: .75rem;
+  }
+
+  ol {
+    list-style: decimal outside none;
+    margin-bottom: lh();
+    margin-left: .75em;
+    margin-left: .75rem;
+  }
+
+  dl {
+    line-height: 1.4em;
+  }
+
+  dl dt {
+    font-weight: bold;
+  }
+
+  dl dd {
+    margin-bottom: 0;
+  }
+
+  dd {
+    margin-left: .5em;
+    margin-left: .5rem;
+  }
+
+  li {
+    line-height: 1.4em;
+    margin-bottom: lh(.5);
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  p {
+    margin-bottom: lh();
+  }
+
+  hr {
+    background: #ddd;
+    border: none;
+    clear: both;
+    color: #ddd;
+    float: none;
+    height: 1px;
+    margin: 0 0 .75rem;
+    width: 100%;
+  }
+
+  .hidden {
+    display: none;
+    visibility: hidden;
+  }
+
+  #{$all-text-inputs} {
+    display: inline;
+    width: auto;
+  }
+
+  section.action {
+    margin-top: 20px;
+
+    input.save {
+      @extend .blue-button;
+    }
+
+    .submission_feedback {
+      // background: #F3F3F3;
+      // border: 1px solid #ddd;
+      // @include border-radius(3px);
+      // padding: 8px 12px;
+      // margin-top: 10px;
+      @include inline-block;
+      font-style: italic;
+      margin: 8px 0 0 10px;
+      color: #777;
+      -webkit-font-smoothing: antialiased;
+    }
+  }
+
+  .detailed-solution {
+    > p:first-child {
+      font-size: 0.9em;
+      font-weight: bold;
+      font-style: normal;
+      text-transform: uppercase;
+      color: #AAA;
+    }
+
+    p:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  div.capa_alert {
+    padding: 8px 12px;
+    border: 1px solid #EBE8BF;
+    border-radius: 3px;
+    background: #FFFCDD;
+    font-size: 0.9em;
+    margin-top: 10px;
+  }
+
+  div.capa_reset {
+    padding: 25px;
+    border: 1px solid $error-red;
+    background-color: lighten($error-red, 25%);
+    border-radius: 3px;
+    font-size: 1em;
+    margin-top: 10px;
+    margin-bottom: 10px;
+  }
+  .capa_reset>h2 {
+    color: #AA0000;
+  }
+  .capa_reset li {
+    font-size: 0.9em;
+  }
+
+  .external-grader-message {
+    section {
+      padding-left: 20px;
+      background-color: #FAFAFA;
+      color: #2C2C2C;
+      font-family: monospace;
+      font-size: 1em;
+      padding-top: 10px;
+      header {
+          font-size: 1.4em;
+      }
+
+      .shortform {
+        font-weight: bold;
+      }
+
+      .longform {
+        padding: 0px;
+        margin: 0px;
+
+        .result-errors {
+          margin: 5px;
+          padding: 10px 10px 10px 40px;
+          background: url('../images/incorrect-icon.png') center left no-repeat;
+          li {
+            color: #B00;
+            }
+        }
+
+        .result-output {
+          margin: 5px;
+          padding: 20px 0px 15px 50px;
+          border-top: 1px solid #DDD;
+          border-left: 20px solid #FAFAFA;
+
+          h4 {
+            font-family: monospace;
+            font-size: 1em;
+          }
+
+          dl {
+            margin: 0px;
+          }
+
+          dt {
+            margin-top: 20px;
+          }
+
+          dd {
+            margin-left: 24pt;
+          }
+        }
+
+        .result-correct {
+          background: url('../images/correct-icon.png') left 20px no-repeat;
+          .result-actual-output {
+            color: #090;
+          }
+        }
+
+        .result-incorrect {
+          background: url('../images/incorrect-icon.png') left 20px no-repeat;
+          .result-actual-output {
+            color: #B00;
+          }
+        }
+
+        .markup-text{
+          margin: 5px;
+          padding: 20px 0px 15px 50px;
+          border-top: 1px solid #DDD;
+          border-left: 20px solid #FAFAFA;
+
+          bs {
+            color: #BB0000;
+          }
+
+          bg {
+            color: #BDA046;
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index d02db0b932..694b0ae481 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -26,6 +26,8 @@ class @CombinedOpenEnded
     @submit_button = @$('.submit-button')
     @child_state = @el.data('state')
     @child_type = @el.data('child-type')
+    if @child_type="openended"
+      @reload_button = @$('.reload-button')
 
     @open_ended_child= @$('.open-ended-child')
 
@@ -45,6 +47,8 @@ class @CombinedOpenEnded
     @reset_button.hide()
     @next_problem_button.hide()
     @hint_area.attr('disabled', false)
+    if @child_type=="openended"
+      @reload_button.hide()
     if @child_state == 'initial'
       @answer_area.attr("disabled", false)
       @submit_button.prop('value', 'Submit')
@@ -53,7 +57,12 @@ class @CombinedOpenEnded
       @answer_area.attr("disabled", true)
       @submit_button.prop('value', 'Submit assessment')
       @submit_button.click @save_assessment
+      if @child_type == "openended"
+        @submit_button.hide()
+        @reload_button.show()
     else if @child_state == 'post_assessment'
+      if @child_type=="openended"
+        @reload_button.hide()
       @answer_area.attr("disabled", true)
       @submit_button.prop('value', 'Submit post-assessment')
       if @child_type=="selfassessment"
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 2f8e49e868..5bd17c220a 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -474,8 +474,10 @@ class OpenEndedModule():
         return {'valid' : True, 'score' : score_result['score'], 'feedback' : feedback}
 
     def is_submission_correct(self, score):
-        score_ratio = int(score) / float(self.max_score)
-        correct = (score_ratio >= 0.66)
+        correct=False
+        if(isinstance(score,(int, long, float, complex))):
+            score_ratio = int(score) / float(self.max_score)
+            correct = (score_ratio >= 0.66)
         return correct
 
     def handle_ajax(self, dispatch, get, system):
@@ -631,7 +633,7 @@ class OpenEndedModule():
             previous_answer = latest if latest is not None else self.initial_display
             feedback = self.latest_feedback()
             score= self.latest_score()
-            correct = "correct" if is_submission_correct else 'incorrect'
+            correct = 'correct' if self.is_submission_correct(score) else 'incorrect'
         else:
             feedback=""
             correct=""
@@ -649,7 +651,7 @@ class OpenEndedModule():
             'child_type' : 'openended',
             'correct' : correct,
             }
-
+        log.debug(context)
         html = system.render_template('open_ended.html', context)
         return html
 
diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html
index d98e10276d..b29c915d53 100644
--- a/lms/templates/open_ended.html
+++ b/lms/templates/open_ended.html
@@ -3,15 +3,15 @@
    <div class="error"></div>
    <div class="prompt">
     ${prompt|n}
-   </prompt>
+   </div>
   <textarea rows="${rows}" cols="${cols}" name="answer" class="answer short-form-response" id="input_${id}">${previous_answer|h}</textarea>
 
   <div class="message-wrapper">
     % if state == 'initial':
       <span class="unanswered" style="display:inline-block;" id="status_${id}">Unanswered</span>
-    % elif state == 'done' and correct=='incorrect':
+    % elif state in ['done', 'post_assessment'] and correct == 'incorrect':
       <span class="correct" id="status_${id}">Correct</span>
-    % elif state == 'done' and correct=='correct':
+    % elif state in ['done', 'post_assessment'] and correct == 'correct':
       <span class="incorrect" id="status_${id}">Incorrect</span>
     % elif state == 'assessing':
       <span class="grading" id="status_${id}">Submitted for grading</span>
@@ -26,9 +26,7 @@
 
   <span id="answer_${id}"></span>
 
-    % if state == 'assessing':
-    <input name="reload" class="reload" type="button" value="Recheck for Feedback" onclick="document.location.reload(true);" />
-    % endif
+  <input name="reload" class="reload-button" type="button" value="Recheck for Feedback" onclick="document.location.reload(true);" />
   <div class="external-grader-message">
       ${msg|n}
     % if state == 'post_assessment':

From e3da5aeb2c7e587805e15a7f209b3e457942ab96 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 18:48:40 -0500
Subject: [PATCH 113/541] Reverse correct and incorrect

---
 lms/templates/open_ended.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html
index b29c915d53..423b2dc709 100644
--- a/lms/templates/open_ended.html
+++ b/lms/templates/open_ended.html
@@ -9,9 +9,9 @@
   <div class="message-wrapper">
     % if state == 'initial':
       <span class="unanswered" style="display:inline-block;" id="status_${id}">Unanswered</span>
-    % elif state in ['done', 'post_assessment'] and correct == 'incorrect':
-      <span class="correct" id="status_${id}">Correct</span>
     % elif state in ['done', 'post_assessment'] and correct == 'correct':
+      <span class="correct" id="status_${id}">Correct</span>
+    % elif state in ['done', 'post_assessment'] and correct == 'incorrect':
       <span class="incorrect" id="status_${id}">Incorrect</span>
     % elif state == 'assessing':
       <span class="grading" id="status_${id}">Submitted for grading</span>

From 74222f9ef6f6a5088b862de66932d1584167b6b9 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 18:55:57 -0500
Subject: [PATCH 114/541] Fix silly mistake

---
 .../lib/xmodule/xmodule/js/src/combinedopenended/display.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 694b0ae481..45d0db8dac 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -26,7 +26,7 @@ class @CombinedOpenEnded
     @submit_button = @$('.submit-button')
     @child_state = @el.data('state')
     @child_type = @el.data('child-type')
-    if @child_type="openended"
+    if @child_type=="openended"
       @reload_button = @$('.reload-button')
 
     @open_ended_child= @$('.open-ended-child')

From 80763c9baefd39e3bd9eaa846b3897a82a86ded2 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 09:44:22 -0500
Subject: [PATCH 115/541] Remove some unneeded imports

---
 common/lib/xmodule/xmodule/combined_open_ended_module.py | 1 -
 common/lib/xmodule/xmodule/open_ended_module.py          | 1 -
 2 files changed, 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 4fcff80214..0c9ddd6bb9 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -43,7 +43,6 @@ class CombinedOpenEndedModule(XModule):
     DONE = 'done'
     TASK_TYPES=["self", "ml", "instructor", "peer"]
 
-    #,  resource_string(__name__, 'js/src/openended/display.coffee')
     js = {'coffee': [resource_string(__name__, 'js/src/combinedopenended/display.coffee')]}
     js_module_name = "CombinedOpenEnded"
 
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 5bd17c220a..e3e23c46d6 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -25,7 +25,6 @@ from .editing_module import EditingDescriptor
 from .html_checker import check_html
 from progress import Progress
 from .stringify import stringify_children
-from .x_module import XModule
 from .xml_module import XmlDescriptor
 from xmodule.modulestore import Location
 from capa.util import *

From 4b7195f21ee6b3561fe1a6dc0a85f521b23d97c9 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 13:01:29 -0500
Subject: [PATCH 116/541] Fix location problem

---
 common/lib/xmodule/xmodule/combined_open_ended_module.py | 1 +
 common/lib/xmodule/xmodule/open_ended_module.py          | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 0c9ddd6bb9..4fddb29bf1 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -77,6 +77,7 @@ class CombinedOpenEndedModule(XModule):
         # element.
         # Scores are on scale from 0 to max_score
         system.set('location', location)
+        log.debug(system.location)
         self.current_task_number = instance_state.get('current_task_number', 0)
         self.task_states= instance_state.get('task_states', [])
 
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index e3e23c46d6..e0911b6489 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -179,9 +179,9 @@ class OpenEndedModule():
 
         self.initial_display = find_with_default(oeparam, 'initial_display', '')
         self.answer = find_with_default(oeparam, 'answer_display', 'No answer given.')
-
+        
         parsed_grader_payload.update({
-            'location' : system.location,
+            'location' : system.location.url(),
             'course_id' : system.course_id,
             'prompt' : prompt_string,
             'rubric' : rubric_string,

From d8f6e1fe341b980143535411d2ac476bd45bb6c1 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 13:13:59 -0500
Subject: [PATCH 117/541] Factor out init modules, add in status display

---
 .../xmodule/combined_open_ended_module.py     |   3 +
 .../lib/xmodule/xmodule/open_ended_module.py  |  87 +-----------
 common/lib/xmodule/xmodule/openendedchild.py  | 130 ++++++++++++++++++
 .../xmodule/xmodule/self_assessment_module.py |  83 +----------
 lms/templates/combined_open_ended.html        |   3 +
 lms/templates/combined_open_ended_status.html |   3 +
 6 files changed, 146 insertions(+), 163 deletions(-)
 create mode 100644 common/lib/xmodule/xmodule/openendedchild.py
 create mode 100644 lms/templates/combined_open_ended_status.html

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 4fddb29bf1..ecdc67a120 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -283,6 +283,9 @@ class CombinedOpenEndedModule(XModule):
 
         return json.dumps(state)
 
+    def get_status(self):
+        pass
+
 class CombinedOpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
     """
     Module for adding self assessment questions to courses
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index e0911b6489..174fa5e326 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -28,6 +28,7 @@ from .stringify import stringify_children
 from .xml_module import XmlDescriptor
 from xmodule.modulestore import Location
 from capa.util import *
+import openendedchild
 
 from datetime import datetime
 
@@ -42,89 +43,9 @@ MAX_ATTEMPTS = 1
 # Overriden by max_score specified in xml.
 MAX_SCORE = 1
 
-class OpenEndedModule():
-    """
-    States:
-
-    initial (prompt, textbox shown)
-         |
-    assessing (read-only textbox, rubric + assessment input shown)
-         |
-    request_hint (read-only textbox, read-only rubric and assessment, hint input box shown)
-         |
-    done (submitted msg, green checkmark, everything else read-only.  If attempts < max, shows
-         a reset button that goes back to initial state.  Saves previous
-         submissions too.)
-    """
-
-    DEFAULT_QUEUE = 'open-ended'
-    DEFAULT_MESSAGE_QUEUE = 'open-ended-message'
-    max_inputfields = 1
-
-    STATE_VERSION = 1
-
-    # states
-    INITIAL = 'initial'
-    ASSESSING = 'assessing'
-    POST_ASSESSMENT = 'post_assessment'
-    DONE = 'done'
-
-    def __init__(self, system, location, definition, descriptor,
-                 instance_state=None, shared_state=None, **kwargs):
-        """
-        Definition file should have 4 blocks -- prompt, rubric, submitmessage, hintprompt,
-        and two optional attributes:
-        attempts, which should be an integer that defaults to 1.
-        If it's > 1, the student will be able to re-submit after they see
-        the rubric.
-        max_score, which should be an integer that defaults to 1.
-        It defines the maximum number of points a student can get.  Assumed to be integer scale
-        from 0 to max_score, with an interval of 1.
-
-        Note: all the submissions are stored.
-
-        Sample file:
-
-        <selfassessment attempts="1" max_score="1">
-            <prompt>
-                Insert prompt text here.  (arbitrary html)
-            </prompt>
-            <rubric>
-                Insert grading rubric here.  (arbitrary html)
-            </rubric>
-            <hintprompt>
-                Please enter a hint below: (arbitrary html)
-            </hintprompt>
-            <submitmessage>
-                Thanks for submitting!  (arbitrary html)
-            </submitmessage>
-        </selfassessment>
-        """
-
-        # Load instance state
-        if instance_state is not None:
-            log.debug(instance_state)
-            instance_state = json.loads(instance_state)
-        else:
-            instance_state = {}
-
-        # History is a list of tuples of (answer, score, hint), where hint may be
-        # None for any element, and score and hint can be None for the last (current)
-        # element.
-        # Scores are on scale from 0 to max_score
-        self.history = instance_state.get('history', [])
-
-        self.state = instance_state.get('state', 'initial')
-
-        self.created = instance_state.get('created', "False")
-
-        self.attempts = instance_state.get('attempts', 0)
-        self.max_attempts = int(instance_state.get('attempts', MAX_ATTEMPTS))
-
-        # Used for progress / grading.  Currently get credit just for
-        # completion (doesn't matter if you self-assessed correct/incorrect).
-        self._max_score = int(instance_state.get('max_score', MAX_SCORE))
+class OpenEndedModule(openendedchild.OpenEndedChild):
 
+    def setup_response(self, system, location, definition, descriptor):
         oeparam = definition['oeparam']
         prompt = definition['prompt']
         rubric = definition['rubric']
@@ -179,7 +100,7 @@ class OpenEndedModule():
 
         self.initial_display = find_with_default(oeparam, 'initial_display', '')
         self.answer = find_with_default(oeparam, 'answer_display', 'No answer given.')
-        
+
         parsed_grader_payload.update({
             'location' : system.location.url(),
             'course_id' : system.course_id,
diff --git a/common/lib/xmodule/xmodule/openendedchild.py b/common/lib/xmodule/xmodule/openendedchild.py
new file mode 100644
index 0000000000..b8162800a9
--- /dev/null
+++ b/common/lib/xmodule/xmodule/openendedchild.py
@@ -0,0 +1,130 @@
+"""
+A Self Assessment module that allows students to write open-ended responses,
+submit, then see a rubric and rate themselves.  Persists student supplied
+hints, answers, and assessment judgment (currently only correct/incorrect).
+Parses xml definition file--see below for exact format.
+"""
+
+import copy
+from fs.errors import ResourceNotFoundError
+import itertools
+import json
+import logging
+from lxml import etree
+from lxml.html import rewrite_links
+from path import path
+import os
+import sys
+import hashlib
+import capa.xqueue_interface as xqueue_interface
+
+from pkg_resources import resource_string
+
+from .capa_module import only_one, ComplexEncoder
+from .editing_module import EditingDescriptor
+from .html_checker import check_html
+from progress import Progress
+from .stringify import stringify_children
+from .xml_module import XmlDescriptor
+from xmodule.modulestore import Location
+from capa.util import *
+
+from datetime import datetime
+
+log = logging.getLogger("mitx.courseware")
+
+# Set the default number of max attempts.  Should be 1 for production
+# Set higher for debugging/testing
+# attempts specified in xml definition overrides this.
+MAX_ATTEMPTS = 1
+
+# Set maximum available number of points.
+# Overriden by max_score specified in xml.
+MAX_SCORE = 1
+
+class OpenEndedChild():
+    """
+    States:
+
+    initial (prompt, textbox shown)
+         |
+    assessing (read-only textbox, rubric + assessment input shown)
+         |
+    request_hint (read-only textbox, read-only rubric and assessment, hint input box shown)
+         |
+    done (submitted msg, green checkmark, everything else read-only.  If attempts < max, shows
+         a reset button that goes back to initial state.  Saves previous
+         submissions too.)
+    """
+
+    DEFAULT_QUEUE = 'open-ended'
+    DEFAULT_MESSAGE_QUEUE = 'open-ended-message'
+    max_inputfields = 1
+
+    STATE_VERSION = 1
+
+    # states
+    INITIAL = 'initial'
+    ASSESSING = 'assessing'
+    POST_ASSESSMENT = 'post_assessment'
+    DONE = 'done'
+
+    def __init__(self, system, location, definition, descriptor,
+                 instance_state=None, shared_state=None, **kwargs):
+        """
+        Definition file should have 4 blocks -- prompt, rubric, submitmessage, hintprompt,
+        and two optional attributes:
+        attempts, which should be an integer that defaults to 1.
+        If it's > 1, the student will be able to re-submit after they see
+        the rubric.
+        max_score, which should be an integer that defaults to 1.
+        It defines the maximum number of points a student can get.  Assumed to be integer scale
+        from 0 to max_score, with an interval of 1.
+
+        Note: all the submissions are stored.
+
+        Sample file:
+
+        <selfassessment attempts="1" max_score="1">
+            <prompt>
+                Insert prompt text here.  (arbitrary html)
+            </prompt>
+            <rubric>
+                Insert grading rubric here.  (arbitrary html)
+            </rubric>
+            <hintprompt>
+                Please enter a hint below: (arbitrary html)
+            </hintprompt>
+            <submitmessage>
+                Thanks for submitting!  (arbitrary html)
+            </submitmessage>
+        </selfassessment>
+        """
+
+        # Load instance state
+        if instance_state is not None:
+            instance_state = json.loads(instance_state)
+        else:
+            instance_state = {}
+
+        # History is a list of tuples of (answer, score, hint), where hint may be
+        # None for any element, and score and hint can be None for the last (current)
+        # element.
+        # Scores are on scale from 0 to max_score
+        self.history = instance_state.get('history', [])
+
+        self.state = instance_state.get('state', 'initial')
+
+        self.created = instance_state.get('created', "False")
+
+        self.attempts = instance_state.get('attempts', 0)
+        self.max_attempts = int(instance_state.get('attempts', MAX_ATTEMPTS))
+
+        # Used for progress / grading.  Currently get credit just for
+        # completion (doesn't matter if you self-assessed correct/incorrect).
+        self._max_score = int(instance_state.get('max_score', MAX_SCORE))
+
+        self.setup_response(system, location, definition, descriptor)
+
+    def setup_response(self, system, location, definition, descriptor):
+        pass
\ No newline at end of file
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index 64edb2bb8a..6c064bebf8 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -26,6 +26,7 @@ from .stringify import stringify_children
 from .x_module import XModule
 from .xml_module import XmlDescriptor
 from xmodule.modulestore import Location
+import openendedchild
 
 log = logging.getLogger("mitx.courseware")
 
@@ -38,92 +39,14 @@ MAX_ATTEMPTS = 1
 # Overriden by max_score specified in xml.
 MAX_SCORE = 1
 
-class SelfAssessmentModule():
-    """
-    States:
-
-    initial (prompt, textbox shown)
-         |
-    assessing (read-only textbox, rubric + assessment input shown)
-         |
-    request_hint (read-only textbox, read-only rubric and assessment, hint input box shown)
-         |
-    done (submitted msg, green checkmark, everything else read-only.  If attempts < max, shows
-         a reset button that goes back to initial state.  Saves previous
-         submissions too.)
-    """
-
-    STATE_VERSION = 1
-
-    # states
-    INITIAL = 'initial'
-    ASSESSING = 'assessing'
-    REQUEST_HINT = 'post_assessment'
-    DONE = 'done'
-
-    def __init__(self, system, location, definition, descriptor,
-                 instance_state=None, shared_state=None, **kwargs):
-        """
-        Definition file should have 4 blocks -- prompt, rubric, submitmessage, hintprompt,
-        and two optional attributes:
-        attempts, which should be an integer that defaults to 1.
-        If it's > 1, the student will be able to re-submit after they see
-        the rubric.
-        max_score, which should be an integer that defaults to 1.
-        It defines the maximum number of points a student can get.  Assumed to be integer scale
-        from 0 to max_score, with an interval of 1.
-
-        Note: all the submissions are stored.
-
-        Sample file:
-
-        <selfassessment attempts="1" max_score="1">
-            <prompt>
-                Insert prompt text here.  (arbitrary html)
-            </prompt>
-            <rubric>
-                Insert grading rubric here.  (arbitrary html)
-            </rubric>
-            <hintprompt>
-                Please enter a hint below: (arbitrary html)
-            </hintprompt>
-            <submitmessage>
-                Thanks for submitting!  (arbitrary html)
-            </submitmessage>
-        </selfassessment>
-        """
-
-        # Load instance state
-        if instance_state is not None:
-            instance_state = json.loads(instance_state)
-        else:
-            instance_state = {}
-
-        instance_state = self.convert_state_to_current_format(instance_state)
-
-        # History is a list of tuples of (answer, score, hint), where hint may be
-        # None for any element, and score and hint can be None for the last (current)
-        # element.
-        # Scores are on scale from 0 to max_score
-        self.history = instance_state.get('history', [])
-
-        self.created = instance_state.get('created', "False")
-
-        self.state = instance_state.get('state', 'initial')
-
-        self.attempts = instance_state.get('attempts', 0)
-        self.max_attempts = int(instance_state.get('attempts', MAX_ATTEMPTS))
-
-        # Used for progress / grading.  Currently get credit just for
-        # completion (doesn't matter if you self-assessed correct/incorrect).
-        self._max_score = int(instance_state.get('max_score', MAX_SCORE))
+class SelfAssessmentModule(openendedchild.OpenEndedChild):
 
+    def setup_response(self, system, location, definition, descriptor):
         self.rubric = definition['rubric']
         self.prompt = definition['prompt']
         self.submit_message = definition['submitmessage']
         self.hint_prompt = definition['hintprompt']
 
-
     def latest_answer(self):
         """None if not available"""
         if not self.history:
diff --git a/lms/templates/combined_open_ended.html b/lms/templates/combined_open_ended.html
index 5b6823e809..a050dad906 100644
--- a/lms/templates/combined_open_ended.html
+++ b/lms/templates/combined_open_ended.html
@@ -6,5 +6,8 @@
 
     <input type="button" value="Reset" class="reset-button" name="reset"/>
     <input type="button" value="Next Step" class="next-step-button" name="reset"/>
+
+    <div class="status">${status | n}</div>
+
 </section>
 
diff --git a/lms/templates/combined_open_ended_status.html b/lms/templates/combined_open_ended_status.html
new file mode 100644
index 0000000000..770870b077
--- /dev/null
+++ b/lms/templates/combined_open_ended_status.html
@@ -0,0 +1,3 @@
+<section id="combined-open-ended-status" class="combined-open-ended-status">
+
+</section>
\ No newline at end of file

From 5333e5e1fc8195d794f0f6f50fed91c44b6a6eca Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 13:26:27 -0500
Subject: [PATCH 118/541] Refactoring to open ended child

---
 .../lib/xmodule/xmodule/open_ended_module.py  | 80 ++---------------
 common/lib/xmodule/xmodule/openendedchild.py  | 82 +++++++++++++++++-
 .../xmodule/xmodule/self_assessment_module.py | 85 +------------------
 3 files changed, 92 insertions(+), 155 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 174fa5e326..b19ed4aa27 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -69,7 +69,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         if self.created=="True" and self.state == self.ASSESSING:
             self.created="False"
-            self.get_score(self.latest_answer(), system)
+            self.send_to_grader(self.latest_answer(), system)
             self.created="False"
 
     def _parse(self, oeparam, prompt, rubric, system):
@@ -180,7 +180,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         return {'success' : success, 'msg' : "Successfully submitted your feedback."}
 
-    def get_score(self, submission, system):
+    def send_to_grader(self, submission, system):
 
         # Prepare xqueue request
         #------------------------------------------------------------
@@ -228,7 +228,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             score_msg['feedback'] = 'Invalid grader reply. Please contact the course staff.'
 
         self.record_latest_score(score_msg['score'])
-        self.record_latest_feedback(score_msg['feedback'])
+        self.record_latest_post_assessment(score_msg['feedback'])
         self.state=self.POST_ASSESSMENT
 
         return True
@@ -461,7 +461,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         # add new history element with answer and empty score and hint.
         self.new_history_entry(get['student_answer'])
-        self.get_score(get['student_answer'], system)
+        self.send_to_grader(get['student_answer'], system)
         self.change_state(self.ASSESSING)
 
         return {'success': True,}
@@ -496,66 +496,16 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         if self.state == self.DONE:
             self.attempts += 1
 
-    def get_instance_state(self):
-        """
-        Get the current score and state
-        """
-
-        state = {
-            'version': self.STATE_VERSION,
-            'history': self.history,
-            'state': self.state,
-            'max_score': self._max_score,
-            'attempts': self.attempts,
-            'created' : "False",
-            }
-        return json.dumps(state)
-
-    def latest_answer(self):
-        """None if not available"""
-        if not self.history:
-            return ""
-        return self.history[-1].get('answer', "")
-
-    def latest_score(self):
-        """None if not available"""
-        if not self.history:
-            return ""
-        return self.history[-1].get('score', "")
-
-    def latest_feedback(self):
-        """None if not available"""
-        if not self.history:
-            return ""
-        return self.history[-1].get('feedback', "")
-
-    def new_history_entry(self, answer):
-        self.history.append({'answer': answer})
-
-    def record_latest_score(self, score):
-        """Assumes that state is right, so we're adding a score to the latest
-        history element"""
-        self.history[-1]['score'] = score
-
-    def record_latest_feedback(self, feedback):
-        """Assumes that state is right, so we're adding a score to the latest
-        history element"""
-        self.history[-1]['feedback'] = feedback
-
-    def _allow_reset(self):
-        """Can the module be reset?"""
-        return self.state == self.DONE and self.attempts < self.max_attempts
-
     def get_html(self, system):
         #set context variables and render template
         if self.state != self.INITIAL:
             latest = self.latest_answer()
             previous_answer = latest if latest is not None else self.initial_display
-            feedback = self.latest_feedback()
+            post_assessment = self.latest_post_assessment()
             score= self.latest_score()
             correct = 'correct' if self.is_submission_correct(score) else 'incorrect'
         else:
-            feedback=""
+            post_assessment=""
             correct=""
             previous_answer = self.initial_display
 
@@ -567,7 +517,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             'rows' : 30,
             'cols' : 80,
             'id' : 'open_ended',
-            'msg' : feedback,
+            'msg' : post_assessment,
             'child_type' : 'openended',
             'correct' : correct,
             }
@@ -575,27 +525,13 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         html = system.render_template('open_ended.html', context)
         return html
 
-    def max_score(self):
-        """
-        Return max_score
-        """
-        return self._max_score
-
-    def get_score_value(self):
-        """
-        Returns the last score in the list
-        """
-        score = self.latest_score()
-        return {'score': score if score is not None else 0,
-                'total': self._max_score}
-
     def get_progress(self):
         '''
         For now, just return last score / max_score
         '''
         if self._max_score > 0:
             try:
-                return Progress(self.get_score_value()['score'], self._max_score)
+                return Progress(self.get_score()['score'], self._max_score)
             except Exception as err:
                 log.exception("Got bad progress")
                 return None
diff --git a/common/lib/xmodule/xmodule/openendedchild.py b/common/lib/xmodule/xmodule/openendedchild.py
index b8162800a9..e8800d27dd 100644
--- a/common/lib/xmodule/xmodule/openendedchild.py
+++ b/common/lib/xmodule/xmodule/openendedchild.py
@@ -127,4 +127,84 @@ class OpenEndedChild():
         self.setup_response(system, location, definition, descriptor)
 
     def setup_response(self, system, location, definition, descriptor):
-        pass
\ No newline at end of file
+        pass
+
+    def latest_answer(self):
+        """None if not available"""
+        if not self.history:
+            return ""
+        return self.history[-1].get('answer', "")
+
+    def latest_score(self):
+        """None if not available"""
+        if not self.history:
+            return None
+        return self.history[-1].get('score')
+
+    def latest_post_assessment(self):
+        """None if not available"""
+        if not self.history:
+            return ""
+        return self.history[-1].get('post_assessment', "")
+
+    def new_history_entry(self, answer):
+        self.history.append({'answer': answer})
+
+    def record_latest_score(self, score):
+        """Assumes that state is right, so we're adding a score to the latest
+        history element"""
+        self.history[-1]['score'] = score
+
+    def record_latest_post_assessment(self, post_assessment):
+        """Assumes that state is right, so we're adding a score to the latest
+        history element"""
+        self.history[-1]['post_assessment'] = post_assessment
+
+    def change_state(self, new_state):
+        """
+        A centralized place for state changes--allows for hooks.  If the
+        current state matches the old state, don't run any hooks.
+        """
+        if self.state == new_state:
+            return
+
+        self.state = new_state
+
+        if self.state == self.DONE:
+            self.attempts += 1
+
+    def get_instance_state(self):
+        """
+        Get the current score and state
+        """
+
+        state = {
+            'version': self.STATE_VERSION,
+            'history': self.history,
+            'state': self.state,
+            'max_score': self._max_score,
+            'attempts': self.attempts,
+            'created' : "False",
+            }
+        return json.dumps(state)
+
+    def _allow_reset(self):
+        """Can the module be reset?"""
+        return self.state == self.DONE and self.attempts < self.max_attempts
+
+    def max_score(self):
+        """
+        Return max_score
+        """
+        return self._max_score
+
+    def get_score(self):
+        """
+        Returns the last score in the list
+        """
+        score = self.latest_score()
+        return {'score': score if score is not None else 0,
+                'total': self._max_score}
+
+
+
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index 6c064bebf8..864bfee7f8 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -47,51 +47,6 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         self.submit_message = definition['submitmessage']
         self.hint_prompt = definition['hintprompt']
 
-    def latest_answer(self):
-        """None if not available"""
-        if not self.history:
-            return None
-        return self.history[-1].get('answer')
-
-    def latest_score(self):
-        """None if not available"""
-        if not self.history:
-            return None
-        return self.history[-1].get('score')
-
-    def latest_hint(self):
-        """None if not available"""
-        if not self.history:
-            return None
-        return self.history[-1].get('hint')
-
-    def new_history_entry(self, answer):
-        self.history.append({'answer': answer})
-
-    def record_latest_score(self, score):
-        """Assumes that state is right, so we're adding a score to the latest
-        history element"""
-        self.history[-1]['score'] = score
-
-    def record_latest_hint(self, hint):
-        """Assumes that state is right, so we're adding a score to the latest
-        history element"""
-        self.history[-1]['hint'] = hint
-
-
-    def change_state(self, new_state):
-        """
-        A centralized place for state changes--allows for hooks.  If the
-        current state matches the old state, don't run any hooks.
-        """
-        if self.state == new_state:
-            return
-
-        self.state = new_state
-
-        if self.state == self.DONE:
-            self.attempts += 1
-
     @staticmethod
     def convert_state_to_current_format(old_state):
         """
@@ -138,11 +93,6 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
                      student_answers, scores, hints)]
         return new_state
 
-
-    def _allow_reset(self):
-        """Can the module be reset?"""
-        return self.state == self.DONE and self.attempts < self.max_attempts
-
     def get_html(self, system):
         #set context variables and render template
         if self.state != self.INITIAL:
@@ -166,20 +116,6 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         html = system.render_template('self_assessment_prompt.html', context)
         return html
 
-    def max_score(self):
-        """
-        Return max_score
-        """
-        return self._max_score
-
-    def get_score(self):
-        """
-        Returns the last score in the list
-        """
-        score = self.latest_score()
-        return {'score': score if score is not None else 0,
-                'total': self._max_score}
-
     def get_progress(self):
         '''
         For now, just return last score / max_score
@@ -207,7 +143,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         handlers = {
             'save_answer': self.save_answer,
             'save_assessment': self.save_assessment,
-            'save_post_assessment': self.save_hint,
+            'save_post_assessment': self.save_post_assessment,
         }
 
         if dispatch not in handlers:
@@ -261,7 +197,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
 
         if self.state == self.DONE:
             # display the previous hint
-            latest = self.latest_hint()
+            latest = self.latest_post_assessment()
             hint = latest if latest is not None else ''
         else:
             hint = ''
@@ -376,7 +312,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
             # the same number of hints and answers.
             return self.out_of_sync_error(get)
 
-        self.record_latest_hint(get['hint'])
+        self.record_latest_post_assessment(get['hint'])
         self.change_state(self.DONE)
 
         return {'success': True,
@@ -403,21 +339,6 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         return {'success': True}
 
 
-    def get_instance_state(self):
-        """
-        Get the current score and state
-        """
-
-        state = {
-                 'version': self.STATE_VERSION,
-                 'history': self.history,
-                 'state': self.state,
-                 'max_score': self._max_score,
-                 'attempts': self.attempts,
-                 'created' : "False",
-        }
-        return json.dumps(state)
-
 
 class SelfAssessmentDescriptor(XmlDescriptor, EditingDescriptor):
     """

From 24689024fd28c35130d7d4ff22a416155e4c0a57 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 13:32:59 -0500
Subject: [PATCH 119/541] Refactor open ended module

---
 .../lib/xmodule/xmodule/open_ended_module.py  | 54 -------------------
 common/lib/xmodule/xmodule/openendedchild.py  | 38 +++++++++++++
 .../xmodule/xmodule/self_assessment_module.py | 41 --------------
 3 files changed, 38 insertions(+), 95 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index b19ed4aa27..de24d30502 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -411,7 +411,6 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
           <other request-specific values here > }
         '''
         handlers = {
-            'problem_get': self.get_problem,
             'save_answer': self.save_answer,
             'score_update': self.update_score,
             'save_post_assessment' : self.message_post,
@@ -429,23 +428,6 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             })
         return json.dumps(d, cls=ComplexEncoder)
 
-    def get_problem(self, get, system):
-        return self.get_html(system)
-
-    def reset_problem(self, get, system):
-        self.change_state(self.INITIAL)
-        return {'success': True}
-
-    def out_of_sync_error(self, get, msg=''):
-        """
-        return dict out-of-sync error message, and also log.
-        """
-        log.warning("Assessment module state out sync. state: %r, get: %r. %s",
-            self.state, get, msg)
-        return {'success': False,
-                'error': 'The problem state got out-of-sync'}
-
-
     def save_answer(self, get, system):
         if self.attempts > self.max_attempts:
             # If too many attempts, prevent student from saving answer and
@@ -483,19 +465,6 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         return dict()  # No AJAX return is needed
 
-    def change_state(self, new_state):
-        """
-        A centralized place for state changes--allows for hooks.  If the
-        current state matches the old state, don't run any hooks.
-        """
-        if self.state == new_state:
-            return
-
-        self.state = new_state
-
-        if self.state == self.DONE:
-            self.attempts += 1
-
     def get_html(self, system):
         #set context variables and render template
         if self.state != self.INITIAL:
@@ -525,29 +494,6 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         html = system.render_template('open_ended.html', context)
         return html
 
-    def get_progress(self):
-        '''
-        For now, just return last score / max_score
-        '''
-        if self._max_score > 0:
-            try:
-                return Progress(self.get_score()['score'], self._max_score)
-            except Exception as err:
-                log.exception("Got bad progress")
-                return None
-        return None
-
-    def reset(self, system):
-        """
-        If resetting is allowed, reset the state.
-
-        Returns {'success': bool, 'error': msg}
-        (error only present if not success)
-        """
-        self.change_state(self.INITIAL)
-        return {'success': True}
-
-
 class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
     """
     Module for adding self assessment questions to courses
diff --git a/common/lib/xmodule/xmodule/openendedchild.py b/common/lib/xmodule/xmodule/openendedchild.py
index e8800d27dd..e152123c37 100644
--- a/common/lib/xmodule/xmodule/openendedchild.py
+++ b/common/lib/xmodule/xmodule/openendedchild.py
@@ -206,5 +206,43 @@ class OpenEndedChild():
         return {'score': score if score is not None else 0,
                 'total': self._max_score}
 
+    def reset(self, system):
+        """
+        If resetting is allowed, reset the state.
+
+        Returns {'success': bool, 'error': msg}
+        (error only present if not success)
+        """
+        self.change_state(self.INITIAL)
+        return {'success': True}
+
+    def get_progress(self):
+        '''
+        For now, just return last score / max_score
+        '''
+        if self._max_score > 0:
+            try:
+                return Progress(self.get_score()['score'], self._max_score)
+            except Exception as err:
+                log.exception("Got bad progress")
+                return None
+        return None
+
+    def out_of_sync_error(self, get, msg=''):
+        """
+        return dict out-of-sync error message, and also log.
+        """
+        log.warning("Assessment module state out sync. state: %r, get: %r. %s",
+            self.state, get, msg)
+        return {'success': False,
+                'error': 'The problem state got out-of-sync'}
+
+    def get_html(self):
+        pass
+
+    def handle_ajax(self):
+        pass
+
+
 
 
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index 864bfee7f8..728a2fd0df 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -116,18 +116,6 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         html = system.render_template('self_assessment_prompt.html', context)
         return html
 
-    def get_progress(self):
-        '''
-        For now, just return last score / max_score
-        '''
-        if self._max_score > 0:
-            try:
-                return Progress(self.get_score()['score'], self._max_score)
-            except Exception as err:
-                log.exception("Got bad progress")
-                return None
-        return None
-
 
     def handle_ajax(self, dispatch, get, system):
         """
@@ -158,15 +146,6 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         })
         return json.dumps(d, cls=ComplexEncoder)
 
-    def out_of_sync_error(self, get, msg=''):
-        """
-        return dict out-of-sync error message, and also log.
-        """
-        log.warning("Assessment module state out sync. state: %r, get: %r. %s",
-                    self.state, get, msg)
-        return {'success': False,
-                'error': 'The problem state got out-of-sync'}
-
     def get_rubric_html(self,system):
         """
         Return the appropriate version of the rubric, based on the state.
@@ -296,7 +275,6 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         d['state'] = self.state
         return d
 
-
     def save_hint(self, get, system):
         '''
         Save the hint.
@@ -320,25 +298,6 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
                 'allow_reset': self._allow_reset()}
 
 
-    def reset(self, system):
-        """
-        If resetting is allowed, reset the state.
-
-        Returns {'success': bool, 'error': msg}
-        (error only present if not success)
-        """
-        #if self.state != self.DONE:
-        #    return self.out_of_sync_error(get)
-
-        #if self.attempts > self.max_attempts:
-        #    return {
-        #        'success': False,
-        #        'error': 'Too many attempts.'
-        #    }
-        self.change_state(self.INITIAL)
-        return {'success': True}
-
-
 
 class SelfAssessmentDescriptor(XmlDescriptor, EditingDescriptor):
     """

From db7bff293e0c97c46321f4c5d17260d78fec1f11 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 13:34:44 -0500
Subject: [PATCH 120/541] Add in placeholder status

---
 common/lib/xmodule/xmodule/combined_open_ended_module.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index ecdc67a120..75613f7ed1 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -165,6 +165,7 @@ class CombinedOpenEndedModule(XModule):
             'state' : self.state,
             'task_count' : len(self.task_xml),
             'task_number' : self.current_task_number+1,
+            'status' : "temporary status."
             }
 
         html = self.system.render_template('combined_open_ended.html', context)

From 74d95cde4db12305a1926a2b34dae114f31dca6f Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 13:36:13 -0500
Subject: [PATCH 121/541] Fix naming bug

---
 common/lib/xmodule/xmodule/self_assessment_module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index 728a2fd0df..cd8ef72c6e 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -131,7 +131,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         handlers = {
             'save_answer': self.save_answer,
             'save_assessment': self.save_assessment,
-            'save_post_assessment': self.save_post_assessment,
+            'save_post_assessment': self.save_hint,
         }
 
         if dispatch not in handlers:

From 1c6f271bbb73a2e24c396cc542406989f59ba788 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 13:38:10 -0500
Subject: [PATCH 122/541] Fix naming bug

---
 common/lib/xmodule/xmodule/self_assessment_module.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index cd8ef72c6e..de0126c3e0 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -160,7 +160,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
 
         if self.state == self.ASSESSING:
             context['read_only'] = False
-        elif self.state in (self.REQUEST_HINT, self.DONE):
+        elif self.state in (self.POST_ASSESSMENT, self.DONE):
             context['read_only'] = True
         else:
             raise ValueError("Illegal state '%r'" % self.state)
@@ -184,7 +184,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         context = {'hint_prompt': self.hint_prompt,
                    'hint': hint}
 
-        if self.state == self.REQUEST_HINT:
+        if self.state == self.POST_ASSESSMENT:
             context['read_only'] = False
         elif self.state == self.DONE:
             context['read_only'] = True
@@ -269,7 +269,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
             d['message_html'] = self.get_message_html()
             d['allow_reset'] = self._allow_reset()
         else:
-            self.change_state(self.REQUEST_HINT)
+            self.change_state(self.POST_ASSESSMENT)
             d['hint_html'] = self.get_hint_html(system)
 
         d['state'] = self.state
@@ -285,7 +285,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         with the error key only present if success is False and message_html
         only if True.
         '''
-        if self.state != self.REQUEST_HINT:
+        if self.state != self.POST_ASSESSMENT:
             # Note: because we only ask for hints on wrong answers, may not have
             # the same number of hints and answers.
             return self.out_of_sync_error(get)

From a06680a23b27e58bc8e402170f1ab0306776758c Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 13:48:05 -0500
Subject: [PATCH 123/541] Move status, remove self assessment format conversion

---
 .../xmodule/xmodule/self_assessment_module.py | 46 -------------------
 lms/templates/combined_open_ended.html        |  4 +-
 2 files changed, 2 insertions(+), 48 deletions(-)

diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index de0126c3e0..c03620e57f 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -47,52 +47,6 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         self.submit_message = definition['submitmessage']
         self.hint_prompt = definition['hintprompt']
 
-    @staticmethod
-    def convert_state_to_current_format(old_state):
-        """
-        This module used to use a problematic state representation. This method
-        converts that into the new format.
-
-        Args:
-            old_state: dict of state, as passed in.  May be old.
-
-        Returns:
-            new_state: dict of new state
-        """
-        if old_state.get('version', 0) == SelfAssessmentModule.STATE_VERSION:
-            # already current
-            return old_state
-
-        # for now, there's only one older format.
-
-        new_state = {'version': SelfAssessmentModule.STATE_VERSION}
-
-        def copy_if_present(key):
-            if key in old_state:
-                new_state[key] = old_state[key]
-
-        for to_copy in ['attempts', 'state']:
-            copy_if_present(to_copy)
-
-        # The answers, scores, and hints need to be kept together to avoid them
-        # getting out of sync.
-
-        # NOTE: Since there's only one problem with a few hundred submissions
-        # in production so far, not trying to be smart about matching up hints
-        # and submissions in cases where they got out of sync.
-
-        student_answers = old_state.get('student_answers', [])
-        scores = old_state.get('scores', [])
-        hints = old_state.get('hints', [])
-
-        new_state['history'] = [
-            {'answer': answer,
-             'score': score,
-             'hint': hint}
-             for answer, score, hint in itertools.izip_longest(
-                     student_answers, scores, hints)]
-        return new_state
-
     def get_html(self, system):
         #set context variables and render template
         if self.state != self.INITIAL:
diff --git a/lms/templates/combined_open_ended.html b/lms/templates/combined_open_ended.html
index a050dad906..84bded0bec 100644
--- a/lms/templates/combined_open_ended.html
+++ b/lms/templates/combined_open_ended.html
@@ -1,5 +1,7 @@
 <section id="combined-open-ended" class="combined-open-ended" data-ajax-url="${ajax_url}" data-allow_reset="${allow_reset}" data-state="${state}" data-task-count="${task_count}" data-task-number="${task_number}">
 
+    <div class="status">${status | n}</div>
+
     % for item in items:
     <div class="item">${item['content'] | n}</div>
     % endfor
@@ -7,7 +9,5 @@
     <input type="button" value="Reset" class="reset-button" name="reset"/>
     <input type="button" value="Next Step" class="next-step-button" name="reset"/>
 
-    <div class="status">${status | n}</div>
-
 </section>
 

From 0e2355c279b2fb450ec7f14284c926f460d83728 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 13:58:09 -0500
Subject: [PATCH 124/541] Work on templating for status display

---
 .../xmodule/combined_open_ended_module.py      | 18 ++++++++++++++----
 common/lib/xmodule/xmodule/openendedchild.py   |  3 +++
 .../xmodule/xmodule/self_assessment_module.py  |  1 -
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 75613f7ed1..7497e5a8b5 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -98,7 +98,9 @@ class CombinedOpenEndedModule(XModule):
         return tag
 
     def overwrite_state(self, current_task_state):
-        last_response, last_score=self.get_last_response(self.current_task_number-1)
+        last_response_data=self.get_last_response(self.current_task_number-1)
+        last_response = last_response_data['response']
+
         loaded_task_state=json.loads(current_task_state)
         if loaded_task_state['state']== self.INITIAL:
             loaded_task_state['state']=self.ASSESSING
@@ -139,7 +141,8 @@ class CombinedOpenEndedModule(XModule):
             self.task_states.append(self.current_task.get_instance_state())
             self.state=self.ASSESSING
         elif current_task_state is None and self.current_task_number>0:
-            last_response, last_score=self.get_last_response(self.current_task_number-1)
+            last_response_data =self.get_last_response(self.current_task_number-1)
+            last_response = last_response_data['response']
             current_task_state = ('{"state": "assessing", "version": 1, "max_score": ' + str(self._max_score) + ', ' +
                                   '"attempts": 0, "created": "True", "history": [{"answer": "' + str(last_response) + '"}]}')
             self.current_task=children['modules'][current_task_type](self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
@@ -191,8 +194,10 @@ class CombinedOpenEndedModule(XModule):
         task=children['modules'][task_type](self.system, self.location, task_parsed_xml, task_descriptor, instance_state=task_state)
         last_response=task.latest_answer()
         last_score = task.latest_score()
+        last_post_response = task.latest_post_response()
+        last_response_dict={'response' : last_response, 'score' : last_score, 'post_response' : post_response, 'type' : task_type}
 
-        return last_response, last_score
+        return last_response_dict
 
     def update_task_states(self):
         changed=False
@@ -285,7 +290,12 @@ class CombinedOpenEndedModule(XModule):
         return json.dumps(state)
 
     def get_status(self):
-        pass
+        status=[]
+        for i in xrange(0,self.current_task_number):
+            task_data = self.get_last_response(i)
+            status.append(task_data)
+        context = {'status_list' : status}
+        status_html = self.system.render_template("combined_open_ended_status.html", context)
 
 class CombinedOpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
     """
diff --git a/common/lib/xmodule/xmodule/openendedchild.py b/common/lib/xmodule/xmodule/openendedchild.py
index e152123c37..ebc6e9a9a6 100644
--- a/common/lib/xmodule/xmodule/openendedchild.py
+++ b/common/lib/xmodule/xmodule/openendedchild.py
@@ -243,6 +243,9 @@ class OpenEndedChild():
     def handle_ajax(self):
         pass
 
+    def type(self):
+        pass
+
 
 
 
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index c03620e57f..e2651a080e 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -296,7 +296,6 @@ class SelfAssessmentDescriptor(XmlDescriptor, EditingDescriptor):
                 'hintprompt': parse('hintprompt'),
                 }
 
-
     def definition_to_xml(self, resource_fs):
         '''Return an xml element representing this definition.'''
         elt = etree.Element('selfassessment')

From c6c77c0cde3efc71145d4d9cc3c98a27740238b2 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 14:05:50 -0500
Subject: [PATCH 125/541] Simple status display

---
 .../lib/xmodule/xmodule/combined_open_ended_module.py | 11 +++++++----
 common/lib/xmodule/xmodule/openendedchild.py          |  4 ----
 lms/templates/combined_open_ended_status.html         |  9 ++++++++-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 7497e5a8b5..02d6cab373 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -168,7 +168,7 @@ class CombinedOpenEndedModule(XModule):
             'state' : self.state,
             'task_count' : len(self.task_xml),
             'task_number' : self.current_task_number+1,
-            'status' : "temporary status."
+            'status' : self.get_status(),
             }
 
         html = self.system.render_template('combined_open_ended.html', context)
@@ -194,8 +194,9 @@ class CombinedOpenEndedModule(XModule):
         task=children['modules'][task_type](self.system, self.location, task_parsed_xml, task_descriptor, instance_state=task_state)
         last_response=task.latest_answer()
         last_score = task.latest_score()
-        last_post_response = task.latest_post_response()
-        last_response_dict={'response' : last_response, 'score' : last_score, 'post_response' : post_response, 'type' : task_type}
+        last_post_assessment = task.latest_post_assessment()
+        max_score = task.max_score()
+        last_response_dict={'response' : last_response, 'score' : last_score, 'post_assessment' : last_post_assessment, 'type' : task_type, 'max_score' : max_score}
 
         return last_response_dict
 
@@ -273,7 +274,6 @@ class CombinedOpenEndedModule(XModule):
         self.setup_next_task()
         return {'success': True}
 
-
     def get_instance_state(self):
         """
         Get the current score and state
@@ -293,10 +293,13 @@ class CombinedOpenEndedModule(XModule):
         status=[]
         for i in xrange(0,self.current_task_number):
             task_data = self.get_last_response(i)
+            task_data.update({'task_number' : i+1})
             status.append(task_data)
         context = {'status_list' : status}
         status_html = self.system.render_template("combined_open_ended_status.html", context)
 
+        return status_html
+
 class CombinedOpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
     """
     Module for adding self assessment questions to courses
diff --git a/common/lib/xmodule/xmodule/openendedchild.py b/common/lib/xmodule/xmodule/openendedchild.py
index ebc6e9a9a6..63ab5b806a 100644
--- a/common/lib/xmodule/xmodule/openendedchild.py
+++ b/common/lib/xmodule/xmodule/openendedchild.py
@@ -243,9 +243,5 @@ class OpenEndedChild():
     def handle_ajax(self):
         pass
 
-    def type(self):
-        pass
-
-
 
 
diff --git a/lms/templates/combined_open_ended_status.html b/lms/templates/combined_open_ended_status.html
index 770870b077..bd4dce27e5 100644
--- a/lms/templates/combined_open_ended_status.html
+++ b/lms/templates/combined_open_ended_status.html
@@ -1,3 +1,10 @@
 <section id="combined-open-ended-status" class="combined-open-ended-status">
-
+    %for status in status_list:
+    <statusitem>
+        Step ${status['task_number']} : ${status['score']} / ${status['max_score']}
+        %if status['type']=="openended":
+            ${status['post_assessment']}
+        %endif
+    </statusitem>
+    %endfor
 </section>
\ No newline at end of file

From 5e38433494db5c41bc50f910df84163011a849bd Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 15:11:01 -0500
Subject: [PATCH 126/541] Add in static data for max score and max attempts

---
 .../xmodule/combined_open_ended_module.py     | 20 +++++++++++++------
 .../lib/xmodule/xmodule/open_ended_module.py  | 14 -------------
 common/lib/xmodule/xmodule/openendedchild.py  |  6 +++---
 .../xmodule/xmodule/self_assessment_module.py |  9 ---------
 lms/templates/combined_open_ended_status.html |  2 +-
 5 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 02d6cab373..c47919095f 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -90,6 +90,11 @@ class CombinedOpenEndedModule(XModule):
         # completion (doesn't matter if you self-assessed correct/incorrect).
         self._max_score = int(self.metadata.get('max_score', MAX_SCORE))
 
+        self.static_data = {
+            'max_score' : self._max_score,
+            'max_attempts' : self.max_attempts,
+        }
+
         self.task_xml=definition['task_xml']
         self.setup_next_task()
 
@@ -137,7 +142,7 @@ class CombinedOpenEndedModule(XModule):
         self.current_task_descriptor=children['descriptors'][current_task_type](self.system)
         self.current_task_parsed_xml=self.current_task_descriptor.definition_from_xml(etree.fromstring(self.current_task_xml),self.system)
         if current_task_state is None and self.current_task_number==0:
-            self.current_task=children['modules'][current_task_type](self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor)
+            self.current_task=children['modules'][current_task_type](self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, self.static_data)
             self.task_states.append(self.current_task.get_instance_state())
             self.state=self.ASSESSING
         elif current_task_state is None and self.current_task_number>0:
@@ -145,13 +150,13 @@ class CombinedOpenEndedModule(XModule):
             last_response = last_response_data['response']
             current_task_state = ('{"state": "assessing", "version": 1, "max_score": ' + str(self._max_score) + ', ' +
                                   '"attempts": 0, "created": "True", "history": [{"answer": "' + str(last_response) + '"}]}')
-            self.current_task=children['modules'][current_task_type](self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
+            self.current_task=children['modules'][current_task_type](self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, self.static_data, instance_state=current_task_state)
             self.task_states.append(self.current_task.get_instance_state())
             self.state=self.ASSESSING
         else:
             if self.current_task_number>0 and not reset:
                 current_task_state=self.overwrite_state(current_task_state)
-            self.current_task=children['modules'][current_task_type](self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
+            self.current_task=children['modules'][current_task_type](self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, self.static_data, instance_state=current_task_state)
 
         log.debug(self.current_task.get_instance_state())
         log.debug(self.get_instance_state())
@@ -191,12 +196,15 @@ class CombinedOpenEndedModule(XModule):
 
         task_descriptor=children['descriptors'][task_type](self.system)
         task_parsed_xml=task_descriptor.definition_from_xml(etree.fromstring(task_xml),self.system)
-        task=children['modules'][task_type](self.system, self.location, task_parsed_xml, task_descriptor, instance_state=task_state)
+        task=children['modules'][task_type](self.system, self.location, task_parsed_xml, task_descriptor, self.static_data, instance_state=task_state)
         last_response=task.latest_answer()
         last_score = task.latest_score()
         last_post_assessment = task.latest_post_assessment()
         max_score = task.max_score()
-        last_response_dict={'response' : last_response, 'score' : last_score, 'post_assessment' : last_post_assessment, 'type' : task_type, 'max_score' : max_score}
+        state = task.state
+        last_response_dict={'response' : last_response, 'score' : last_score,
+                            'post_assessment' : last_post_assessment,
+                            'type' : task_type, 'max_score' : max_score, 'state' : state}
 
         return last_response_dict
 
@@ -291,7 +299,7 @@ class CombinedOpenEndedModule(XModule):
 
     def get_status(self):
         status=[]
-        for i in xrange(0,self.current_task_number):
+        for i in xrange(0,self.current_task_number+1):
             task_data = self.get_last_response(i)
             task_data.update({'task_number' : i+1})
             status.append(task_data)
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index de24d30502..c607e3eccf 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -34,15 +34,6 @@ from datetime import datetime
 
 log = logging.getLogger("mitx.courseware")
 
-# Set the default number of max attempts.  Should be 1 for production
-# Set higher for debugging/testing
-# attempts specified in xml definition overrides this.
-MAX_ATTEMPTS = 1
-
-# Set maximum available number of points.
-# Overriden by max_score specified in xml.
-MAX_SCORE = 1
-
 class OpenEndedModule(openendedchild.OpenEndedChild):
 
     def setup_response(self, system, location, definition, descriptor):
@@ -113,11 +104,6 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         self.payload = {'grader_payload': updated_grader_payload}
 
-        try:
-            self.max_score = int(find_with_default(oeparam, 'max_score', 1))
-        except ValueError:
-            self.max_score = 1
-
     def message_post(self,get, system):
         """
         Handles a student message post (a reaction to the grade they received from an open ended grader type)
diff --git a/common/lib/xmodule/xmodule/openendedchild.py b/common/lib/xmodule/xmodule/openendedchild.py
index 63ab5b806a..2e3a5b8e02 100644
--- a/common/lib/xmodule/xmodule/openendedchild.py
+++ b/common/lib/xmodule/xmodule/openendedchild.py
@@ -69,7 +69,7 @@ class OpenEndedChild():
     POST_ASSESSMENT = 'post_assessment'
     DONE = 'done'
 
-    def __init__(self, system, location, definition, descriptor,
+    def __init__(self, system, location, definition, descriptor, static_data,
                  instance_state=None, shared_state=None, **kwargs):
         """
         Definition file should have 4 blocks -- prompt, rubric, submitmessage, hintprompt,
@@ -118,11 +118,11 @@ class OpenEndedChild():
         self.created = instance_state.get('created', "False")
 
         self.attempts = instance_state.get('attempts', 0)
-        self.max_attempts = int(instance_state.get('attempts', MAX_ATTEMPTS))
+        self.max_attempts = static_data['max_attempts']
 
         # Used for progress / grading.  Currently get credit just for
         # completion (doesn't matter if you self-assessed correct/incorrect).
-        self._max_score = int(instance_state.get('max_score', MAX_SCORE))
+        self._max_score = static_data['max_score']
 
         self.setup_response(system, location, definition, descriptor)
 
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index e2651a080e..88c47f92ef 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -30,15 +30,6 @@ import openendedchild
 
 log = logging.getLogger("mitx.courseware")
 
-# Set the default number of max attempts.  Should be 1 for production
-# Set higher for debugging/testing
-# attempts specified in xml definition overrides this.
-MAX_ATTEMPTS = 1
-
-# Set maximum available number of points.
-# Overriden by max_score specified in xml.
-MAX_SCORE = 1
-
 class SelfAssessmentModule(openendedchild.OpenEndedChild):
 
     def setup_response(self, system, location, definition, descriptor):
diff --git a/lms/templates/combined_open_ended_status.html b/lms/templates/combined_open_ended_status.html
index bd4dce27e5..e53c8136e3 100644
--- a/lms/templates/combined_open_ended_status.html
+++ b/lms/templates/combined_open_ended_status.html
@@ -1,7 +1,7 @@
 <section id="combined-open-ended-status" class="combined-open-ended-status">
     %for status in status_list:
     <statusitem>
-        Step ${status['task_number']} : ${status['score']} / ${status['max_score']}
+        Step ${status['task_number']} (${status['state']}) : ${status['score']} / ${status['max_score']}
         %if status['type']=="openended":
             ${status['post_assessment']}
         %endif

From 1e4c85955a7b6b44a80489f7b7780678c2c5dd89 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 15:12:14 -0500
Subject: [PATCH 127/541] Rename max score

---
 common/lib/xmodule/xmodule/open_ended_module.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index c607e3eccf..437346828c 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -196,7 +196,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         contents.update({
             'student_info': json.dumps(student_info),
             'student_response': submission,
-            'max_score' : self.max_score,
+            'max_score' : self.max_score(),
             })
 
         # Submit request. When successful, 'msg' is the prior length of the queue
@@ -333,7 +333,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         feedback_template = system.render_template("open_ended_feedback.html", {
             'grader_type': response_items['grader_type'],
-            'score': "{0} / {1}".format(response_items['score'], self.max_score),
+            'score': "{0} / {1}".format(response_items['score'], self.max_score()),
             'feedback': feedback,
             })
 
@@ -382,7 +382,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
     def is_submission_correct(self, score):
         correct=False
         if(isinstance(score,(int, long, float, complex))):
-            score_ratio = int(score) / float(self.max_score)
+            score_ratio = int(score) / float(self.max_score())
             correct = (score_ratio >= 0.66)
         return correct
 

From 0ec1db81693f86c2787a0cb9547d951af381a96a Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 15:38:04 -0500
Subject: [PATCH 128/541] Add in a message area

---
 .../xmodule/js/src/combinedopenended/display.coffee  | 12 ++++--------
 lms/templates/combined_open_ended.html               |  1 -
 lms/templates/combined_open_ended_status.html        |  4 ++--
 lms/templates/open_ended.html                        |  1 +
 lms/templates/self_assessment_prompt.html            |  2 ++
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 45d0db8dac..4ad0bde631 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -74,13 +74,9 @@ class @CombinedOpenEnded
       @hint_area.attr('disabled', true)
       @submit_button.hide()
       if @task_number<@task_count
-        @next_problem_button.show()
+        @next_problem
       else
-        @next_problem_button.hide()
-        #if @allow_reset
         @reset_button.show()
-        #else
-        #  @reset_button.hide()
 
 
   find_assessment_elements: ->
@@ -161,8 +157,7 @@ class @CombinedOpenEnded
     else
       @errors_area.html('Problem state got out of sync.  Try reloading the page.')
 
-  next_problem: (event) =>
-    event.preventDefault()
+  next_problem: =>
     if @child_state == 'done'
       $.postWithPrefix "#{@ajax_url}/next_problem", {}, (response) =>
         if response.success
@@ -203,7 +198,7 @@ class @CombinedOpenEnded
       processData: false
       contentType: false
       success: (response) =>
-        @gentle_alert response.message
+        @gentle_alert response.msg
         @$('section.evaluation').slideToggle()
         @message_wrapper.html(response.message_html)
         @child_state = 'done'
@@ -216,4 +211,5 @@ class @CombinedOpenEnded
     if @el.find('.open-ended-alert').length
       @el.find('.open-ended-alert').remove()
     alert_elem = "<div class='open-ended-alert'>" + msg + "</div>"
+    @el.find('.open-ended-action').after(alert_elem)
     @el.find('.open-ended-alert').css(opacity: 0).animate(opacity: 1, 700)
\ No newline at end of file
diff --git a/lms/templates/combined_open_ended.html b/lms/templates/combined_open_ended.html
index 84bded0bec..6b30c3f418 100644
--- a/lms/templates/combined_open_ended.html
+++ b/lms/templates/combined_open_ended.html
@@ -8,6 +8,5 @@
 
     <input type="button" value="Reset" class="reset-button" name="reset"/>
     <input type="button" value="Next Step" class="next-step-button" name="reset"/>
-
 </section>
 
diff --git a/lms/templates/combined_open_ended_status.html b/lms/templates/combined_open_ended_status.html
index e53c8136e3..6450f5a43e 100644
--- a/lms/templates/combined_open_ended_status.html
+++ b/lms/templates/combined_open_ended_status.html
@@ -1,10 +1,10 @@
 <section id="combined-open-ended-status" class="combined-open-ended-status">
     %for status in status_list:
-    <statusitem>
+    <div class="statusitem">
         Step ${status['task_number']} (${status['state']}) : ${status['score']} / ${status['max_score']}
         %if status['type']=="openended":
             ${status['post_assessment']}
         %endif
-    </statusitem>
+    </div>
     %endfor
 </section>
\ No newline at end of file
diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html
index 423b2dc709..838c847841 100644
--- a/lms/templates/open_ended.html
+++ b/lms/templates/open_ended.html
@@ -51,5 +51,6 @@
     </div>
     % endif
   </div>
+  <div class="open-ended-action"></div>
   <div class="open-ended-alert"></div>
 </section>
diff --git a/lms/templates/self_assessment_prompt.html b/lms/templates/self_assessment_prompt.html
index 479e42a126..d8186954a7 100644
--- a/lms/templates/self_assessment_prompt.html
+++ b/lms/templates/self_assessment_prompt.html
@@ -16,4 +16,6 @@
     <div class="message-wrapper">${initial_message}</div>
     
     <input type="button" value="Submit" class="submit-button" name="show"/>
+    <div class="open-ended-action"></div>
+    <div class="open-ended-alert"></div>
 </section>

From 146e0919f12f6598d0a1553cb4bd0f56d8a6ec77 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 15:59:13 -0500
Subject: [PATCH 129/541] Work on alerts, transitions between pages

---
 .../xmodule/xmodule/combined_open_ended_module.py    |  2 +-
 .../xmodule/js/src/combinedopenended/display.coffee  | 12 +++++++++---
 lms/templates/open_ended.html                        |  5 +++--
 lms/templates/self_assessment_prompt.html            |  5 +++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index c47919095f..1761434a09 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -255,7 +255,7 @@ class CombinedOpenEndedModule(XModule):
 
     def next_problem(self, get):
         self.update_task_states()
-        return {'success' : True}
+        return {'success' : True, 'html' : self.get_html()}
 
     def reset(self, get):
         """
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 4ad0bde631..94cbdd5fe4 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -1,6 +1,11 @@
 class @CombinedOpenEnded
   constructor: (element) ->
+    @element=element
+    @reinitialize(element)
+
+  reinitialize: (element) ->
     @el = $(element).find('section.combined-open-ended')
+    @combined_open_ended=$(element).find('section.combined-open-ended')
     @id = @el.data('id')
     @ajax_url = @el.data('ajax-url')
     @state = @el.data('state')
@@ -12,7 +17,6 @@ class @CombinedOpenEnded
     @reset_button.click @reset
     @next_problem_button = @$('.next-step-button')
     @next_problem_button.click @next_problem
-    @combined_open_ended= @$('.combined-open-ended')
     # valid states: 'initial', 'assessing', 'post_assessment', 'done'
 
     # Where to put the rubric once we load it
@@ -74,7 +78,7 @@ class @CombinedOpenEnded
       @hint_area.attr('disabled', true)
       @submit_button.hide()
       if @task_number<@task_count
-        @next_problem
+        @next_problem()
       else
         @reset_button.show()
 
@@ -166,9 +170,11 @@ class @CombinedOpenEnded
           @hint_wrapper.html('')
           @message_wrapper.html('')
           @child_state = 'initial'
+          @combined_open_ended.html(response.html)
+          @reinitialize(@element)
           @rebind()
           @next_problem_button.hide()
-          location.reload()
+          @gentle_alert "Moved to next step."
         else
           @errors_area.html(response.error)
     else
diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html
index 838c847841..2c0600cee0 100644
--- a/lms/templates/open_ended.html
+++ b/lms/templates/open_ended.html
@@ -24,6 +24,9 @@
 
   <input type="button" value="Submit" class="submit-button" name="show"/>
 
+  <div class="open-ended-action"></div>
+  <div class="open-ended-alert"></div>
+
   <span id="answer_${id}"></span>
 
   <input name="reload" class="reload-button" type="button" value="Recheck for Feedback" onclick="document.location.reload(true);" />
@@ -51,6 +54,4 @@
     </div>
     % endif
   </div>
-  <div class="open-ended-action"></div>
-  <div class="open-ended-alert"></div>
 </section>
diff --git a/lms/templates/self_assessment_prompt.html b/lms/templates/self_assessment_prompt.html
index d8186954a7..4ef057fa34 100644
--- a/lms/templates/self_assessment_prompt.html
+++ b/lms/templates/self_assessment_prompt.html
@@ -9,6 +9,9 @@
     <textarea name="answer" class="answer short-form-response" cols="70" rows="20">${previous_answer|h}</textarea>
     </div>
 
+    <div class="open-ended-action"></div>
+    <div class="open-ended-alert"></div>
+
     <div class="rubric-wrapper">${initial_rubric}</div>
 
     <div class="hint-wrapper">${initial_hint}</div>
@@ -16,6 +19,4 @@
     <div class="message-wrapper">${initial_message}</div>
     
     <input type="button" value="Submit" class="submit-button" name="show"/>
-    <div class="open-ended-action"></div>
-    <div class="open-ended-alert"></div>
 </section>

From 8d6a5c45f31c6b833745265e00901f64cbf619a4 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 16:37:51 -0500
Subject: [PATCH 130/541] Try to render without module system

---
 .../xmodule/combined_open_ended_module.py        | 16 +++++++++++++---
 .../js/src/combinedopenended/display.coffee      |  6 ++++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 1761434a09..29c5265792 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -22,6 +22,8 @@ from xmodule.modulestore import Location
 import self_assessment_module
 import open_ended_module
 
+from mitxmako.shortcuts import render_to_string
+
 log = logging.getLogger("mitx.courseware")
 
 # Set the default number of max attempts.  Should be 1 for production
@@ -162,7 +164,7 @@ class CombinedOpenEndedModule(XModule):
         log.debug(self.get_instance_state())
         return True
 
-    def get_html(self):
+    def get_context(self):
         task_html=self.get_html_base()
         #set context variables and render template
 
@@ -176,9 +178,17 @@ class CombinedOpenEndedModule(XModule):
             'status' : self.get_status(),
             }
 
+        return context
+
+    def get_html(self):
+        context=self.get_context()
         html = self.system.render_template('combined_open_ended.html', context)
         return html
 
+    def get_html_nonsystem(self):
+        context=self.get_context()
+        html = render_to_string('combined_open_ended.html', context)
+        return html
 
     def get_html_base(self):
         self.update_task_states()
@@ -255,7 +265,7 @@ class CombinedOpenEndedModule(XModule):
 
     def next_problem(self, get):
         self.update_task_states()
-        return {'success' : True, 'html' : self.get_html()}
+        return {'success' : True, 'html' : self.get_html_nonsystem()}
 
     def reset(self, get):
         """
@@ -280,7 +290,7 @@ class CombinedOpenEndedModule(XModule):
             self.task_states[self.current_task_number]=self.current_task.get_instance_state()
         self.current_task_number=0
         self.setup_next_task()
-        return {'success': True}
+        return {'success': True, 'html' : self.get_html_nonsystem()}
 
     def get_instance_state(self):
         """
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 94cbdd5fe4..a12898e14a 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -4,6 +4,7 @@ class @CombinedOpenEnded
     @reinitialize(element)
 
   reinitialize: (element) ->
+    @wrapper=$(element).find('section.xmodule_CombinedOpenEndedModule')
     @el = $(element).find('section.combined-open-ended')
     @combined_open_ended=$(element).find('section.combined-open-ended')
     @id = @el.data('id')
@@ -153,9 +154,10 @@ class @CombinedOpenEnded
           @hint_wrapper.html('')
           @message_wrapper.html('')
           @child_state = 'initial'
+          @combined_open_ended.after(response.html).remove()
+          @reinitialize(@element)
           @rebind()
           @reset_button.hide()
-          location.reload()
         else
           @errors_area.html(response.error)
     else
@@ -170,7 +172,7 @@ class @CombinedOpenEnded
           @hint_wrapper.html('')
           @message_wrapper.html('')
           @child_state = 'initial'
-          @combined_open_ended.html(response.html)
+          @combined_open_ended.after(response.html).remove()
           @reinitialize(@element)
           @rebind()
           @next_problem_button.hide()

From 792e57ac62fb4d5ba789cb269d438b682da6e884 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 16:40:11 -0500
Subject: [PATCH 131/541] Remove check for feedback button

---
 .../xmodule/js/src/combinedopenended/display.coffee        | 7 -------
 lms/templates/open_ended.html                              | 1 -
 2 files changed, 8 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index a12898e14a..b9dd460b5f 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -31,8 +31,6 @@ class @CombinedOpenEnded
     @submit_button = @$('.submit-button')
     @child_state = @el.data('state')
     @child_type = @el.data('child-type')
-    if @child_type=="openended"
-      @reload_button = @$('.reload-button')
 
     @open_ended_child= @$('.open-ended-child')
 
@@ -52,8 +50,6 @@ class @CombinedOpenEnded
     @reset_button.hide()
     @next_problem_button.hide()
     @hint_area.attr('disabled', false)
-    if @child_type=="openended"
-      @reload_button.hide()
     if @child_state == 'initial'
       @answer_area.attr("disabled", false)
       @submit_button.prop('value', 'Submit')
@@ -64,10 +60,7 @@ class @CombinedOpenEnded
       @submit_button.click @save_assessment
       if @child_type == "openended"
         @submit_button.hide()
-        @reload_button.show()
     else if @child_state == 'post_assessment'
-      if @child_type=="openended"
-        @reload_button.hide()
       @answer_area.attr("disabled", true)
       @submit_button.prop('value', 'Submit post-assessment')
       if @child_type=="selfassessment"
diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html
index 2c0600cee0..93e931fa83 100644
--- a/lms/templates/open_ended.html
+++ b/lms/templates/open_ended.html
@@ -29,7 +29,6 @@
 
   <span id="answer_${id}"></span>
 
-  <input name="reload" class="reload-button" type="button" value="Recheck for Feedback" onclick="document.location.reload(true);" />
   <div class="external-grader-message">
       ${msg|n}
     % if state == 'post_assessment':

From b6774ed2e8058069e604a5e4e4a187d547dea541 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 16:44:10 -0500
Subject: [PATCH 132/541] Add back check for feedback button.  Can always
 remove later

---
 .../xmodule/js/src/combinedopenended/display.coffee        | 7 +++++++
 lms/templates/open_ended.html                              | 1 +
 2 files changed, 8 insertions(+)

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index b9dd460b5f..a12898e14a 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -31,6 +31,8 @@ class @CombinedOpenEnded
     @submit_button = @$('.submit-button')
     @child_state = @el.data('state')
     @child_type = @el.data('child-type')
+    if @child_type=="openended"
+      @reload_button = @$('.reload-button')
 
     @open_ended_child= @$('.open-ended-child')
 
@@ -50,6 +52,8 @@ class @CombinedOpenEnded
     @reset_button.hide()
     @next_problem_button.hide()
     @hint_area.attr('disabled', false)
+    if @child_type=="openended"
+      @reload_button.hide()
     if @child_state == 'initial'
       @answer_area.attr("disabled", false)
       @submit_button.prop('value', 'Submit')
@@ -60,7 +64,10 @@ class @CombinedOpenEnded
       @submit_button.click @save_assessment
       if @child_type == "openended"
         @submit_button.hide()
+        @reload_button.show()
     else if @child_state == 'post_assessment'
+      if @child_type=="openended"
+        @reload_button.hide()
       @answer_area.attr("disabled", true)
       @submit_button.prop('value', 'Submit post-assessment')
       if @child_type=="selfassessment"
diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html
index 93e931fa83..2c0600cee0 100644
--- a/lms/templates/open_ended.html
+++ b/lms/templates/open_ended.html
@@ -29,6 +29,7 @@
 
   <span id="answer_${id}"></span>
 
+  <input name="reload" class="reload-button" type="button" value="Recheck for Feedback" onclick="document.location.reload(true);" />
   <div class="external-grader-message">
       ${msg|n}
     % if state == 'post_assessment':

From a7c64b8e2d16a23d19bac48e95778309b9fe39c0 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 17:06:52 -0500
Subject: [PATCH 133/541] Add collapsible

---
 common/lib/xmodule/xmodule/combined_open_ended_module.py | 4 +++-
 lms/templates/open_ended.html                            | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 29c5265792..5f68ab411f 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -45,7 +45,9 @@ class CombinedOpenEndedModule(XModule):
     DONE = 'done'
     TASK_TYPES=["self", "ml", "instructor", "peer"]
 
-    js = {'coffee': [resource_string(__name__, 'js/src/combinedopenended/display.coffee')]}
+    js = {'coffee': [resource_string(__name__, 'js/src/combinedopenended/display.coffee'),
+                     resource_string(__name__, 'js/src/collapsible.coffee'),
+                     ]}
     js_module_name = "CombinedOpenEnded"
 
     css = {'scss': [resource_string(__name__, 'css/combinedopenended/display.scss')]}
diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html
index 2c0600cee0..31599ecea5 100644
--- a/lms/templates/open_ended.html
+++ b/lms/templates/open_ended.html
@@ -1,12 +1,12 @@
 <section id="openended_${id}" class="open-ended-child" data-state="${state}" data-child-type="${child_type}">
-
    <div class="error"></div>
    <div class="prompt">
     ${prompt|n}
    </div>
   <textarea rows="${rows}" cols="${cols}" name="answer" class="answer short-form-response" id="input_${id}">${previous_answer|h}</textarea>
 
-  <div class="message-wrapper">
+  <div class="message-wrapper"></div>
+  <div class="grader-status">
     % if state == 'initial':
       <span class="unanswered" style="display:inline-block;" id="status_${id}">Unanswered</span>
     % elif state in ['done', 'post_assessment'] and correct == 'correct':

From c7f0ba7bc45940c46c82ca3c275705a093d4e93c Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 17:11:04 -0500
Subject: [PATCH 134/541] Fix some of the styling issues

---
 .../lib/xmodule/xmodule/combined_open_ended_module.py  |  1 +
 .../xmodule/xmodule/css/combinedopenended/display.scss | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 5f68ab411f..2c2e9b57f5 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -47,6 +47,7 @@ class CombinedOpenEndedModule(XModule):
 
     js = {'coffee': [resource_string(__name__, 'js/src/combinedopenended/display.coffee'),
                      resource_string(__name__, 'js/src/collapsible.coffee'),
+                     resource_string(__name__, 'js/src/javascript_loader.coffee'),
                      ]}
     js_module_name = "CombinedOpenEnded"
 
diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
index 73fa4018d2..c13a975c85 100644
--- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -63,7 +63,6 @@ section.open-ended-child {
     }
   }
 
-  div {
     p {
       &.answer {
         margin-top: -2px;
@@ -74,7 +73,7 @@ section.open-ended-child {
       }
     }
 
-    &.unanswered {
+    div.unanswered {
       p.status {
         @include inline-block();
         background: url('../images/unanswered-icon.png') center center no-repeat;
@@ -83,7 +82,7 @@ section.open-ended-child {
       }
     }
 
-    &.correct, &.ui-icon-check {
+    div.correct, div.ui-icon-check {
       p.status {
         @include inline-block();
         background: url('../images/correct-icon.png') center center no-repeat;
@@ -96,7 +95,7 @@ section.open-ended-child {
       }
     }
 
-    &.processing {
+    div.processing {
       p.status {
         @include inline-block();
         background: url('../images/spinner.gif') center center no-repeat;
@@ -109,7 +108,7 @@ section.open-ended-child {
       }
     }
 
-    &.incorrect, &.ui-icon-close {
+    div.incorrect, div.ui-icon-close {
       p.status {
         @include inline-block();
         background: url('../images/incorrect-icon.png') center center no-repeat;
@@ -287,7 +286,6 @@ section.open-ended-child {
     .submit-message-container {
         margin: 10px 0px ;
     }
-  }
 
   form.option-input {
     margin: -10px 0 20px;

From 3ea59ef3fefc2b185ecdc75f584b3787ae5d85ff Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 17:15:08 -0500
Subject: [PATCH 135/541] set collapsible elements

---
 .../lib/xmodule/xmodule/js/src/combinedopenended/display.coffee  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index a12898e14a..cfa2ef8331 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -19,6 +19,7 @@ class @CombinedOpenEnded
     @next_problem_button = @$('.next-step-button')
     @next_problem_button.click @next_problem
     # valid states: 'initial', 'assessing', 'post_assessment', 'done'
+    Collapsible.setCollapsibles(@el)
 
     # Where to put the rubric once we load it
     @el = $(element).find('section.open-ended-child')

From c2a285e0c7a251cf7871a41b3fb9f82d719f5778 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 17:20:59 -0500
Subject: [PATCH 136/541] store feedback in dictionary and only parse when
 needed

---
 .../lib/xmodule/xmodule/open_ended_module.py  | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 437346828c..5eaf3f94b7 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -30,6 +30,8 @@ from xmodule.modulestore import Location
 from capa.util import *
 import openendedchild
 
+from mitxmako.shortcuts import render_to_string
+
 from datetime import datetime
 
 log = logging.getLogger("mitx.courseware")
@@ -209,8 +211,8 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         return True
 
     def _update_score(self, score_msg, queuekey, system):
-        score_msg = self._parse_score_msg(score_msg, system)
-        if not score_msg['valid']:
+        new_score_msg = self._parse_score_msg(score_msg)
+        if not new_score_msg['valid']:
             score_msg['feedback'] = 'Invalid grader reply. Please contact the course staff.'
 
         self.record_latest_score(score_msg['score'])
@@ -317,7 +319,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         return u"\n".join([feedback_list_part1,feedback_list_part2])
 
-    def _format_feedback(self, response_items, system):
+    def _format_feedback(self, response_items):
         """
         Input:
             Dictionary called feedback.  Must contain keys seen below.
@@ -331,7 +333,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             return system.render_template("open_ended_error.html",
                 {'errors' : feedback})
 
-        feedback_template = system.render_template("open_ended_feedback.html", {
+        feedback_template = render_to_string("open_ended_feedback.html", {
             'grader_type': response_items['grader_type'],
             'score': "{0} / {1}".format(response_items['score'], self.max_score()),
             'feedback': feedback,
@@ -340,7 +342,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         return feedback_template
 
 
-    def _parse_score_msg(self, score_msg, system):
+    def _parse_score_msg(self, score_msg):
         """
          Grader reply is a JSON-dump of the following dict
            { 'correct': True/False,
@@ -373,12 +375,18 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
                 .format(tag))
                 return fail
 
-        feedback = self._format_feedback(score_result, system)
+        feedback = self._format_feedback(score_result)
         self.submission_id=score_result['submission_id']
         self.grader_id=score_result['grader_id']
 
         return {'valid' : True, 'score' : score_result['score'], 'feedback' : feedback}
 
+    def latest_post_assessment(self):
+        """None if not available"""
+        if not self.history:
+            return ""
+        return self._parse_score_msg(self.history[-1].get('post_assessment', ""))
+
     def is_submission_correct(self, score):
         correct=False
         if(isinstance(score,(int, long, float, complex))):

From 573ec68abe73deb33504854c5b7969269c2bd051 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 17:29:10 -0500
Subject: [PATCH 137/541] Store feedback as dictionary to be parsed later

---
 common/lib/xmodule/xmodule/open_ended_module.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 5eaf3f94b7..351f098c50 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -215,8 +215,8 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         if not new_score_msg['valid']:
             score_msg['feedback'] = 'Invalid grader reply. Please contact the course staff.'
 
-        self.record_latest_score(score_msg['score'])
-        self.record_latest_post_assessment(score_msg['feedback'])
+        self.record_latest_score(new_score_msg['score'])
+        self.record_latest_post_assessment(score_msg)
         self.state=self.POST_ASSESSMENT
 
         return True
@@ -385,7 +385,8 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         """None if not available"""
         if not self.history:
             return ""
-        return self._parse_score_msg(self.history[-1].get('post_assessment', ""))
+        feedback_dict = self._parse_score_msg(self.history[-1].get('post_assessment', ""))
+        return feedback_dict['feedback'] if feedback_dict['valid'] else ''
 
     def is_submission_correct(self, score):
         correct=False

From d9ea0fcda06712c65bb10f01d217f0ee55af6893 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 17:47:34 -0500
Subject: [PATCH 138/541] display feedback in status box

---
 common/lib/xmodule/xmodule/combined_open_ended_module.py | 4 +++-
 common/lib/xmodule/xmodule/open_ended_module.py          | 9 +++++++--
 common/lib/xmodule/xmodule/openendedchild.py             | 7 +++++++
 lms/templates/combined_open_ended_status.html            | 6 ++++--
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 2c2e9b57f5..b0fb365d73 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -213,11 +213,13 @@ class CombinedOpenEndedModule(XModule):
         last_response=task.latest_answer()
         last_score = task.latest_score()
         last_post_assessment = task.latest_post_assessment()
+        if task_type=="openended":
+            last_post_assessment = task.latest_post_assessment(short_feedback=True)
         max_score = task.max_score()
         state = task.state
         last_response_dict={'response' : last_response, 'score' : last_score,
                             'post_assessment' : last_post_assessment,
-                            'type' : task_type, 'max_score' : max_score, 'state' : state}
+                            'type' : task_type, 'max_score' : max_score, 'state' : state, 'human_state' : task.HUMAN_NAMES[state]}
 
         return last_response_dict
 
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 351f098c50..c5cc01964e 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -381,12 +381,17 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         return {'valid' : True, 'score' : score_result['score'], 'feedback' : feedback}
 
-    def latest_post_assessment(self):
+    def latest_post_assessment(self, short_feedback=False):
         """None if not available"""
         if not self.history:
             return ""
+
         feedback_dict = self._parse_score_msg(self.history[-1].get('post_assessment', ""))
-        return feedback_dict['feedback'] if feedback_dict['valid'] else ''
+        if not short_feedback:
+            return feedback_dict['feedback'] if feedback_dict['valid'] else ''
+
+        short_feedback = self._convert_longform_feedback_to_html(json.loads(self.history[-1].get('post_assessment', "")))
+        return short_feedback if feedback_dict['valid'] else ''
 
     def is_submission_correct(self, score):
         correct=False
diff --git a/common/lib/xmodule/xmodule/openendedchild.py b/common/lib/xmodule/xmodule/openendedchild.py
index 2e3a5b8e02..236bd03c4c 100644
--- a/common/lib/xmodule/xmodule/openendedchild.py
+++ b/common/lib/xmodule/xmodule/openendedchild.py
@@ -69,6 +69,13 @@ class OpenEndedChild():
     POST_ASSESSMENT = 'post_assessment'
     DONE = 'done'
 
+    HUMAN_NAMES={
+        'initial' : 'Started',
+        'assessing' : 'Being scored',
+        'post_assessment' : 'Scoring finished',
+        'done' : 'Problem complete',
+    }
+
     def __init__(self, system, location, definition, descriptor, static_data,
                  instance_state=None, shared_state=None, **kwargs):
         """
diff --git a/lms/templates/combined_open_ended_status.html b/lms/templates/combined_open_ended_status.html
index 6450f5a43e..5b8ac5fcbe 100644
--- a/lms/templates/combined_open_ended_status.html
+++ b/lms/templates/combined_open_ended_status.html
@@ -1,9 +1,11 @@
 <section id="combined-open-ended-status" class="combined-open-ended-status">
     %for status in status_list:
     <div class="statusitem">
-        Step ${status['task_number']} (${status['state']}) : ${status['score']} / ${status['max_score']}
+        Step ${status['task_number']} (${status['human_state']}) : ${status['score']} / ${status['max_score']}
         %if status['type']=="openended":
-            ${status['post_assessment']}
+            <div class="collapsible open-ended-short-feedback">
+                ${status['post_assessment']}
+            </div>
         %endif
     </div>
     %endfor

From ea6945a3fe1bffd84ef3a5572fcd96f0af52ff04 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 17:50:30 -0500
Subject: [PATCH 139/541] Collapsible feedback

---
 lms/templates/combined_open_ended_status.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lms/templates/combined_open_ended_status.html b/lms/templates/combined_open_ended_status.html
index 5b8ac5fcbe..529d8dcf15 100644
--- a/lms/templates/combined_open_ended_status.html
+++ b/lms/templates/combined_open_ended_status.html
@@ -4,7 +4,12 @@
         Step ${status['task_number']} (${status['human_state']}) : ${status['score']} / ${status['max_score']}
         %if status['type']=="openended":
             <div class="collapsible open-ended-short-feedback">
-                ${status['post_assessment']}
+                <header>
+                    <a href="#">Show Feedback</a>
+                </header>
+                <section id="post-assessment">
+                    ${status['post_assessment']}
+                </section>
             </div>
         %endif
     </div>

From d4dd0cd84c930e80931603491d63807cd479fbd3 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 17:55:38 -0500
Subject: [PATCH 140/541] Html changes

---
 common/lib/xmodule/xmodule/js/src/collapsible.coffee | 2 +-
 lms/templates/combined_open_ended_status.html        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/collapsible.coffee b/common/lib/xmodule/xmodule/js/src/collapsible.coffee
index 18a186e106..e414935784 100644
--- a/common/lib/xmodule/xmodule/js/src/collapsible.coffee
+++ b/common/lib/xmodule/xmodule/js/src/collapsible.coffee
@@ -22,7 +22,7 @@ class @Collapsible
     if $(event.target).text() == 'See full output'
       new_text = 'Hide output'
     else
-      new_text = 'See full ouput'
+      new_text = 'See full output'
     $(event.target).text(new_text)
 
   @toggleHint: (event) =>
diff --git a/lms/templates/combined_open_ended_status.html b/lms/templates/combined_open_ended_status.html
index 529d8dcf15..41ec403c47 100644
--- a/lms/templates/combined_open_ended_status.html
+++ b/lms/templates/combined_open_ended_status.html
@@ -5,7 +5,7 @@
         %if status['type']=="openended":
             <div class="collapsible open-ended-short-feedback">
                 <header>
-                    <a href="#">Show Feedback</a>
+                    <a href="#">Show feedback from step ${status['task_number']}</a>
                 </header>
                 <section id="post-assessment">
                     ${status['post_assessment']}

From 8d80fcfb8694237c11a95fda8631d16ec368229e Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 18:05:19 -0500
Subject: [PATCH 141/541] Add button to skip post assessment

---
 .../xmodule/js/src/combinedopenended/display.coffee      | 4 ++++
 common/lib/xmodule/xmodule/open_ended_module.py          | 9 +++++++--
 lms/templates/open_ended.html                            | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index cfa2ef8331..ca2b707629 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -34,6 +34,7 @@ class @CombinedOpenEnded
     @child_type = @el.data('child-type')
     if @child_type=="openended"
       @reload_button = @$('.reload-button')
+      @skip_button = @$('.skip-button')
 
     @open_ended_child= @$('.open-ended-child')
 
@@ -52,6 +53,7 @@ class @CombinedOpenEnded
     @submit_button.show()
     @reset_button.hide()
     @next_problem_button.hide()
+    @skip_button.hide()
     @hint_area.attr('disabled', false)
     if @child_type=="openended"
       @reload_button.hide()
@@ -69,6 +71,7 @@ class @CombinedOpenEnded
     else if @child_state == 'post_assessment'
       if @child_type=="openended"
         @reload_button.hide()
+        @skip_button.show()
       @answer_area.attr("disabled", true)
       @submit_button.prop('value', 'Submit post-assessment')
       if @child_type=="selfassessment"
@@ -79,6 +82,7 @@ class @CombinedOpenEnded
       @answer_area.attr("disabled", true)
       @hint_area.attr('disabled', true)
       @submit_button.hide()
+      @skip_button.hide()
       if @task_number<@task_count
         @next_problem()
       else
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index c5cc01964e..e1a34d284b 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -106,6 +106,10 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         self.payload = {'grader_payload': updated_grader_payload}
 
+    def skip_post_assessment(self, get, system):
+        self.state=self.DONE
+        return {'success' : True}
+
     def message_post(self,get, system):
         """
         Handles a student message post (a reaction to the grade they received from an open ended grader type)
@@ -389,8 +393,8 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         feedback_dict = self._parse_score_msg(self.history[-1].get('post_assessment', ""))
         if not short_feedback:
             return feedback_dict['feedback'] if feedback_dict['valid'] else ''
-
-        short_feedback = self._convert_longform_feedback_to_html(json.loads(self.history[-1].get('post_assessment', "")))
+        if feedback_dict['valid']:
+            short_feedback = self._convert_longform_feedback_to_html(json.loads(self.history[-1].get('post_assessment', "")))
         return short_feedback if feedback_dict['valid'] else ''
 
     def is_submission_correct(self, score):
@@ -414,6 +418,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             'save_answer': self.save_answer,
             'score_update': self.update_score,
             'save_post_assessment' : self.message_post,
+            'skip_post_assessment' : self.skip_post_assessment(),
             }
 
         if dispatch not in handlers:
diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html
index 31599ecea5..1235014f82 100644
--- a/lms/templates/open_ended.html
+++ b/lms/templates/open_ended.html
@@ -28,7 +28,7 @@
   <div class="open-ended-alert"></div>
 
   <span id="answer_${id}"></span>
-
+  <input name="skip" class="skip-button" type="button" value="Skip Post-Assessment"/>
   <input name="reload" class="reload-button" type="button" value="Recheck for Feedback" onclick="document.location.reload(true);" />
   <div class="external-grader-message">
       ${msg|n}

From ea5db36e927819a9705c982ced120c5aa7054488 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 18:08:48 -0500
Subject: [PATCH 142/541] Skip post assessment button

---
 .../js/src/combinedopenended/display.coffee        | 14 ++++++++++++++
 common/lib/xmodule/xmodule/open_ended_module.py    |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index ca2b707629..74a30d05a1 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -35,6 +35,7 @@ class @CombinedOpenEnded
     if @child_type=="openended"
       @reload_button = @$('.reload-button')
       @skip_button = @$('.skip-button')
+      @skip_button.click @skip_post_assessment()
 
     @open_ended_child= @$('.open-ended-child')
 
@@ -148,6 +149,19 @@ class @CombinedOpenEnded
     else
       @errors_area.html('Problem state got out of sync.  Try reloading the page.')
 
+  skip_post_assessment: (event) =>
+    event.preventDefault()
+    if @child_state == 'post_assessment'
+
+      $.postWithPrefix "#{@ajax_url}/skip_post_assessment", data, (response) =>
+        if response.success
+          @child_state = 'done'
+          @allow_reset = response.allow_reset
+          @rebind()
+        else
+          @errors_area.html(response.error)
+    else
+      @errors_area.html('Problem state got out of sync.  Try reloading the page.')
 
   reset: (event) =>
     event.preventDefault()
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index e1a34d284b..b1931f81be 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -418,7 +418,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             'save_answer': self.save_answer,
             'score_update': self.update_score,
             'save_post_assessment' : self.message_post,
-            'skip_post_assessment' : self.skip_post_assessment(),
+            'skip_post_assessment' : self.skip_post_assessment,
             }
 
         if dispatch not in handlers:

From e46ecdb6e2296f18589ffa8d47af5c46e788abe2 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 18:10:00 -0500
Subject: [PATCH 143/541] Move skip button

---
 lms/templates/open_ended.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html
index 1235014f82..e995d62cb1 100644
--- a/lms/templates/open_ended.html
+++ b/lms/templates/open_ended.html
@@ -23,12 +23,13 @@
   </div>
 
   <input type="button" value="Submit" class="submit-button" name="show"/>
+  <input name="skip" class="skip-button" type="button" value="Skip Post-Assessment"/>
 
   <div class="open-ended-action"></div>
   <div class="open-ended-alert"></div>
 
   <span id="answer_${id}"></span>
-  <input name="skip" class="skip-button" type="button" value="Skip Post-Assessment"/>
+
   <input name="reload" class="reload-button" type="button" value="Recheck for Feedback" onclick="document.location.reload(true);" />
   <div class="external-grader-message">
       ${msg|n}

From bd5ca9d2a7fb35cbef1822d40a59c21abc86d396 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 18:11:02 -0500
Subject: [PATCH 144/541] JS bug fix

---
 .../lib/xmodule/xmodule/js/src/combinedopenended/display.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 74a30d05a1..187366d3a6 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -35,7 +35,7 @@ class @CombinedOpenEnded
     if @child_type=="openended"
       @reload_button = @$('.reload-button')
       @skip_button = @$('.skip-button')
-      @skip_button.click @skip_post_assessment()
+      @skip_button.click @skip_post_assessment
 
     @open_ended_child= @$('.open-ended-child')
 

From f5cd2ff9c557dd9e4bfb4908d970111c275a55bc Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 18:13:03 -0500
Subject: [PATCH 145/541] JS bugfix

---
 .../lib/xmodule/xmodule/js/src/combinedopenended/display.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 187366d3a6..ff06e6a850 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -153,7 +153,7 @@ class @CombinedOpenEnded
     event.preventDefault()
     if @child_state == 'post_assessment'
 
-      $.postWithPrefix "#{@ajax_url}/skip_post_assessment", data, (response) =>
+      $.postWithPrefix "#{@ajax_url}/skip_post_assessment", {}, (response) =>
         if response.success
           @child_state = 'done'
           @allow_reset = response.allow_reset

From 9a4ee350d7e4e9facff77e6370e7b0814f0faabc Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 18:21:02 -0500
Subject: [PATCH 146/541] JS tweaks, move feedback into its own template

---
 .../js/src/combinedopenended/display.coffee   |  9 ++++----
 lms/templates/combined_open_ended_status.html |  2 +-
 lms/templates/open_ended.html                 | 23 +------------------
 lms/templates/open_ended_evaluation.html      | 22 ++++++++++++++++++
 4 files changed, 29 insertions(+), 27 deletions(-)
 create mode 100644 lms/templates/open_ended_evaluation.html

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index ff06e6a850..f6ad7eb22a 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -54,10 +54,10 @@ class @CombinedOpenEnded
     @submit_button.show()
     @reset_button.hide()
     @next_problem_button.hide()
-    @skip_button.hide()
     @hint_area.attr('disabled', false)
     if @child_type=="openended"
       @reload_button.hide()
+      @skip_button.hide()
     if @child_state == 'initial'
       @answer_area.attr("disabled", false)
       @submit_button.prop('value', 'Submit')
@@ -73,6 +73,7 @@ class @CombinedOpenEnded
       if @child_type=="openended"
         @reload_button.hide()
         @skip_button.show()
+        @skip_post_assessment()
       @answer_area.attr("disabled", true)
       @submit_button.prop('value', 'Submit post-assessment')
       if @child_type=="selfassessment"
@@ -83,7 +84,8 @@ class @CombinedOpenEnded
       @answer_area.attr("disabled", true)
       @hint_area.attr('disabled', true)
       @submit_button.hide()
-      @skip_button.hide()
+      if @child_type=="openended"
+        @skip_button.hide()
       if @task_number<@task_count
         @next_problem()
       else
@@ -149,8 +151,7 @@ class @CombinedOpenEnded
     else
       @errors_area.html('Problem state got out of sync.  Try reloading the page.')
 
-  skip_post_assessment: (event) =>
-    event.preventDefault()
+  skip_post_assessment: =>
     if @child_state == 'post_assessment'
 
       $.postWithPrefix "#{@ajax_url}/skip_post_assessment", {}, (response) =>
diff --git a/lms/templates/combined_open_ended_status.html b/lms/templates/combined_open_ended_status.html
index 41ec403c47..7bc66d954f 100644
--- a/lms/templates/combined_open_ended_status.html
+++ b/lms/templates/combined_open_ended_status.html
@@ -3,7 +3,7 @@
     <div class="statusitem">
         Step ${status['task_number']} (${status['human_state']}) : ${status['score']} / ${status['max_score']}
         %if status['type']=="openended":
-            <div class="collapsible open-ended-short-feedback">
+            <div class="collapsible external-grader-message">
                 <header>
                     <a href="#">Show feedback from step ${status['task_number']}</a>
                 </header>
diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html
index e995d62cb1..9ade05d0e2 100644
--- a/lms/templates/open_ended.html
+++ b/lms/templates/open_ended.html
@@ -32,27 +32,6 @@
 
   <input name="reload" class="reload-button" type="button" value="Recheck for Feedback" onclick="document.location.reload(true);" />
   <div class="external-grader-message">
-      ${msg|n}
-    % if state == 'post_assessment':
-    <div class="collapsible evaluation-response">
-      <header>
-      <a href="#">Respond to Feedback</a>
-      </header>
-    <section id="evaluation_${id}" class="evaluation">
-    <p>How accurate do you find this feedback?</p>
-        <div class="evaluation-scoring">
-            <ul class="scoring-list">
-                <li><input type="radio" name="evaluation-score" id="evaluation-score-5" value="5" /> <label for="evaluation-score-5"> Correct</label></li>
-                <li><input type="radio" name="evaluation-score" id="evaluation-score-4" value="4" /> <label for="evaluation-score-4"> Partially Correct</label></li>
-                <li><input type="radio" name="evaluation-score" id="evaluation-score-3" value="3" /> <label for="evaluation-score-3"> No Opinion</label></li>
-                <li><input type="radio" name="evaluation-score" id="evaluation-score-2" value="2" /> <label for="evaluation-score-2"> Partially Incorrect</label></li>
-                <li><input type="radio" name="evaluation-score" id="evaluation-score-1" value="1" /> <label for="evaluation-score-1"> Incorrect</label></li>
-            </ul>
-        </div>
-        <p>Additional comments:</p>
-        <textarea rows="${rows}" cols="${cols}" name="feedback_${id}" class="feedback-on-feedback" id="feedback_${id}"></textarea>
-    </section>
-    </div>
-    % endif
+     ${msg|n}
   </div>
 </section>
diff --git a/lms/templates/open_ended_evaluation.html b/lms/templates/open_ended_evaluation.html
new file mode 100644
index 0000000000..018486a1d6
--- /dev/null
+++ b/lms/templates/open_ended_evaluation.html
@@ -0,0 +1,22 @@
+<div class="external-grader-message">
+    ${msg|n}
+    <div class="collapsible evaluation-response">
+        <header>
+            <a href="#">Respond to Feedback</a>
+        </header>
+        <section id="evaluation_${id}" class="evaluation">
+            <p>How accurate do you find this feedback?</p>
+            <div class="evaluation-scoring">
+                <ul class="scoring-list">
+                    <li><input type="radio" name="evaluation-score" id="evaluation-score-5" value="5" /> <label for="evaluation-score-5"> Correct</label></li>
+                    <li><input type="radio" name="evaluation-score" id="evaluation-score-4" value="4" /> <label for="evaluation-score-4"> Partially Correct</label></li>
+                    <li><input type="radio" name="evaluation-score" id="evaluation-score-3" value="3" /> <label for="evaluation-score-3"> No Opinion</label></li>
+                    <li><input type="radio" name="evaluation-score" id="evaluation-score-2" value="2" /> <label for="evaluation-score-2"> Partially Incorrect</label></li>
+                    <li><input type="radio" name="evaluation-score" id="evaluation-score-1" value="1" /> <label for="evaluation-score-1"> Incorrect</label></li>
+                </ul>
+            </div>
+            <p>Additional comments:</p>
+            <textarea rows="${rows}" cols="${cols}" name="feedback_${id}" class="feedback-on-feedback" id="feedback_${id}"></textarea>
+        </section>
+    </div>
+</div>
\ No newline at end of file

From f287752fcbf548ebe90eb2c42c0d1bf02dd8a1c4 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 18:23:24 -0500
Subject: [PATCH 147/541] CSS tweaks

---
 common/lib/xmodule/xmodule/css/combinedopenended/display.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
index c13a975c85..faa3c79419 100644
--- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -20,7 +20,7 @@ h2 {
   color: darken($error-red, 10%);
 }
 
-section.open-ended-child {
+section.open-ended-child, section.combined-open-ended-status {
   @media print {
     display: block;
     width: auto;
@@ -396,7 +396,7 @@ section.open-ended-child {
     }
   }
 
-  div.capa_alert {
+  div.open-ended-alert {
     padding: 8px 12px;
     border: 1px solid #EBE8BF;
     border-radius: 3px;

From 5b0181c925dd327338d256f3ef6d4776e936fbc1 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 18:31:35 -0500
Subject: [PATCH 148/541] Status moved to the right

---
 .../xmodule/css/combinedopenended/display.scss    | 13 +++++++++++++
 lms/templates/combined_open_ended.html            | 15 +++++++++------
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
index faa3c79419..7e09c85734 100644
--- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -20,6 +20,19 @@ h2 {
   color: darken($error-red, 10%);
 }
 
+section.combined-open-ended {
+  .status-container
+  {
+      float:right;
+      width:30%;
+  }
+  .item-container
+  {
+      float:left;
+      width: 63%;
+  }
+}
+
 section.open-ended-child, section.combined-open-ended-status {
   @media print {
     display: block;
diff --git a/lms/templates/combined_open_ended.html b/lms/templates/combined_open_ended.html
index 6b30c3f418..bc68cbe29e 100644
--- a/lms/templates/combined_open_ended.html
+++ b/lms/templates/combined_open_ended.html
@@ -1,12 +1,15 @@
 <section id="combined-open-ended" class="combined-open-ended" data-ajax-url="${ajax_url}" data-allow_reset="${allow_reset}" data-state="${state}" data-task-count="${task_count}" data-task-number="${task_number}">
 
-    <div class="status">${status | n}</div>
+    <div class="status-container">${status | n}</div>
 
-    % for item in items:
-    <div class="item">${item['content'] | n}</div>
-    % endfor
+    <div class="item-container">
+        % for item in items:
+        <div class="item">${item['content'] | n}</div>
+        % endfor
 
-    <input type="button" value="Reset" class="reset-button" name="reset"/>
-    <input type="button" value="Next Step" class="next-step-button" name="reset"/>
+
+        <input type="button" value="Reset" class="reset-button" name="reset"/>
+        <input type="button" value="Next Step" class="next-step-button" name="reset"/>
+    </div>
 </section>
 

From 97885354162cade069d719490daaf9c61df1052c Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 18:35:33 -0500
Subject: [PATCH 149/541] Get rid of open ended message

---
 .../xmodule/xmodule/css/combinedopenended/display.scss | 10 ++++++++++
 lms/templates/open_ended.html                          |  1 -
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
index 7e09c85734..c1112d72b3 100644
--- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -21,6 +21,7 @@ h2 {
 }
 
 section.combined-open-ended {
+  margin-right:20px;
   .status-container
   {
       float:right;
@@ -31,6 +32,15 @@ section.combined-open-ended {
       float:left;
       width: 63%;
   }
+
+  &:after
+  {
+      content:".";
+      display:block;
+      height:0;
+      visibility: hidden;
+      clear:both;
+  }
 }
 
 section.open-ended-child, section.combined-open-ended-status {
diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html
index 9ade05d0e2..b0ef0be51a 100644
--- a/lms/templates/open_ended.html
+++ b/lms/templates/open_ended.html
@@ -26,7 +26,6 @@
   <input name="skip" class="skip-button" type="button" value="Skip Post-Assessment"/>
 
   <div class="open-ended-action"></div>
-  <div class="open-ended-alert"></div>
 
   <span id="answer_${id}"></span>
 

From f70434970eda90389d96634f6c0837da8badcc6e Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 18:39:50 -0500
Subject: [PATCH 150/541] Make everything look a bit nicer

---
 lms/templates/combined_open_ended.html    | 6 +++++-
 lms/templates/self_assessment_prompt.html | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lms/templates/combined_open_ended.html b/lms/templates/combined_open_ended.html
index bc68cbe29e..5cd5d76e4c 100644
--- a/lms/templates/combined_open_ended.html
+++ b/lms/templates/combined_open_ended.html
@@ -1,8 +1,12 @@
 <section id="combined-open-ended" class="combined-open-ended" data-ajax-url="${ajax_url}" data-allow_reset="${allow_reset}" data-state="${state}" data-task-count="${task_count}" data-task-number="${task_number}">
 
-    <div class="status-container">${status | n}</div>
+    <div class="status-container">
+        <h4>Status</h4><br/>
+        ${status | n}
+    </div>
 
     <div class="item-container">
+        <h4>Problem</h4><br/>
         % for item in items:
         <div class="item">${item['content'] | n}</div>
         % endfor
diff --git a/lms/templates/self_assessment_prompt.html b/lms/templates/self_assessment_prompt.html
index 4ef057fa34..2ec83ef2a7 100644
--- a/lms/templates/self_assessment_prompt.html
+++ b/lms/templates/self_assessment_prompt.html
@@ -10,7 +10,6 @@
     </div>
 
     <div class="open-ended-action"></div>
-    <div class="open-ended-alert"></div>
 
     <div class="rubric-wrapper">${initial_rubric}</div>
 

From b83df64f9a0258f1475f3adb6175e7e3ddff8e98 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 18:53:36 -0500
Subject: [PATCH 151/541] Inline response to feedback

---
 common/lib/xmodule/xmodule/combined_open_ended_module.py     | 3 +++
 .../xmodule/xmodule/js/src/combinedopenended/display.coffee  | 3 ++-
 common/lib/xmodule/xmodule/open_ended_module.py              | 5 +++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index b0fb365d73..4537985d33 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -213,8 +213,11 @@ class CombinedOpenEndedModule(XModule):
         last_response=task.latest_answer()
         last_score = task.latest_score()
         last_post_assessment = task.latest_post_assessment()
+        last_post_feedback=""
         if task_type=="openended":
             last_post_assessment = task.latest_post_assessment(short_feedback=True)
+            last_post_evaluation = task.format_feedback_with_evaluation(last_post_assessment)
+            last_post_assessment = last_post_evaluation
         max_score = task.max_score()
         state = task.state
         last_response_dict={'response' : last_response, 'score' : last_score,
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index f6ad7eb22a..100905e0ae 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -30,6 +30,8 @@ class @CombinedOpenEnded
     @hint_wrapper = @$('.hint-wrapper')
     @message_wrapper = @$('.message-wrapper')
     @submit_button = @$('.submit-button')
+    @submit_evaluation_button = @$('.submit-evaluation-button')
+    @submit_evaluation_button.click @message_post
     @child_state = @el.data('state')
     @child_type = @el.data('child-type')
     if @child_type=="openended"
@@ -134,7 +136,6 @@ class @CombinedOpenEnded
     else
       @errors_area.html('Problem state got out of sync.  Try reloading the page.')
 
-
   save_hint:  (event) =>
     event.preventDefault()
     if @child_state == 'post_assessment'
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index b1931f81be..32245e710b 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -404,6 +404,11 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             correct = (score_ratio >= 0.66)
         return correct
 
+    def format_feedback_with_evaluation(self,feedback):
+        context={'msg' : feedback, id : "1", rows : 30, cols : 30}
+        html= render_to_string('open_ended_evaluation.html', context)
+        return html
+
     def handle_ajax(self, dispatch, get, system):
         '''
         This is called by courseware.module_render, to handle an AJAX call.

From a3c1f7c9f4bb7dd088edc935a673cf8ce61159c6 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 19:00:24 -0500
Subject: [PATCH 152/541] Feedback submission moved

---
 .../xmodule/xmodule/js/src/combinedopenended/display.coffee | 6 +++---
 common/lib/xmodule/xmodule/open_ended_module.py             | 2 +-
 lms/templates/open_ended_evaluation.html                    | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 100905e0ae..aeaa765b4e 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -20,6 +20,8 @@ class @CombinedOpenEnded
     @next_problem_button.click @next_problem
     # valid states: 'initial', 'assessing', 'post_assessment', 'done'
     Collapsible.setCollapsibles(@el)
+    @submit_evaluation_button = $('.submit-evaluation-button')
+    @submit_evaluation_button.click @message_post
 
     # Where to put the rubric once we load it
     @el = $(element).find('section.open-ended-child')
@@ -30,8 +32,6 @@ class @CombinedOpenEnded
     @hint_wrapper = @$('.hint-wrapper')
     @message_wrapper = @$('.message-wrapper')
     @submit_button = @$('.submit-button')
-    @submit_evaluation_button = @$('.submit-evaluation-button')
-    @submit_evaluation_button.click @message_post
     @child_state = @el.data('state')
     @child_type = @el.data('child-type')
     if @child_type=="openended"
@@ -207,7 +207,7 @@ class @CombinedOpenEnded
     Logger.log 'message_post', @answers
 
     fd = new FormData()
-    feedback = @$('section.evaluation textarea.feedback-on-feedback')[0].value
+    feedback = $('section.evaluation textarea.feedback-on-feedback')[0].value
     submission_id = $('div.external-grader-message div.submission_id')[0].innerHTML
     grader_id = $('div.external-grader-message div.grader_id')[0].innerHTML
     score = $(".evaluation-scoring input:radio[name='evaluation-score']:checked").val()
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 32245e710b..46b6f7e838 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -405,7 +405,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         return correct
 
     def format_feedback_with_evaluation(self,feedback):
-        context={'msg' : feedback, id : "1", rows : 30, cols : 30}
+        context={'msg' : feedback, 'id' : "1", 'rows' : 30, 'cols' : 30}
         html= render_to_string('open_ended_evaluation.html', context)
         return html
 
diff --git a/lms/templates/open_ended_evaluation.html b/lms/templates/open_ended_evaluation.html
index 018486a1d6..da3f38b6a9 100644
--- a/lms/templates/open_ended_evaluation.html
+++ b/lms/templates/open_ended_evaluation.html
@@ -17,6 +17,7 @@
             </div>
             <p>Additional comments:</p>
             <textarea rows="${rows}" cols="${cols}" name="feedback_${id}" class="feedback-on-feedback" id="feedback_${id}"></textarea>
+            <input type="button" value="Submit Feedback" class="submit-evaluation-button" name="reset"/>
         </section>
     </div>
 </div>
\ No newline at end of file

From 25d25c004b2468d3f89a02a87a7083478bb38a73 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 19:16:28 -0500
Subject: [PATCH 153/541] Restyling on feedback response

---
 .../css/combinedopenended/display.scss        | 258 +++++++++---------
 1 file changed, 130 insertions(+), 128 deletions(-)

diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
index c1112d72b3..daed84054e 100644
--- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -44,6 +44,136 @@ section.combined-open-ended {
 }
 
 section.open-ended-child, section.combined-open-ended-status {
+
+   .evaluation {
+        p {
+            margin-bottom: 1px;
+        }
+    }
+
+    .feedback-on-feedback {
+        height: 100px;
+        width: 150px;
+        margin-right: 0px;
+    }
+
+    .evaluation-response {
+        header {
+            text-align: right;
+            a {
+                font-size: .7em;
+            }
+        }
+    }
+    .evaluation-scoring {
+        .scoring-list {
+            list-style-type: none;
+            margin-left: 3px;
+
+            li {
+                &:first-child {
+                    margin-left: 0px;
+                }
+                display:block;
+                margin-left: 0px;
+
+                label {
+                    font-size: .9em;
+                }
+            }
+        }
+    }
+    .submit-message-container {
+        margin: 10px 0px ;
+    }
+
+     .external-grader-message {
+        section {
+          padding-left: 20px;
+          background-color: #FAFAFA;
+          color: #2C2C2C;
+          font-family: monospace;
+          font-size: 1em;
+          padding-top: 10px;
+          header {
+              font-size: 1.4em;
+          }
+
+          .shortform {
+            font-weight: bold;
+          }
+
+          .longform {
+            padding: 0px;
+            margin: 0px;
+
+            .result-errors {
+              margin: 5px;
+              padding: 10px 10px 10px 40px;
+              background: url('../images/incorrect-icon.png') center left no-repeat;
+              li {
+                color: #B00;
+                }
+            }
+
+            .result-output {
+              margin: 5px;
+              padding: 20px 0px 15px 50px;
+              border-top: 1px solid #DDD;
+              border-left: 20px solid #FAFAFA;
+
+              h4 {
+                font-family: monospace;
+                font-size: 1em;
+              }
+
+              dl {
+                margin: 0px;
+              }
+
+              dt {
+                margin-top: 20px;
+              }
+
+              dd {
+                margin-left: 24pt;
+              }
+            }
+
+            .result-correct {
+              background: url('../images/correct-icon.png') left 20px no-repeat;
+              .result-actual-output {
+                color: #090;
+              }
+            }
+
+            .result-incorrect {
+              background: url('../images/incorrect-icon.png') left 20px no-repeat;
+              .result-actual-output {
+                color: #B00;
+              }
+            }
+
+            .markup-text{
+              margin: 5px;
+              padding: 20px 0px 15px 50px;
+              border-top: 1px solid #DDD;
+              border-left: 20px solid #FAFAFA;
+
+              bs {
+                color: #BB0000;
+              }
+
+              bg {
+                color: #BDA046;
+              }
+            }
+          }
+        }
+      }
+}
+
+section.open-ended-child {
   @media print {
     display: block;
     width: auto;
@@ -265,50 +395,6 @@ section.open-ended-child, section.combined-open-ended-status {
       }
 
     }
-    .evaluation {
-        p {
-            margin-bottom: 4px;
-        }
-    }
-
-
-    .feedback-on-feedback {
-        height: 100px;
-        margin-right: 20px;
-    }
-
-    .evaluation-response {
-        header {
-            text-align: right;
-            a {
-                font-size: .85em;
-            }
-        }
-    }
-
-    .evaluation-scoring {
-        .scoring-list {
-            list-style-type: none;
-            margin-left: 3px;
-
-            li {
-                &:first-child {
-                    margin-left: 0px;
-                }
-                display:inline;
-                margin-left: 50px;
-
-                label {
-                    font-size: .9em;
-                }
-
-            }
-        }
-
-    }
-    .submit-message-container {
-        margin: 10px 0px ;
-    }
 
   form.option-input {
     margin: -10px 0 20px;
@@ -444,88 +530,4 @@ section.open-ended-child, section.combined-open-ended-status {
     font-size: 0.9em;
   }
 
-  .external-grader-message {
-    section {
-      padding-left: 20px;
-      background-color: #FAFAFA;
-      color: #2C2C2C;
-      font-family: monospace;
-      font-size: 1em;
-      padding-top: 10px;
-      header {
-          font-size: 1.4em;
-      }
-
-      .shortform {
-        font-weight: bold;
-      }
-
-      .longform {
-        padding: 0px;
-        margin: 0px;
-
-        .result-errors {
-          margin: 5px;
-          padding: 10px 10px 10px 40px;
-          background: url('../images/incorrect-icon.png') center left no-repeat;
-          li {
-            color: #B00;
-            }
-        }
-
-        .result-output {
-          margin: 5px;
-          padding: 20px 0px 15px 50px;
-          border-top: 1px solid #DDD;
-          border-left: 20px solid #FAFAFA;
-
-          h4 {
-            font-family: monospace;
-            font-size: 1em;
-          }
-
-          dl {
-            margin: 0px;
-          }
-
-          dt {
-            margin-top: 20px;
-          }
-
-          dd {
-            margin-left: 24pt;
-          }
-        }
-
-        .result-correct {
-          background: url('../images/correct-icon.png') left 20px no-repeat;
-          .result-actual-output {
-            color: #090;
-          }
-        }
-
-        .result-incorrect {
-          background: url('../images/incorrect-icon.png') left 20px no-repeat;
-          .result-actual-output {
-            color: #B00;
-          }
-        }
-
-        .markup-text{
-          margin: 5px;
-          padding: 20px 0px 15px 50px;
-          border-top: 1px solid #DDD;
-          border-left: 20px solid #FAFAFA;
-
-          bs {
-            color: #BB0000;
-          }
-
-          bg {
-            color: #BDA046;
-          }
-        }
-      }
-    }
-  }
 }

From 349a43f31c6d1e78953aadb9fc5a6fc7228a6209 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 7 Jan 2013 19:19:51 -0500
Subject: [PATCH 154/541] Decouple message post from state logic

---
 .../xmodule/xmodule/js/src/combinedopenended/display.coffee | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index aeaa765b4e..2c8cbcda4b 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -220,7 +220,6 @@ class @CombinedOpenEnded
     else
       fd.append('score', score)
 
-
     settings =
       type: "POST"
       data: fd
@@ -228,11 +227,8 @@ class @CombinedOpenEnded
       contentType: false
       success: (response) =>
         @gentle_alert response.msg
-        @$('section.evaluation').slideToggle()
+        $('section.evaluation').slideToggle()
         @message_wrapper.html(response.message_html)
-        @child_state = 'done'
-        @allow_reset = response.allow_reset
-        @rebind()
 
     $.ajaxWithPrefix("#{@ajax_url}/save_post_assessment", settings)
 

From 5273d44788ce59552324a2ed2ded3f6743cacb76 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Tue, 8 Jan 2013 10:24:36 -0500
Subject: [PATCH 155/541] Fix css and display current step

---
 .../css/combinedopenended/display.scss        | 18 ++++++++++-
 lms/templates/combined_open_ended_status.html | 32 +++++++++++--------
 2 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
index daed84054e..e15a34453a 100644
--- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -21,7 +21,6 @@ h2 {
 }
 
 section.combined-open-ended {
-  margin-right:20px;
   .status-container
   {
       float:right;
@@ -45,6 +44,23 @@ section.combined-open-ended {
 
 section.open-ended-child, section.combined-open-ended-status {
 
+    .statusitem {
+      background-color: #FAFAFA;
+      color: #2C2C2C;
+      font-family: monospace;
+      font-size: 1em;
+      padding-top: 10px;
+   }
+
+   .statusitem-current {
+     background-color: #BEBEBE;
+     color: #2C2C2C;
+     font-family: monospace;
+     font-size: 1em;
+     padding-top: 10px;
+  }
+
+
    .evaluation {
         p {
             margin-bottom: 1px;
diff --git a/lms/templates/combined_open_ended_status.html b/lms/templates/combined_open_ended_status.html
index 7bc66d954f..c8a0177edd 100644
--- a/lms/templates/combined_open_ended_status.html
+++ b/lms/templates/combined_open_ended_status.html
@@ -1,17 +1,23 @@
 <section id="combined-open-ended-status" class="combined-open-ended-status">
-    %for status in status_list:
-    <div class="statusitem">
-        Step ${status['task_number']} (${status['human_state']}) : ${status['score']} / ${status['max_score']}
-        %if status['type']=="openended":
-            <div class="collapsible external-grader-message">
-                <header>
-                    <a href="#">Show feedback from step ${status['task_number']}</a>
-                </header>
-                <section id="post-assessment">
-                    ${status['post_assessment']}
-                </section>
-            </div>
+    %for i in xrange(0,len(status_list)):
+        <%status=status_list[i]%>
+        %if i==len(status_list)-1:
+            <div class="statusitem-current" data-status-number="${i}">
+        %else:
+            <div class="statusitem" data-status-number="${i}">
         %endif
-    </div>
+
+            Step ${status['task_number']} (${status['human_state']}) : ${status['score']} / ${status['max_score']}
+            %if status['type']=="openended":
+                <div class="collapsible external-grader-message">
+                    <header>
+                        <a href="#">Show feedback from step ${status['task_number']}</a>
+                    </header>
+                    <section id="post-assessment">
+                        ${status['post_assessment']}
+                    </section>
+                </div>
+            %endif
+        </div>
     %endfor
 </section>
\ No newline at end of file

From 24bfe44049e79cd29f3735ad2faf03cce21c20dc Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Tue, 8 Jan 2013 10:57:47 -0500
Subject: [PATCH 156/541] Some restyling, automatically check for feedback,
 remove reload button

---
 .../css/combinedopenended/display.scss        |  8 +++----
 .../js/src/combinedopenended/display.coffee   | 21 ++++++++++++++-----
 .../lib/xmodule/xmodule/open_ended_module.py  |  7 ++++++-
 lms/templates/open_ended.html                 |  1 -
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
index e15a34453a..5ac7066c6d 100644
--- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -24,12 +24,12 @@ section.combined-open-ended {
   .status-container
   {
       float:right;
-      width:30%;
+      width:40%;
   }
   .item-container
   {
       float:left;
-      width: 63%;
+      width: 53%;
   }
 
   &:after
@@ -68,8 +68,8 @@ section.open-ended-child, section.combined-open-ended-status {
     }
 
     .feedback-on-feedback {
-        height: 100px;
-        width: 150px;
+        height: 150px;
+        width: 250px;
         margin-right: 0px;
     }
 
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 2c8cbcda4b..e868186bde 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -35,7 +35,6 @@ class @CombinedOpenEnded
     @child_state = @el.data('state')
     @child_type = @el.data('child-type')
     if @child_type=="openended"
-      @reload_button = @$('.reload-button')
       @skip_button = @$('.skip-button')
       @skip_button.click @skip_post_assessment
 
@@ -58,7 +57,6 @@ class @CombinedOpenEnded
     @next_problem_button.hide()
     @hint_area.attr('disabled', false)
     if @child_type=="openended"
-      @reload_button.hide()
       @skip_button.hide()
     if @child_state == 'initial'
       @answer_area.attr("disabled", false)
@@ -70,10 +68,9 @@ class @CombinedOpenEnded
       @submit_button.click @save_assessment
       if @child_type == "openended"
         @submit_button.hide()
-        @reload_button.show()
+        @queueing()
     else if @child_state == 'post_assessment'
       if @child_type=="openended"
-        @reload_button.hide()
         @skip_button.show()
         @skip_post_assessment()
       @answer_area.attr("disabled", true)
@@ -237,4 +234,18 @@ class @CombinedOpenEnded
       @el.find('.open-ended-alert').remove()
     alert_elem = "<div class='open-ended-alert'>" + msg + "</div>"
     @el.find('.open-ended-action').after(alert_elem)
-    @el.find('.open-ended-alert').css(opacity: 0).animate(opacity: 1, 700)
\ No newline at end of file
+    @el.find('.open-ended-alert').css(opacity: 0).animate(opacity: 1, 700)
+
+  queueing: =>
+    if @child_state=="assessing" and @child_type=="openended"
+      if window.queuePollerID # Only one poller 'thread' per Problem
+        window.clearTimeout(window.queuePollerID)
+      window.queuePollerID = window.setTimeout(@poll, 10000)
+
+  poll: =>
+    $.postWithPrefix "#{@ajax_url}/check_for_score", (response) =>
+      if response.state == "done" or response.state=="post_assessment"
+        delete window.queuePollerID
+        location.reload()
+      else
+        window.queuePollerID = window.setTimeout(@poll, 10000)
\ No newline at end of file
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 46b6f7e838..ba1c68511f 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -405,7 +405,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         return correct
 
     def format_feedback_with_evaluation(self,feedback):
-        context={'msg' : feedback, 'id' : "1", 'rows' : 30, 'cols' : 30}
+        context={'msg' : feedback, 'id' : "1", 'rows' : 50, 'cols' : 50}
         html= render_to_string('open_ended_evaluation.html', context)
         return html
 
@@ -424,6 +424,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             'score_update': self.update_score,
             'save_post_assessment' : self.message_post,
             'skip_post_assessment' : self.skip_post_assessment,
+            'check_for_score' : self.check_for_score,
             }
 
         if dispatch not in handlers:
@@ -438,6 +439,10 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             })
         return json.dumps(d, cls=ComplexEncoder)
 
+    def check_for_score(self, get, system):
+        state = self.state
+        return {'state' : state}
+
     def save_answer(self, get, system):
         if self.attempts > self.max_attempts:
             # If too many attempts, prevent student from saving answer and
diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html
index b0ef0be51a..c1c7288d9e 100644
--- a/lms/templates/open_ended.html
+++ b/lms/templates/open_ended.html
@@ -29,7 +29,6 @@
 
   <span id="answer_${id}"></span>
 
-  <input name="reload" class="reload-button" type="button" value="Recheck for Feedback" onclick="document.location.reload(true);" />
   <div class="external-grader-message">
      ${msg|n}
   </div>

From 3620fd93d9d13fb0ca66f69dfdf1a7b46aff38d2 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Tue, 8 Jan 2013 12:13:39 -0500
Subject: [PATCH 157/541] Create a result container and put results into it

---
 .../xmodule/combined_open_ended_module.py       |  9 +++++++++
 .../xmodule/css/combinedopenended/display.scss  |  7 +++++++
 .../js/src/combinedopenended/display.coffee     | 17 +++++++++++++++++
 lms/templates/combined_open_ended.html          |  4 ++++
 lms/templates/combined_open_ended_results.html  |  3 +++
 lms/templates/combined_open_ended_status.html   |  9 ++-------
 lms/templates/open_ended_evaluation.html        |  2 +-
 7 files changed, 43 insertions(+), 8 deletions(-)
 create mode 100644 lms/templates/combined_open_ended_results.html

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 4537985d33..c6ed8b2ed1 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -248,6 +248,14 @@ class CombinedOpenEndedModule(XModule):
             pass
         return return_html
 
+    def get_results(self, get):
+        task_number=get['task_number']
+        self.update_task_states()
+        response_dict=self.get_last_response(task_number)
+        context = {'results' : response_dict['post_assessment']}
+        html = render_to_string('combined_open_ended_results.html', context)
+        return html
+
     def handle_ajax(self, dispatch, get):
         """
         This is called by courseware.module_render, to handle an AJAX call.
@@ -262,6 +270,7 @@ class CombinedOpenEndedModule(XModule):
         handlers = {
             'next_problem': self.next_problem,
             'reset': self.reset,
+            'get_results' : self.get_results
             }
 
         if dispatch not in handlers:
diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
index 5ac7066c6d..d8e36361a6 100644
--- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -32,6 +32,13 @@ section.combined-open-ended {
       width: 53%;
   }
 
+  .result-container
+  {
+      float:left;
+      width: 93%;
+      position:relative;
+  }
+
   &:after
   {
       content:".";
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index e868186bde..922f4082b0 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -18,11 +18,17 @@ class @CombinedOpenEnded
     @reset_button.click @reset
     @next_problem_button = @$('.next-step-button')
     @next_problem_button.click @next_problem
+
+    @show_results_button=@$('.show-results-button')
+    @show_results_button.click @show_results
+
     # valid states: 'initial', 'assessing', 'post_assessment', 'done'
     Collapsible.setCollapsibles(@el)
     @submit_evaluation_button = $('.submit-evaluation-button')
     @submit_evaluation_button.click @message_post
 
+    @results_container = $('.result-container')
+
     # Where to put the rubric once we load it
     @el = $(element).find('section.open-ended-child')
     @errors_area = @$('.error')
@@ -49,6 +55,17 @@ class @CombinedOpenEnded
   $: (selector) ->
     $(selector, @el)
 
+  show_results: (event) =>
+    status_item = $(event.target).parent().parent()
+    status_number = status_item.data('status-number')
+    data = {'task_number' : status_number}
+    $.postWithPrefix "#{@ajax_url}/get_results", data, (response) =>
+      if response.success
+        @results_container.after(response.html).remove()
+        @Collapsible.setCollapsibles(@results_container)
+      else
+        @errors_area.html(response.error)
+
   rebind: () =>
     # rebind to the appropriate function for the current state
     @submit_button.unbind('click')
diff --git a/lms/templates/combined_open_ended.html b/lms/templates/combined_open_ended.html
index 5cd5d76e4c..4c0aaa1042 100644
--- a/lms/templates/combined_open_ended.html
+++ b/lms/templates/combined_open_ended.html
@@ -15,5 +15,9 @@
         <input type="button" value="Reset" class="reset-button" name="reset"/>
         <input type="button" value="Next Step" class="next-step-button" name="reset"/>
     </div>
+
+    <div class="result-container">
+        <h4>Results</h4><br/>
+    </div>
 </section>
 
diff --git a/lms/templates/combined_open_ended_results.html b/lms/templates/combined_open_ended_results.html
new file mode 100644
index 0000000000..12af086cfe
--- /dev/null
+++ b/lms/templates/combined_open_ended_results.html
@@ -0,0 +1,3 @@
+<div class="result-container">
+    ${results | n}
+</div>
\ No newline at end of file
diff --git a/lms/templates/combined_open_ended_status.html b/lms/templates/combined_open_ended_status.html
index c8a0177edd..6109df2f26 100644
--- a/lms/templates/combined_open_ended_status.html
+++ b/lms/templates/combined_open_ended_status.html
@@ -9,13 +9,8 @@
 
             Step ${status['task_number']} (${status['human_state']}) : ${status['score']} / ${status['max_score']}
             %if status['type']=="openended":
-                <div class="collapsible external-grader-message">
-                    <header>
-                        <a href="#">Show feedback from step ${status['task_number']}</a>
-                    </header>
-                    <section id="post-assessment">
-                        ${status['post_assessment']}
-                    </section>
+                <div class="show-results">
+                    <a href="#" class="show-results-button">Show results from step ${status['task_number']}</a>
                 </div>
             %endif
         </div>
diff --git a/lms/templates/open_ended_evaluation.html b/lms/templates/open_ended_evaluation.html
index da3f38b6a9..71ce6d5056 100644
--- a/lms/templates/open_ended_evaluation.html
+++ b/lms/templates/open_ended_evaluation.html
@@ -20,4 +20,4 @@
             <input type="button" value="Submit Feedback" class="submit-evaluation-button" name="reset"/>
         </section>
     </div>
-</div>
\ No newline at end of file
+</div>incorrect-icon.png
\ No newline at end of file

From 943c0ff8207e3cb065e871128c9a8399179ab9df Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Tue, 8 Jan 2013 15:01:35 -0500
Subject: [PATCH 158/541] Display results separately from submission logic

---
 .../lib/xmodule/xmodule/combined_open_ended_module.py |  6 +++---
 .../xmodule/css/combinedopenended/display.scss        | 11 +++++++----
 .../xmodule/js/src/combinedopenended/display.coffee   |  1 +
 lms/templates/combined_open_ended_results.html        |  1 +
 lms/templates/open_ended.html                         |  4 ----
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index c6ed8b2ed1..aec330cb49 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -215,7 +215,7 @@ class CombinedOpenEndedModule(XModule):
         last_post_assessment = task.latest_post_assessment()
         last_post_feedback=""
         if task_type=="openended":
-            last_post_assessment = task.latest_post_assessment(short_feedback=True)
+            last_post_assessment = task.latest_post_assessment(short_feedback=False)
             last_post_evaluation = task.format_feedback_with_evaluation(last_post_assessment)
             last_post_assessment = last_post_evaluation
         max_score = task.max_score()
@@ -249,12 +249,12 @@ class CombinedOpenEndedModule(XModule):
         return return_html
 
     def get_results(self, get):
-        task_number=get['task_number']
+        task_number=int(get['task_number'])
         self.update_task_states()
         response_dict=self.get_last_response(task_number)
         context = {'results' : response_dict['post_assessment']}
         html = render_to_string('combined_open_ended_results.html', context)
-        return html
+        return {'html' : html, 'success' : True}
 
     def handle_ajax(self, dispatch, get):
         """
diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
index d8e36361a6..6adb31aa5d 100644
--- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -30,6 +30,7 @@ section.combined-open-ended {
   {
       float:left;
       width: 53%;
+      padding-bottom: 20px;
   }
 
   .result-container
@@ -49,7 +50,7 @@ section.combined-open-ended {
   }
 }
 
-section.open-ended-child, section.combined-open-ended-status {
+section.combined-open-ended-status {
 
     .statusitem {
       background-color: #FAFAFA;
@@ -66,9 +67,11 @@ section.open-ended-child, section.combined-open-ended-status {
      font-size: 1em;
      padding-top: 10px;
   }
+}
 
+div.result-container {
 
-   .evaluation {
+ .evaluation {
         p {
             margin-bottom: 1px;
         }
@@ -84,7 +87,7 @@ section.open-ended-child, section.combined-open-ended-status {
         header {
             text-align: right;
             a {
-                font-size: .7em;
+                font-size: .85em;
             }
         }
     }
@@ -97,7 +100,7 @@ section.open-ended-child, section.combined-open-ended-status {
                 &:first-child {
                     margin-left: 0px;
                 }
-                display:block;
+                display:inline;
                 margin-left: 0px;
 
                 label {
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 922f4082b0..1dbe3fe9ea 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -62,6 +62,7 @@ class @CombinedOpenEnded
     $.postWithPrefix "#{@ajax_url}/get_results", data, (response) =>
       if response.success
         @results_container.after(response.html).remove()
+        @results_container = $('.result-container')
         @Collapsible.setCollapsibles(@results_container)
       else
         @errors_area.html(response.error)
diff --git a/lms/templates/combined_open_ended_results.html b/lms/templates/combined_open_ended_results.html
index 12af086cfe..75c5596e4b 100644
--- a/lms/templates/combined_open_ended_results.html
+++ b/lms/templates/combined_open_ended_results.html
@@ -1,3 +1,4 @@
 <div class="result-container">
+    <h4>Results</h4><br/>
     ${results | n}
 </div>
\ No newline at end of file
diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html
index c1c7288d9e..cda3282a45 100644
--- a/lms/templates/open_ended.html
+++ b/lms/templates/open_ended.html
@@ -28,8 +28,4 @@
   <div class="open-ended-action"></div>
 
   <span id="answer_${id}"></span>
-
-  <div class="external-grader-message">
-     ${msg|n}
-  </div>
 </section>

From 7b08114805a3410c4633817db38943469887e244 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Tue, 8 Jan 2013 15:09:48 -0500
Subject: [PATCH 159/541] More restyling, fix buttons

---
 .../lib/xmodule/xmodule/css/combinedopenended/display.scss  | 5 ++---
 .../xmodule/xmodule/js/src/combinedopenended/display.coffee | 6 ++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
index 6adb31aa5d..7f52cd9623 100644
--- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -30,7 +30,7 @@ section.combined-open-ended {
   {
       float:left;
       width: 53%;
-      padding-bottom: 20px;
+      padding-bottom: 50px;
   }
 
   .result-container
@@ -78,8 +78,7 @@ div.result-container {
     }
 
     .feedback-on-feedback {
-        height: 150px;
-        width: 250px;
+        height: 100px;
         margin-right: 0px;
     }
 
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 1dbe3fe9ea..0e285dce25 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -62,8 +62,10 @@ class @CombinedOpenEnded
     $.postWithPrefix "#{@ajax_url}/get_results", data, (response) =>
       if response.success
         @results_container.after(response.html).remove()
-        @results_container = $('.result-container')
-        @Collapsible.setCollapsibles(@results_container)
+        @results_container = $('div.result-container')
+        @submit_evaluation_button = $('.submit-evaluation-button')
+        @submit_evaluation_button.click @message_post
+        Collapsible.setCollapsibles(@results_container)
       else
         @errors_area.html(response.error)
 

From af705ca1af28445abb85ca1a5268100654970ac7 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Tue, 8 Jan 2013 15:12:21 -0500
Subject: [PATCH 160/541] Remove html

---
 lms/templates/open_ended_evaluation.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/templates/open_ended_evaluation.html b/lms/templates/open_ended_evaluation.html
index 71ce6d5056..da3f38b6a9 100644
--- a/lms/templates/open_ended_evaluation.html
+++ b/lms/templates/open_ended_evaluation.html
@@ -20,4 +20,4 @@
             <input type="button" value="Submit Feedback" class="submit-evaluation-button" name="reset"/>
         </section>
     </div>
-</div>incorrect-icon.png
\ No newline at end of file
+</div>
\ No newline at end of file

From bccafe6c3195403ce321efc4fb20e56d1cfc18e8 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Tue, 8 Jan 2013 15:23:54 -0500
Subject: [PATCH 161/541] Add in correctness display

---
 .../xmodule/combined_open_ended_module.py        | 16 ++++++++++++----
 common/lib/xmodule/xmodule/open_ended_module.py  |  7 -------
 common/lib/xmodule/xmodule/openendedchild.py     | 11 +++++++++++
 lms/templates/combined_open_ended.html           |  1 -
 lms/templates/combined_open_ended_results.html   |  2 +-
 lms/templates/combined_open_ended_status.html    |  2 +-
 6 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index aec330cb49..957b978407 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -218,11 +218,19 @@ class CombinedOpenEndedModule(XModule):
             last_post_assessment = task.latest_post_assessment(short_feedback=False)
             last_post_evaluation = task.format_feedback_with_evaluation(last_post_assessment)
             last_post_assessment = last_post_evaluation
+        last_correctness = task.is_last_response_correct()
         max_score = task.max_score()
         state = task.state
-        last_response_dict={'response' : last_response, 'score' : last_score,
-                            'post_assessment' : last_post_assessment,
-                            'type' : task_type, 'max_score' : max_score, 'state' : state, 'human_state' : task.HUMAN_NAMES[state]}
+        last_response_dict={
+            'response' : last_response,
+            'score' : last_score,
+            'post_assessment' : last_post_assessment,
+            'type' : task_type,
+            'max_score' : max_score,
+            'state' : state,
+            'human_state' : task.HUMAN_NAMES[state],
+            'correct' : last_correctness
+        }
 
         return last_response_dict
 
@@ -252,7 +260,7 @@ class CombinedOpenEndedModule(XModule):
         task_number=int(get['task_number'])
         self.update_task_states()
         response_dict=self.get_last_response(task_number)
-        context = {'results' : response_dict['post_assessment']}
+        context = {'results' : response_dict['post_assessment'], 'task_number' : task_number+1}
         html = render_to_string('combined_open_ended_results.html', context)
         return {'html' : html, 'success' : True}
 
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index ba1c68511f..9cdbdd54e2 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -397,13 +397,6 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             short_feedback = self._convert_longform_feedback_to_html(json.loads(self.history[-1].get('post_assessment', "")))
         return short_feedback if feedback_dict['valid'] else ''
 
-    def is_submission_correct(self, score):
-        correct=False
-        if(isinstance(score,(int, long, float, complex))):
-            score_ratio = int(score) / float(self.max_score())
-            correct = (score_ratio >= 0.66)
-        return correct
-
     def format_feedback_with_evaluation(self,feedback):
         context={'msg' : feedback, 'id' : "1", 'rows' : 50, 'cols' : 50}
         html= render_to_string('open_ended_evaluation.html', context)
diff --git a/common/lib/xmodule/xmodule/openendedchild.py b/common/lib/xmodule/xmodule/openendedchild.py
index 236bd03c4c..73bd8f3957 100644
--- a/common/lib/xmodule/xmodule/openendedchild.py
+++ b/common/lib/xmodule/xmodule/openendedchild.py
@@ -250,5 +250,16 @@ class OpenEndedChild():
     def handle_ajax(self):
         pass
 
+    def is_submission_correct(self, score):
+        correct=False
+        if(isinstance(score,(int, long, float, complex))):
+            score_ratio = int(score) / float(self.max_score())
+            correct = (score_ratio >= 0.66)
+        return correct
+
+    def is_last_response_correct(self):
+        score=self.get_score()
+        return self.is_submission_correct(score)
+
 
 
diff --git a/lms/templates/combined_open_ended.html b/lms/templates/combined_open_ended.html
index 4c0aaa1042..71c22085e3 100644
--- a/lms/templates/combined_open_ended.html
+++ b/lms/templates/combined_open_ended.html
@@ -17,7 +17,6 @@
     </div>
 
     <div class="result-container">
-        <h4>Results</h4><br/>
     </div>
 </section>
 
diff --git a/lms/templates/combined_open_ended_results.html b/lms/templates/combined_open_ended_results.html
index 75c5596e4b..db86e95016 100644
--- a/lms/templates/combined_open_ended_results.html
+++ b/lms/templates/combined_open_ended_results.html
@@ -1,4 +1,4 @@
 <div class="result-container">
-    <h4>Results</h4><br/>
+    <h4>Results from Step ${task_number}</h4><br/>
     ${results | n}
 </div>
\ No newline at end of file
diff --git a/lms/templates/combined_open_ended_status.html b/lms/templates/combined_open_ended_status.html
index 6109df2f26..9d51bd67fd 100644
--- a/lms/templates/combined_open_ended_status.html
+++ b/lms/templates/combined_open_ended_status.html
@@ -8,7 +8,7 @@
         %endif
 
             Step ${status['task_number']} (${status['human_state']}) : ${status['score']} / ${status['max_score']}
-            %if status['type']=="openended":
+            %if status['type']=="openended" and status['state'] in ['done', 'post_assessment']:
                 <div class="show-results">
                     <a href="#" class="show-results-button">Show results from step ${status['task_number']}</a>
                 </div>

From 5150d6cdeec2664773acb7ac67d3f20461a120aa Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Tue, 8 Jan 2013 15:28:02 -0500
Subject: [PATCH 162/541] Add in better status indicators

---
 common/lib/xmodule/xmodule/openendedchild.py  | 3 ++-
 lms/templates/combined_open_ended_status.html | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/openendedchild.py b/common/lib/xmodule/xmodule/openendedchild.py
index 73bd8f3957..5fccdee4f6 100644
--- a/common/lib/xmodule/xmodule/openendedchild.py
+++ b/common/lib/xmodule/xmodule/openendedchild.py
@@ -259,7 +259,8 @@ class OpenEndedChild():
 
     def is_last_response_correct(self):
         score=self.get_score()
-        return self.is_submission_correct(score)
+        correctness = 'correct' if self.is_submission_correct(score) else 'incorrect'
+        return
 
 
 
diff --git a/lms/templates/combined_open_ended_status.html b/lms/templates/combined_open_ended_status.html
index 9d51bd67fd..a653a84d13 100644
--- a/lms/templates/combined_open_ended_status.html
+++ b/lms/templates/combined_open_ended_status.html
@@ -8,6 +8,15 @@
         %endif
 
             Step ${status['task_number']} (${status['human_state']}) : ${status['score']} / ${status['max_score']}
+            % if state == 'initial':
+                <span class="unanswered" style="display:inline;" id="status_${id}">Unanswered</span>
+            % elif state in ['done', 'post_assessment'] and correct == 'correct':
+                <span class="correct" id="status_${id}">Correct</span>
+            % elif state in ['done', 'post_assessment'] and correct == 'incorrect':
+                <span class="incorrect" id="status_${id}">Incorrect</span>
+            % elif state == 'assessing':
+                <span class="grading" id="status_${id}">Submitted for grading</span>
+            % endif
             %if status['type']=="openended" and status['state'] in ['done', 'post_assessment']:
                 <div class="show-results">
                     <a href="#" class="show-results-button">Show results from step ${status['task_number']}</a>

From 3bf532e199e62a942ccbb2f3a6164bbb2f142015 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Tue, 8 Jan 2013 15:45:07 -0500
Subject: [PATCH 163/541] Check marks in each step

---
 .../css/combinedopenended/display.scss        | 29 +++++++++++++++++++
 common/lib/xmodule/xmodule/openendedchild.py  |  4 +--
 lms/templates/combined_open_ended_status.html | 17 ++++++-----
 3 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
index 7f52cd9623..be86757aee 100644
--- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -67,6 +67,35 @@ section.combined-open-ended-status {
      font-size: 1em;
      padding-top: 10px;
   }
+
+    span {
+        &.unanswered {
+          @include inline-block();
+          background: url('../images/unanswered-icon.png') center center no-repeat;
+          height: 14px;
+          position: relative;
+          width: 14px;
+          float: right;
+        }
+
+        &.correct {
+          @include inline-block();
+          background: url('../images/correct-icon.png') center center no-repeat;
+          height: 20px;
+          position: relative;
+          width: 25px;
+          float: right;
+        }
+
+        &.incorrect {
+          @include inline-block();
+          background: url('../images/incorrect-icon.png') center center no-repeat;
+          height: 20px;
+          width: 20px;
+          position: relative;
+          float: right;
+        }
+    }
 }
 
 div.result-container {
diff --git a/common/lib/xmodule/xmodule/openendedchild.py b/common/lib/xmodule/xmodule/openendedchild.py
index 5fccdee4f6..5d69323e4a 100644
--- a/common/lib/xmodule/xmodule/openendedchild.py
+++ b/common/lib/xmodule/xmodule/openendedchild.py
@@ -258,9 +258,9 @@ class OpenEndedChild():
         return correct
 
     def is_last_response_correct(self):
-        score=self.get_score()
+        score=self.get_score()['score']
         correctness = 'correct' if self.is_submission_correct(score) else 'incorrect'
-        return
+        return correctness
 
 
 
diff --git a/lms/templates/combined_open_ended_status.html b/lms/templates/combined_open_ended_status.html
index a653a84d13..34a5dd0d79 100644
--- a/lms/templates/combined_open_ended_status.html
+++ b/lms/templates/combined_open_ended_status.html
@@ -8,15 +8,16 @@
         %endif
 
             Step ${status['task_number']} (${status['human_state']}) : ${status['score']} / ${status['max_score']}
-            % if state == 'initial':
-                <span class="unanswered" style="display:inline;" id="status_${id}">Unanswered</span>
-            % elif state in ['done', 'post_assessment'] and correct == 'correct':
-                <span class="correct" id="status_${id}">Correct</span>
-            % elif state in ['done', 'post_assessment'] and correct == 'incorrect':
-                <span class="incorrect" id="status_${id}">Incorrect</span>
-            % elif state == 'assessing':
-                <span class="grading" id="status_${id}">Submitted for grading</span>
+            % if status['state'] == 'initial':
+                <span class="unanswered" id="status"></span>
+            % elif status['state'] in ['done', 'post_assessment'] and status['correct'] == 'correct':
+                <span class="correct" id="status"></span>
+            % elif status['state'] in ['done', 'post_assessment'] and status['correct'] == 'incorrect':
+                <span class="incorrect" id="status"></span>
+            % elif status['state'] == 'assessing':
+                <span class="grading" id="status"></span>
             % endif
+
             %if status['type']=="openended" and status['state'] in ['done', 'post_assessment']:
                 <div class="show-results">
                     <a href="#" class="show-results-button">Show results from step ${status['task_number']}</a>

From 9e14e22c91e28376424b2fb41ac642a82d3642f3 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Tue, 8 Jan 2013 15:53:36 -0500
Subject: [PATCH 164/541] Move prompt and rubric to combined open ended instead
 of defining them in each task

---
 .../xmodule/combined_open_ended_module.py       | 12 +++++++++---
 common/lib/xmodule/xmodule/open_ended_module.py | 17 ++++++-----------
 common/lib/xmodule/xmodule/openendedchild.py    |  3 +++
 .../xmodule/xmodule/self_assessment_module.py   |  2 --
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 957b978407..4788c43382 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -98,6 +98,8 @@ class CombinedOpenEndedModule(XModule):
         self.static_data = {
             'max_score' : self._max_score,
             'max_attempts' : self.max_attempts,
+            'prompt' : definition['prompt'],
+            'rubric' : definition['rubric']
         }
 
         self.task_xml=definition['task_xml']
@@ -371,16 +373,20 @@ class CombinedOpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
         'hintprompt': 'some-html'
         }
         """
-        expected_children = ['task']
+        expected_children = ['task', 'rubric', 'prompt']
         for child in expected_children:
             if len(xml_object.xpath(child)) == 0 :
                 raise ValueError("Combined Open Ended definition must include at least one '{0}' tag".format(child))
 
-        def parse(k):
+        def parse_task(k):
             """Assumes that xml_object has child k"""
             return [stringify_children(xml_object.xpath(k)[i]) for i in xrange(0,len(xml_object.xpath(k)))]
 
-        return {'task_xml': parse('task')}
+        def parse(k):
+            """Assumes that xml_object has child k"""
+            return xml_object.xpath(k)[0]
+
+        return {'task_xml': parse_task('task'), 'prompt' : parse('prompt'), 'rubric' : parse('rubric')}
 
 
     def definition_to_xml(self, resource_fs):
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 9cdbdd54e2..b795db8228 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -40,8 +40,6 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
     def setup_response(self, system, location, definition, descriptor):
         oeparam = definition['oeparam']
-        prompt = definition['prompt']
-        rubric = definition['rubric']
 
         self.url = definition.get('url', None)
         self.queue_name = definition.get('queuename', self.DEFAULT_QUEUE)
@@ -53,12 +51,12 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         if oeparam is None:
             raise ValueError("No oeparam found in problem xml.")
-        if prompt is None:
+        if self.prompt is None:
             raise ValueError("No prompt found in problem xml.")
-        if rubric is None:
+        if self.rubric is None:
             raise ValueError("No rubric found in problem xml.")
 
-        self._parse(oeparam, prompt, rubric, system)
+        self._parse(oeparam, self.prompt, self.rubric, system)
 
         if self.created=="True" and self.state == self.ASSESSING:
             self.created="False"
@@ -530,7 +528,7 @@ class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
         }
         """
 
-        for child in ['openendedrubric', 'prompt', 'openendedparam']:
+        for child in ['openendedparam']:
             if len(xml_object.xpath(child)) != 1:
                 raise ValueError("Open Ended definition must include exactly one '{0}' tag".format(child))
 
@@ -538,10 +536,7 @@ class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
             """Assumes that xml_object has child k"""
             return xml_object.xpath(k)[0]
 
-        return {'rubric': parse('openendedrubric'),
-                'prompt': parse('prompt'),
-                'oeparam': parse('openendedparam'),
-                }
+        return {'oeparam': parse('openendedparam'),}
 
 
     def definition_to_xml(self, resource_fs):
@@ -553,7 +548,7 @@ class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
             child_node = etree.fromstring(child_str)
             elt.append(child_node)
 
-        for child in ['openendedrubric', 'prompt', 'openendedparam']:
+        for child in ['openendedparam']:
             add_child(child)
 
         return elt
diff --git a/common/lib/xmodule/xmodule/openendedchild.py b/common/lib/xmodule/xmodule/openendedchild.py
index 5d69323e4a..4a81703919 100644
--- a/common/lib/xmodule/xmodule/openendedchild.py
+++ b/common/lib/xmodule/xmodule/openendedchild.py
@@ -127,6 +127,9 @@ class OpenEndedChild():
         self.attempts = instance_state.get('attempts', 0)
         self.max_attempts = static_data['max_attempts']
 
+        self.prompt = static_data['prompt']
+        self.rubric = static_data['rubric']
+
         # Used for progress / grading.  Currently get credit just for
         # completion (doesn't matter if you self-assessed correct/incorrect).
         self._max_score = static_data['max_score']
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index 88c47f92ef..7050ff991b 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -33,8 +33,6 @@ log = logging.getLogger("mitx.courseware")
 class SelfAssessmentModule(openendedchild.OpenEndedChild):
 
     def setup_response(self, system, location, definition, descriptor):
-        self.rubric = definition['rubric']
-        self.prompt = definition['prompt']
         self.submit_message = definition['submitmessage']
         self.hint_prompt = definition['hintprompt']
 

From 3aa0daaa764176823b9d9e2811f73d7b4bfcdf05 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Tue, 8 Jan 2013 16:00:30 -0500
Subject: [PATCH 165/541] Add in proper prompt and rubric parsing

---
 common/lib/xmodule/xmodule/open_ended_module.py      |  1 +
 common/lib/xmodule/xmodule/self_assessment_module.py | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index b795db8228..3047c86888 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -76,6 +76,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         prompt_string = stringify_children(prompt)
         rubric_string = stringify_children(rubric)
         self.prompt=prompt_string
+        self.rubric=rubric_string
 
         grader_payload = oeparam.find('grader_payload')
         grader_payload = grader_payload.text if grader_payload is not None else ''
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index 7050ff991b..db082a8b4f 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -35,6 +35,8 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
     def setup_response(self, system, location, definition, descriptor):
         self.submit_message = definition['submitmessage']
         self.hint_prompt = definition['hintprompt']
+        self.prompt = stringify_children(prompt)
+        self.rubric = stringify_children(rubric)
 
     def get_html(self, system):
         #set context variables and render template
@@ -270,7 +272,7 @@ class SelfAssessmentDescriptor(XmlDescriptor, EditingDescriptor):
         'hintprompt': 'some-html'
         }
         """
-        expected_children = ['rubric', 'prompt', 'submitmessage', 'hintprompt']
+        expected_children = ['submitmessage', 'hintprompt']
         for child in expected_children:
             if len(xml_object.xpath(child)) != 1:
                 raise ValueError("Self assessment definition must include exactly one '{0}' tag".format(child))
@@ -279,9 +281,7 @@ class SelfAssessmentDescriptor(XmlDescriptor, EditingDescriptor):
             """Assumes that xml_object has child k"""
             return stringify_children(xml_object.xpath(k)[0])
 
-        return {'rubric': parse('rubric'),
-                'prompt': parse('prompt'),
-                'submitmessage': parse('submitmessage'),
+        return {'submitmessage': parse('submitmessage'),
                 'hintprompt': parse('hintprompt'),
                 }
 
@@ -294,7 +294,7 @@ class SelfAssessmentDescriptor(XmlDescriptor, EditingDescriptor):
             child_node = etree.fromstring(child_str)
             elt.append(child_node)
 
-        for child in ['rubric', 'prompt', 'submitmessage', 'hintprompt']:
+        for child in ['submitmessage', 'hintprompt']:
             add_child(child)
 
         return elt

From dcb33f1d5f2d2189968e813764ba4f97acca09ee Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Tue, 8 Jan 2013 16:04:09 -0500
Subject: [PATCH 166/541] Fix prompt and rubric passing

---
 common/lib/xmodule/xmodule/self_assessment_module.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index db082a8b4f..52701a8cf1 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -35,8 +35,8 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
     def setup_response(self, system, location, definition, descriptor):
         self.submit_message = definition['submitmessage']
         self.hint_prompt = definition['hintprompt']
-        self.prompt = stringify_children(prompt)
-        self.rubric = stringify_children(rubric)
+        self.prompt = stringify_children(self.prompt)
+        self.rubric = stringify_children(self.rubric)
 
     def get_html(self, system):
         #set context variables and render template

From b6a49f33ad0d678265bff5a826b6e2b678711e31 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Tue, 8 Jan 2013 16:31:33 -0500
Subject: [PATCH 167/541] parse out min and max score to advance

---
 .../lib/xmodule/xmodule/combined_open_ended_module.py | 11 +++++++----
 common/lib/xmodule/xmodule/open_ended_module.py       |  1 -
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 4788c43382..0e9874ec4f 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -82,7 +82,6 @@ class CombinedOpenEndedModule(XModule):
         # element.
         # Scores are on scale from 0 to max_score
         system.set('location', location)
-        log.debug(system.location)
         self.current_task_number = instance_state.get('current_task_number', 0)
         self.task_states= instance_state.get('task_states', [])
 
@@ -147,7 +146,13 @@ class CombinedOpenEndedModule(XModule):
         children=self.child_modules()
 
         self.current_task_descriptor=children['descriptors'][current_task_type](self.system)
-        self.current_task_parsed_xml=self.current_task_descriptor.definition_from_xml(etree.fromstring(self.current_task_xml),self.system)
+        etree_xml=etree.fromstring(self.current_task_xml)
+        min_score_to_attempt=int(etree_xml.attrib.get('min_score_to_attempt',0))
+        max_score_to_attempt=int(etree_xml.attrib.get('min_score_to_attempt',self._max_score))
+        if self.current_task_number>0:
+            last_response_data=self.get_last_response(self.current_task_number-1)
+
+        self.current_task_parsed_xml=self.current_task_descriptor.definition_from_xml(etree_xml,self.system)
         if current_task_state is None and self.current_task_number==0:
             self.current_task=children['modules'][current_task_type](self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, self.static_data)
             self.task_states.append(self.current_task.get_instance_state())
@@ -165,8 +170,6 @@ class CombinedOpenEndedModule(XModule):
                 current_task_state=self.overwrite_state(current_task_state)
             self.current_task=children['modules'][current_task_type](self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, self.static_data, instance_state=current_task_state)
 
-        log.debug(self.current_task.get_instance_state())
-        log.debug(self.get_instance_state())
         return True
 
     def get_context(self):
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 3047c86888..0e16156f1a 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -528,7 +528,6 @@ class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
         'oeparam': 'some-html'
         }
         """
-
         for child in ['openendedparam']:
             if len(xml_object.xpath(child)) != 1:
                 raise ValueError("Open Ended definition must include exactly one '{0}' tag".format(child))

From 1ae94ce6366f2dc00a7159a9e06d4578c262bf8d Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Tue, 8 Jan 2013 16:45:21 -0500
Subject: [PATCH 168/541] Hopefully allow for submission to be reset early

---
 .../xmodule/combined_open_ended_module.py     | 33 +++++++++++++++----
 .../js/src/combinedopenended/display.coffee   | 11 ++++---
 common/lib/xmodule/xmodule/openendedchild.py  |  2 +-
 3 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 0e9874ec4f..d31da49978 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -147,10 +147,11 @@ class CombinedOpenEndedModule(XModule):
 
         self.current_task_descriptor=children['descriptors'][current_task_type](self.system)
         etree_xml=etree.fromstring(self.current_task_xml)
-        min_score_to_attempt=int(etree_xml.attrib.get('min_score_to_attempt',0))
-        max_score_to_attempt=int(etree_xml.attrib.get('min_score_to_attempt',self._max_score))
+
         if self.current_task_number>0:
-            last_response_data=self.get_last_response(self.current_task_number-1)
+            allow_reset=self.check_allow_reset()
+            if allow_reset:
+                return False
 
         self.current_task_parsed_xml=self.current_task_descriptor.definition_from_xml(etree_xml,self.system)
         if current_task_state is None and self.current_task_number==0:
@@ -172,6 +173,17 @@ class CombinedOpenEndedModule(XModule):
 
         return True
 
+    def check_allow_reset(self):
+        allow_reset=False
+        if self.current_task_number>0:
+            last_response_data=self.get_last_response(self.current_task_number-1)
+            current_response_data=self.get_last_response(self.current_task_number)
+
+        if current_response_data['min_score_to_attempt']>last_response_data['score'] or current_response_data['max_score_to_attempt']<last_response_data['score']:
+            allow_reset=True
+
+        return allow_rest
+
     def get_context(self):
         task_html=self.get_html_base()
         #set context variables and render template
@@ -179,7 +191,7 @@ class CombinedOpenEndedModule(XModule):
         context = {
             'items': [{'content' : task_html}],
             'ajax_url': self.system.ajax_url,
-            'allow_reset': True,
+            'allow_reset': self.check_allow_reset(),
             'state' : self.state,
             'task_count' : len(self.task_xml),
             'task_number' : self.current_task_number+1,
@@ -210,10 +222,17 @@ class CombinedOpenEndedModule(XModule):
         task_xml=self.task_xml[task_number]
         task_type=self.get_tag_name(task_xml)
 
+
+
         children=self.child_modules()
 
         task_descriptor=children['descriptors'][task_type](self.system)
-        task_parsed_xml=task_descriptor.definition_from_xml(etree.fromstring(task_xml),self.system)
+        etree_xml=etree.fromstring(task_xml)
+
+        min_score_to_attempt=int(etree_xml.attrib.get('min_score_to_attempt',0))
+        max_score_to_attempt=int(etree_xml.attrib.get('min_score_to_attempt',self._max_score))
+
+        task_parsed_xml=task_descriptor.definition_from_xml(etree_xml,self.system)
         task=children['modules'][task_type](self.system, self.location, task_parsed_xml, task_descriptor, self.static_data, instance_state=task_state)
         last_response=task.latest_answer()
         last_score = task.latest_score()
@@ -234,7 +253,9 @@ class CombinedOpenEndedModule(XModule):
             'max_score' : max_score,
             'state' : state,
             'human_state' : task.HUMAN_NAMES[state],
-            'correct' : last_correctness
+            'correct' : last_correctness,
+            'min_score_to_attempt' : min_score_to_attempt,
+            'max_score_to_attempt' : max_score_to_attempt,
         }
 
         return last_response_dict
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 0e285dce25..0d420a8514 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -76,9 +76,15 @@ class @CombinedOpenEnded
     @reset_button.hide()
     @next_problem_button.hide()
     @hint_area.attr('disabled', false)
+
     if @child_type=="openended"
       @skip_button.hide()
-    if @child_state == 'initial'
+    if @allow_reset
+      @reset_button.show()
+      @submit_button.hide()
+      @answer_area.attr("disabled", true)
+      @hint_area.attr('disabled', true)
+    else if @child_state == 'initial'
       @answer_area.attr("disabled", false)
       @submit_button.prop('value', 'Submit')
       @submit_button.click @save_answer
@@ -145,7 +151,6 @@ class @CombinedOpenEnded
             @find_hint_elements()
           else if @child_state == 'done'
             @message_wrapper.html(response.message_html)
-            @allow_reset = response.allow_reset
 
           @rebind()
         else
@@ -162,7 +167,6 @@ class @CombinedOpenEnded
         if response.success
           @message_wrapper.html(response.message_html)
           @child_state = 'done'
-          @allow_reset = response.allow_reset
           @rebind()
         else
           @errors_area.html(response.error)
@@ -175,7 +179,6 @@ class @CombinedOpenEnded
       $.postWithPrefix "#{@ajax_url}/skip_post_assessment", {}, (response) =>
         if response.success
           @child_state = 'done'
-          @allow_reset = response.allow_reset
           @rebind()
         else
           @errors_area.html(response.error)
diff --git a/common/lib/xmodule/xmodule/openendedchild.py b/common/lib/xmodule/xmodule/openendedchild.py
index 4a81703919..304271c620 100644
--- a/common/lib/xmodule/xmodule/openendedchild.py
+++ b/common/lib/xmodule/xmodule/openendedchild.py
@@ -200,7 +200,7 @@ class OpenEndedChild():
 
     def _allow_reset(self):
         """Can the module be reset?"""
-        return self.state == self.DONE and self.attempts < self.max_attempts
+        return (self.state == self.DONE and self.attempts < self.max_attempts)
 
     def max_score(self):
         """

From b13f94798fd3ff5fe37c5c509a9b94c78de671f1 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Tue, 8 Jan 2013 17:02:56 -0500
Subject: [PATCH 169/541] Add in allow reset action

---
 .../xmodule/combined_open_ended_module.py     | 39 ++++++++++++-------
 .../js/src/combinedopenended/display.coffee   |  2 +-
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index d31da49978..f9c610d51a 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -88,6 +88,7 @@ class CombinedOpenEndedModule(XModule):
         self.state = instance_state.get('state', 'initial')
 
         self.attempts = instance_state.get('attempts', 0)
+        self.allow_reset = instance_state.get('ready_to_reset', False)
         self.max_attempts = int(self.metadata.get('attempts', MAX_ATTEMPTS))
 
         # Used for progress / grading.  Currently get credit just for
@@ -149,8 +150,8 @@ class CombinedOpenEndedModule(XModule):
         etree_xml=etree.fromstring(self.current_task_xml)
 
         if self.current_task_number>0:
-            allow_reset=self.check_allow_reset()
-            if allow_reset:
+            self.allow_reset=self.check_allow_reset()
+            if self.allow_reset:
                 return False
 
         self.current_task_parsed_xml=self.current_task_descriptor.definition_from_xml(etree_xml,self.system)
@@ -174,15 +175,15 @@ class CombinedOpenEndedModule(XModule):
         return True
 
     def check_allow_reset(self):
-        allow_reset=False
         if self.current_task_number>0:
             last_response_data=self.get_last_response(self.current_task_number-1)
-            current_response_data=self.get_last_response(self.current_task_number)
+            current_response_data=self.get_current_attributes(self.current_task_number)
 
-        if current_response_data['min_score_to_attempt']>last_response_data['score'] or current_response_data['max_score_to_attempt']<last_response_data['score']:
-            allow_reset=True
+            if current_response_data['min_score_to_attempt']>last_response_data['score'] or current_response_data['max_score_to_attempt']<last_response_data['score']:
+                self.state=self.DONE
+                self.allow_reset=True
 
-        return allow_rest
+        return self.allow_reset
 
     def get_context(self):
         task_html=self.get_html_base()
@@ -191,7 +192,7 @@ class CombinedOpenEndedModule(XModule):
         context = {
             'items': [{'content' : task_html}],
             'ajax_url': self.system.ajax_url,
-            'allow_reset': self.check_allow_reset(),
+            'allow_reset': self.allow_reset,
             'state' : self.state,
             'task_count' : len(self.task_xml),
             'task_number' : self.current_task_number+1,
@@ -216,21 +217,26 @@ class CombinedOpenEndedModule(XModule):
         return_html = rewrite_links(html, self.rewrite_content_links)
         return return_html
 
+    def get_current_attributes(self, task_number):
+        task_xml=self.task_xml[task_number]
+        etree_xml=etree.fromstring(task_xml)
+        min_score_to_attempt=int(etree_xml.attrib.get('min_score_to_attempt',0))
+        max_score_to_attempt=int(etree_xml.attrib.get('max_score_to_attempt',self._max_score))
+        return {'min_score_to_attempt' : min_score_to_attempt, 'max_score_to_attempt' : max_score_to_attempt}
+
     def get_last_response(self, task_number):
         last_response=""
         task_state = self.task_states[task_number]
         task_xml=self.task_xml[task_number]
         task_type=self.get_tag_name(task_xml)
 
-
-
         children=self.child_modules()
 
         task_descriptor=children['descriptors'][task_type](self.system)
         etree_xml=etree.fromstring(task_xml)
 
         min_score_to_attempt=int(etree_xml.attrib.get('min_score_to_attempt',0))
-        max_score_to_attempt=int(etree_xml.attrib.get('min_score_to_attempt',self._max_score))
+        max_score_to_attempt=int(etree_xml.attrib.get('max_score_to_attempt',self._max_score))
 
         task_parsed_xml=task_descriptor.definition_from_xml(etree_xml,self.system)
         task=children['modules'][task_type](self.system, self.location, task_parsed_xml, task_descriptor, self.static_data, instance_state=task_state)
@@ -262,9 +268,12 @@ class CombinedOpenEndedModule(XModule):
 
     def update_task_states(self):
         changed=False
-        self.task_states[self.current_task_number] = self.current_task.get_instance_state()
-        current_task_state=json.loads(self.task_states[self.current_task_number])
-        if current_task_state['state']==self.DONE:
+        local_task_number=self.current_task_number
+        if self.allow_reset:
+            local_task_number=local_task_number-1
+        self.task_states[local_task_number] = self.current_task.get_instance_state()
+        current_task_state=json.loads(self.task_states[local_task_number])
+        if current_task_state['state']==self.DONE and not self.allow_reset:
             self.current_task_number+=1
             if self.current_task_number>=(len(self.task_xml)):
                 self.state=self.DONE
@@ -334,6 +343,7 @@ class CombinedOpenEndedModule(XModule):
                 'error': 'Too many attempts.'
             }
         self.state=self.INITIAL
+        self.allow_reset=False
         for i in xrange(0,len(self.task_xml)):
             self.current_task_number=i
             self.setup_next_task(reset=True)
@@ -354,6 +364,7 @@ class CombinedOpenEndedModule(XModule):
             'state': self.state,
             'task_states': self.task_states,
             'attempts': self.attempts,
+            'ready_to_reset' : self.allow_reset,
             }
 
         return json.dumps(state)
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 0d420a8514..3929ebe78a 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -79,7 +79,7 @@ class @CombinedOpenEnded
 
     if @child_type=="openended"
       @skip_button.hide()
-    if @allow_reset
+    if @allow_reset=="True"
       @reset_button.show()
       @submit_button.hide()
       @answer_area.attr("disabled", true)

From adcbfbb6035e748cf4b0cecaaf2e4fee3d563113 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Tue, 8 Jan 2013 18:00:46 -0500
Subject: [PATCH 170/541] Fix reset

---
 .../xmodule/combined_open_ended_module.py     | 55 ++++++++++---------
 .../js/src/combinedopenended/display.coffee   |  3 +-
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index f9c610d51a..3c756f6834 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -142,6 +142,12 @@ class CombinedOpenEndedModule(XModule):
             current_task_state=self.task_states[self.current_task_number]
 
         self.current_task_xml=self.task_xml[self.current_task_number]
+
+        if self.current_task_number>0:
+            self.allow_reset=self.check_allow_reset()
+            if self.allow_reset:
+                self.current_task_number=self.current_task_number-1
+
         current_task_type=self.get_tag_name(self.current_task_xml)
 
         children=self.child_modules()
@@ -149,11 +155,6 @@ class CombinedOpenEndedModule(XModule):
         self.current_task_descriptor=children['descriptors'][current_task_type](self.system)
         etree_xml=etree.fromstring(self.current_task_xml)
 
-        if self.current_task_number>0:
-            self.allow_reset=self.check_allow_reset()
-            if self.allow_reset:
-                return False
-
         self.current_task_parsed_xml=self.current_task_descriptor.definition_from_xml(etree_xml,self.system)
         if current_task_state is None and self.current_task_number==0:
             self.current_task=children['modules'][current_task_type](self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, self.static_data)
@@ -175,13 +176,14 @@ class CombinedOpenEndedModule(XModule):
         return True
 
     def check_allow_reset(self):
-        if self.current_task_number>0:
-            last_response_data=self.get_last_response(self.current_task_number-1)
-            current_response_data=self.get_current_attributes(self.current_task_number)
+        if not self.allow_reset:
+            if self.current_task_number>0:
+                last_response_data=self.get_last_response(self.current_task_number-1)
+                current_response_data=self.get_current_attributes(self.current_task_number)
 
-            if current_response_data['min_score_to_attempt']>last_response_data['score'] or current_response_data['max_score_to_attempt']<last_response_data['score']:
-                self.state=self.DONE
-                self.allow_reset=True
+                if current_response_data['min_score_to_attempt']>last_response_data['score'] or current_response_data['max_score_to_attempt']<last_response_data['score']:
+                    self.state=self.DONE
+                    self.allow_reset=True
 
         return self.allow_reset
 
@@ -198,6 +200,7 @@ class CombinedOpenEndedModule(XModule):
             'task_number' : self.current_task_number+1,
             'status' : self.get_status(),
             }
+        log.debug(context)
 
         return context
 
@@ -268,20 +271,18 @@ class CombinedOpenEndedModule(XModule):
 
     def update_task_states(self):
         changed=False
-        local_task_number=self.current_task_number
-        if self.allow_reset:
-            local_task_number=local_task_number-1
-        self.task_states[local_task_number] = self.current_task.get_instance_state()
-        current_task_state=json.loads(self.task_states[local_task_number])
-        if current_task_state['state']==self.DONE and not self.allow_reset:
-            self.current_task_number+=1
-            if self.current_task_number>=(len(self.task_xml)):
-                self.state=self.DONE
-                self.current_task_number=len(self.task_xml)-1
-            else:
-                self.state=self.INITIAL
-            changed=True
-            self.setup_next_task()
+        if not self.allow_reset:
+            self.task_states[self.current_task_number] = self.current_task.get_instance_state()
+            current_task_state=json.loads(self.task_states[self.current_task_number])
+            if current_task_state['state']==self.DONE:
+                self.current_task_number+=1
+                if self.current_task_number>=(len(self.task_xml)):
+                    self.state=self.DONE
+                    self.current_task_number=len(self.task_xml)-1
+                else:
+                    self.state=self.INITIAL
+                changed=True
+                self.setup_next_task()
         return changed
 
     def update_task_states_ajax(self,return_html):
@@ -335,7 +336,8 @@ class CombinedOpenEndedModule(XModule):
         (error only present if not success)
         """
         if self.state != self.DONE:
-            return self.out_of_sync_error(get)
+            if not self.allow_reset:
+                return self.out_of_sync_error(get)
 
         if self.attempts > self.max_attempts:
             return {
@@ -350,6 +352,7 @@ class CombinedOpenEndedModule(XModule):
             self.current_task.reset(self.system)
             self.task_states[self.current_task_number]=self.current_task.get_instance_state()
         self.current_task_number=0
+        self.allow_reset=False
         self.setup_next_task()
         return {'success': True, 'html' : self.get_html_nonsystem()}
 
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 3929ebe78a..a7e01e8a9b 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -187,7 +187,7 @@ class @CombinedOpenEnded
 
   reset: (event) =>
     event.preventDefault()
-    if @child_state == 'done'
+    if @child_state == 'done' or @allow_reset=="True"
       $.postWithPrefix "#{@ajax_url}/reset", {}, (response) =>
         if response.success
           @answer_area.val('')
@@ -196,6 +196,7 @@ class @CombinedOpenEnded
           @message_wrapper.html('')
           @child_state = 'initial'
           @combined_open_ended.after(response.html).remove()
+          @allow_reset="False"
           @reinitialize(@element)
           @rebind()
           @reset_button.hide()

From bc97a507e047cb8fca8626b303e1507fa57ae930 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Tue, 8 Jan 2013 18:05:01 -0500
Subject: [PATCH 171/541] Next step logic

---
 common/lib/xmodule/xmodule/combined_open_ended_module.py     | 2 +-
 .../xmodule/xmodule/js/src/combinedopenended/display.coffee  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 3c756f6834..ee36690b1c 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -326,7 +326,7 @@ class CombinedOpenEndedModule(XModule):
 
     def next_problem(self, get):
         self.update_task_states()
-        return {'success' : True, 'html' : self.get_html_nonsystem()}
+        return {'success' : True, 'html' : self.get_html_nonsystem(), 'allow_reset' : self.allow_reset}
 
     def reset(self, get):
         """
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index a7e01e8a9b..682ba983bd 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -218,7 +218,10 @@ class @CombinedOpenEnded
           @reinitialize(@element)
           @rebind()
           @next_problem_button.hide()
-          @gentle_alert "Moved to next step."
+          if response.allow_reset=="False"
+            @gentle_alert "Moved to next step."
+          else
+            @gentle_alert "Your score did not meet the criteria to move to the next step."
         else
           @errors_area.html(response.error)
     else

From 38a81b461f413d8a7e4cc00a7793d0de8d8b6894 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Tue, 8 Jan 2013 18:33:41 -0500
Subject: [PATCH 172/541] Remove open ended grading stuff, fix JS variable

---
 common/lib/capa/capa/inputtypes.py            |  48 --
 common/lib/capa/capa/responsetypes.py         | 433 +-----------------
 .../xmodule/js/src/capa/display.coffee        |  30 --
 .../js/src/combinedopenended/display.coffee   |   2 +-
 .../lib/xmodule/xmodule/open_ended_module.py  |   2 +-
 5 files changed, 3 insertions(+), 512 deletions(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index e3eb47acc5..1d3646fefc 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -735,51 +735,3 @@ class ChemicalEquationInput(InputTypeBase):
 registry.register(ChemicalEquationInput)
 
 #-----------------------------------------------------------------------------
-
-class OpenEndedInput(InputTypeBase):
-    """
-    A text area input for code--uses codemirror, does syntax highlighting, special tab handling,
-    etc.
-    """
-
-    template = "openendedinput.html"
-    tags = ['openendedinput']
-
-    # pulled out for testing
-    submitted_msg = ("Feedback not yet available.  Reload to check again. "
-                     "Once the problem is graded, this message will be "
-                     "replaced with the grader's feedback.")
-
-    @classmethod
-    def get_attributes(cls):
-        """
-        Convert options to a convenient format.
-        """
-        return [Attribute('rows', '30'),
-                Attribute('cols', '80'),
-                Attribute('hidden', ''),
-                ]
-
-    def setup(self):
-        """
-        Implement special logic: handle queueing state, and default input.
-        """
-        # if no student input yet, then use the default input given by the problem
-        if not self.value:
-            self.value = self.xml.text
-
-        # Check if problem has been queued
-        self.queue_len = 0
-        # Flag indicating that the problem has been queued, 'msg' is length of queue
-        if self.status == 'incomplete':
-            self.status = 'queued'
-            self.queue_len = self.msg
-            self.msg = self.submitted_msg
-
-    def _extra_context(self):
-        """Defined queue_len, add it """
-        return {'queue_len': self.queue_len,}
-
-registry.register(OpenEndedInput)
-
-#-----------------------------------------------------------------------------
diff --git a/common/lib/capa/capa/responsetypes.py b/common/lib/capa/capa/responsetypes.py
index 1bc34b70a3..3d97cb0bea 100644
--- a/common/lib/capa/capa/responsetypes.py
+++ b/common/lib/capa/capa/responsetypes.py
@@ -1815,436 +1815,6 @@ class ImageResponse(LoncapaResponse):
         return (dict([(ie.get('id'), ie.get('rectangle')) for ie in self.ielements]),
                 dict([(ie.get('id'), ie.get('regions')) for ie in self.ielements]))
 #-----------------------------------------------------------------------------
-
-class OpenEndedResponse(LoncapaResponse):
-    """
-    Grade student open ended responses using an external grading system,
-    accessed through the xqueue system.
-
-    Expects 'xqueue' dict in ModuleSystem with the following keys that are
-    needed by OpenEndedResponse:
-
-        system.xqueue = { 'interface': XqueueInterface object,
-                          'callback_url': Per-StudentModule callback URL
-                                          where results are posted (string),
-                        }
-
-    External requests are only submitted for student submission grading
-        (i.e. and not for getting reference answers)
-
-    By default, uses the OpenEndedResponse.DEFAULT_QUEUE queue.
-    """
-
-    DEFAULT_QUEUE = 'open-ended'
-    DEFAULT_MESSAGE_QUEUE = 'open-ended-message'
-    response_tag = 'openendedresponse'
-    allowed_inputfields = ['openendedinput']
-    max_inputfields = 1
-
-    def setup_response(self):
-        '''
-        Configure OpenEndedResponse from XML.
-        '''
-        xml = self.xml
-        self.url = xml.get('url', None)
-        self.queue_name = xml.get('queuename', self.DEFAULT_QUEUE)
-        self.message_queue_name = xml.get('message-queuename', self.DEFAULT_MESSAGE_QUEUE)
-
-        # The openendedparam tag encapsulates all grader settings
-        oeparam = self.xml.find('openendedparam')
-        prompt = self.xml.find('prompt')
-        rubric = self.xml.find('openendedrubric')
-
-        #This is needed to attach feedback to specific responses later
-        self.submission_id=None
-        self.grader_id=None
-
-        if oeparam is None:
-            raise ValueError("No oeparam found in problem xml.")
-        if prompt is None:
-            raise ValueError("No prompt found in problem xml.")
-        if rubric is None:
-            raise ValueError("No rubric found in problem xml.")
-
-        self._parse(oeparam, prompt, rubric)
-
-    @staticmethod
-    def stringify_children(node):
-        """
-        Modify code from stringify_children in xmodule.  Didn't import directly
-        in order to avoid capa depending on xmodule (seems to be avoided in
-        code)
-        """
-        parts=[node.text if node.text is not None else '']
-        for p in node.getchildren():
-            parts.append(etree.tostring(p, with_tail=True, encoding='unicode'))
-
-        return ' '.join(parts)
-
-    def _parse(self, oeparam, prompt, rubric):
-        '''
-        Parse OpenEndedResponse XML:
-            self.initial_display
-            self.payload - dict containing keys --
-            'grader' : path to grader settings file, 'problem_id' : id of the problem
-
-            self.answer - What to display when show answer is clicked
-        '''
-        # Note that OpenEndedResponse is agnostic to the specific contents of grader_payload
-        prompt_string = self.stringify_children(prompt)
-        rubric_string = self.stringify_children(rubric)
-
-        grader_payload = oeparam.find('grader_payload')
-        grader_payload = grader_payload.text if grader_payload is not None else ''
-
-        #Update grader payload with student id.  If grader payload not json, error.
-        try:
-            parsed_grader_payload = json.loads(grader_payload)
-            # NOTE: self.system.location is valid because the capa_module
-            # __init__ adds it (easiest way to get problem location into
-            # response types)
-        except TypeError, ValueError:
-            log.exception("Grader payload %r is not a json object!", grader_payload)
-
-        self.initial_display = find_with_default(oeparam, 'initial_display', '')
-        self.answer = find_with_default(oeparam, 'answer_display', 'No answer given.')
-
-        parsed_grader_payload.update({
-            'location' : self.system.location,
-            'course_id' : self.system.course_id,
-            'prompt' : prompt_string,
-            'rubric' : rubric_string,
-            'initial_display' : self.initial_display,
-            'answer' : self.answer,
-            })
-        updated_grader_payload = json.dumps(parsed_grader_payload)
-
-        self.payload = {'grader_payload': updated_grader_payload}
-
-        try:
-            self.max_score = int(find_with_default(oeparam, 'max_score', 1))
-        except ValueError:
-            self.max_score = 1
-
-    def handle_message_post(self,event_info):
-        """
-        Handles a student message post (a reaction to the grade they received from an open ended grader type)
-        Returns a boolean success/fail and an error message
-        """
-        survey_responses=event_info['survey_responses']
-        for tag in ['feedback', 'submission_id', 'grader_id', 'score']:
-            if tag not in survey_responses:
-                return False, "Could not find needed tag {0}".format(tag)
-        try:
-            submission_id=int(survey_responses['submission_id'])
-            grader_id = int(survey_responses['grader_id'])
-            feedback = str(survey_responses['feedback'].encode('ascii', 'ignore'))
-            score = int(survey_responses['score'])
-        except:
-            error_message=("Could not parse submission id, grader id, "
-                           "or feedback from message_post ajax call.  Here is the message data: {0}".format(survey_responses))
-            log.exception(error_message)
-            return False, "There was an error saving your feedback.  Please contact course staff."
-
-        qinterface = self.system.xqueue['interface']
-        qtime = datetime.strftime(datetime.now(), xqueue_interface.dateformat)
-        anonymous_student_id = self.system.anonymous_student_id
-        queuekey = xqueue_interface.make_hashkey(str(self.system.seed) + qtime +
-                                                 anonymous_student_id +
-                                                 self.answer_id)
-
-        xheader = xqueue_interface.make_xheader(
-            lms_callback_url=self.system.xqueue['callback_url'],
-            lms_key=queuekey,
-            queue_name=self.message_queue_name
-        )
-
-        student_info = {'anonymous_student_id': anonymous_student_id,
-                        'submission_time': qtime,
-                        }
-        contents= {
-            'feedback' : feedback,
-            'submission_id' : submission_id,
-            'grader_id' : grader_id,
-            'score': score,
-            'student_info' : json.dumps(student_info),
-        }
-
-        (error, msg) = qinterface.send_to_queue(header=xheader,
-            body=json.dumps(contents))
-
-        #Convert error to a success value
-        success=True
-        if error:
-            success=False
-
-        return success, "Successfully submitted your feedback."
-
-    def get_score(self, student_answers):
-
-        try:
-            submission = student_answers[self.answer_id]
-        except KeyError:
-            msg = ('Cannot get student answer for answer_id: {0}. student_answers {1}'
-                   .format(self.answer_id, student_answers))
-            log.exception(msg)
-            raise LoncapaProblemError(msg)
-
-        # Prepare xqueue request
-        #------------------------------------------------------------
-
-        qinterface = self.system.xqueue['interface']
-        qtime = datetime.strftime(datetime.now(), xqueue_interface.dateformat)
-
-        anonymous_student_id = self.system.anonymous_student_id
-
-        # Generate header
-        queuekey = xqueue_interface.make_hashkey(str(self.system.seed) + qtime +
-                                                 anonymous_student_id +
-                                                 self.answer_id)
-
-        xheader = xqueue_interface.make_xheader(lms_callback_url=self.system.xqueue['callback_url'],
-            lms_key=queuekey,
-            queue_name=self.queue_name)
-
-        self.context.update({'submission': submission})
-
-        contents = self.payload.copy()
-
-        # Metadata related to the student submission revealed to the external grader
-        student_info = {'anonymous_student_id': anonymous_student_id,
-                        'submission_time': qtime,
-                        }
-
-        #Update contents with student response and student info
-        contents.update({
-            'student_info': json.dumps(student_info),
-            'student_response': submission,
-            'max_score' : self.max_score,
-            })
-
-        # Submit request. When successful, 'msg' is the prior length of the queue
-        (error, msg) = qinterface.send_to_queue(header=xheader,
-            body=json.dumps(contents))
-
-        # State associated with the queueing request
-        queuestate = {'key': queuekey,
-                      'time': qtime,}
-
-        cmap = CorrectMap()
-        if error:
-            cmap.set(self.answer_id, queuestate=None,
-                msg='Unable to deliver your submission to grader. (Reason: {0}.)'
-                    ' Please try again later.'.format(msg))
-        else:
-            # Queueing mechanism flags:
-            #   1) Backend: Non-null CorrectMap['queuestate'] indicates that
-            #      the problem has been queued
-            #   2) Frontend: correctness='incomplete' eventually trickles down
-            #      through inputtypes.textbox and .filesubmission to inform the
-            #      browser that the submission is queued (and it could e.g. poll)
-            cmap.set(self.answer_id, queuestate=queuestate,
-                     correctness='incomplete', msg=msg)
-
-        return cmap
-
-    def update_score(self, score_msg, oldcmap, queuekey):
-        log.debug(score_msg)
-        score_msg = self._parse_score_msg(score_msg)
-        if not score_msg.valid:
-            oldcmap.set(self.answer_id,
-                msg = 'Invalid grader reply. Please contact the course staff.')
-            return oldcmap
-
-        correctness = 'correct' if score_msg.correct else 'incorrect'
-
-        # TODO: Find out how this is used elsewhere, if any
-        self.context['correct'] = correctness
-
-        # Replace 'oldcmap' with new grading results if queuekey matches.  If queuekey
-        # does not match, we keep waiting for the score_msg whose key actually matches
-        if oldcmap.is_right_queuekey(self.answer_id, queuekey):
-            # Sanity check on returned points
-            points = score_msg.points
-            if points < 0:
-                points = 0
-
-            # Queuestate is consumed, so reset it to None
-            oldcmap.set(self.answer_id, npoints=points, correctness=correctness,
-                msg = score_msg.msg.replace('&nbsp;', '&#160;'), queuestate=None)
-        else:
-            log.debug('OpenEndedResponse: queuekey {0} does not match for answer_id={1}.'.format(
-                queuekey, self.answer_id))
-
-        return oldcmap
-
-    def get_answers(self):
-        anshtml = '<span class="openended-answer"><pre><code>{0}</code></pre></span>'.format(self.answer)
-        return {self.answer_id: anshtml}
-
-    def get_initial_display(self):
-        return {self.answer_id: self.initial_display}
-
-    def _convert_longform_feedback_to_html(self, response_items):
-        """
-        Take in a dictionary, and return html strings for display to student.
-        Input:
-            response_items: Dictionary with keys success, feedback.
-                if success is True, feedback should be a dictionary, with keys for
-                   types of feedback, and the corresponding feedback values.
-                if success is False, feedback is actually an error string.
-
-                NOTE: this will need to change when we integrate peer grading, because
-                that will have more complex feedback.
-
-        Output:
-            String -- html that can be displayed to the student.
-        """
-
-        # We want to display available feedback in a particular order.
-        # This dictionary specifies which goes first--lower first.
-        priorities = {# These go at the start of the feedback
-                      'spelling': 0,
-                      'grammar': 1,
-                      # needs to be after all the other feedback
-                      'markup_text': 3}
-
-        default_priority = 2
-
-        def get_priority(elt):
-            """
-            Args:
-                elt: a tuple of feedback-type, feedback
-            Returns:
-                the priority for this feedback type
-            """
-            return priorities.get(elt[0], default_priority)
-
-        def encode_values(feedback_type,value):
-            feedback_type=str(feedback_type).encode('ascii', 'ignore')
-            if not isinstance(value,basestring):
-                value=str(value)
-            value=value.encode('ascii', 'ignore')
-            return feedback_type,value
-
-        def format_feedback(feedback_type, value):
-            feedback_type,value=encode_values(feedback_type,value)
-            feedback= """
-            <div class="{feedback_type}">
-            {value}
-            </div>
-            """.format(feedback_type=feedback_type, value=value)
-            return feedback
-
-        def format_feedback_hidden(feedback_type , value):
-            feedback_type,value=encode_values(feedback_type,value)
-            feedback = """
-            <div class="{feedback_type}" style="display: none;">
-            {value}
-            </div>
-            """.format(feedback_type=feedback_type, value=value)
-            return feedback
-
-        # TODO (vshnayder): design and document the details of this format so
-        # that we can do proper escaping here (e.g. are the graders allowed to
-        # include HTML?)
-
-        for tag in ['success', 'feedback', 'submission_id', 'grader_id']:
-            if tag not in response_items:
-                return format_feedback('errors', 'Error getting feedback')
-
-        feedback_items = response_items['feedback']
-        try:
-            feedback = json.loads(feedback_items)
-        except (TypeError, ValueError):
-            log.exception("feedback_items have invalid json %r", feedback_items)
-            return format_feedback('errors', 'Could not parse feedback')
-
-        if response_items['success']:
-            if len(feedback) == 0:
-                return format_feedback('errors', 'No feedback available')
-
-            feedback_lst = sorted(feedback.items(), key=get_priority)
-            feedback_list_part1 = u"\n".join(format_feedback(k, v) for k, v in feedback_lst)
-        else:
-            feedback_list_part1 = format_feedback('errors', response_items['feedback'])
-
-        feedback_list_part2=(u"\n".join([format_feedback_hidden(feedback_type,value)
-                                         for feedback_type,value in response_items.items()
-                                         if feedback_type in ['submission_id', 'grader_id']]))
-
-        return u"\n".join([feedback_list_part1,feedback_list_part2])
-
-    def _format_feedback(self, response_items):
-        """
-        Input:
-            Dictionary called feedback.  Must contain keys seen below.
-        Output:
-            Return error message or feedback template
-        """
-
-        feedback = self._convert_longform_feedback_to_html(response_items)
-
-        if not response_items['success']:
-            return self.system.render_template("open_ended_error.html",
-                                               {'errors' : feedback})
-
-        feedback_template = self.system.render_template("open_ended_feedback.html", {
-            'grader_type': response_items['grader_type'],
-            'score': "{0} / {1}".format(response_items['score'], self.max_score),
-            'feedback': feedback,
-        })
-
-        return feedback_template
-
-
-    def _parse_score_msg(self, score_msg):
-        """
-         Grader reply is a JSON-dump of the following dict
-           { 'correct': True/False,
-             'score': Numeric value (floating point is okay) to assign to answer
-             'msg': grader_msg
-             'feedback' : feedback from grader
-             }
-
-        Returns (valid_score_msg, correct, score, msg):
-            valid_score_msg: Flag indicating valid score_msg format (Boolean)
-            correct:         Correctness of submission (Boolean)
-            score:           Points to be assigned (numeric, can be float)
-        """
-        fail = ScoreMessage(valid=False, correct=False, points=0, msg='')
-        try:
-            score_result = json.loads(score_msg)
-        except (TypeError, ValueError):
-            log.error("External grader message should be a JSON-serialized dict."
-                      " Received score_msg = {0}".format(score_msg))
-            return fail
-
-        if not isinstance(score_result, dict):
-            log.error("External grader message should be a JSON-serialized dict."
-                      " Received score_result = {0}".format(score_result))
-            return fail
-
-        for tag in ['score', 'feedback', 'grader_type', 'success', 'grader_id', 'submission_id']:
-            if tag not in score_result:
-                log.error("External grader message is missing required tag: {0}"
-                          .format(tag))
-                return fail
-
-        feedback = self._format_feedback(score_result)
-        self.submission_id=score_result['submission_id']
-        self.grader_id=score_result['grader_id']
-
-        # HACK: for now, just assume it's correct if you got more than 2/3.
-        # Also assumes that score_result['score'] is an integer.
-        score_ratio = int(score_result['score']) / float(self.max_score)
-        correct = (score_ratio >= 0.66)
-
-        #Currently ignore msg and only return feedback (which takes the place of msg)
-        return ScoreMessage(valid=True, correct=correct,
-                            points=score_result['score'], msg=feedback)
-
-#-----------------------------------------------------------------------------
 # TEMPORARY: List of all response subclasses
 # FIXME: To be replaced by auto-registration
 
@@ -2261,5 +1831,4 @@ __all__ = [CodeResponse,
            ChoiceResponse,
            MultipleChoiceResponse,
            TrueFalseResponse,
-           JavascriptResponse,
-           OpenEndedResponse]
+           JavascriptResponse]
diff --git a/common/lib/xmodule/xmodule/js/src/capa/display.coffee b/common/lib/xmodule/xmodule/js/src/capa/display.coffee
index ba746fecb8..1c0ace9e59 100644
--- a/common/lib/xmodule/xmodule/js/src/capa/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/capa/display.coffee
@@ -25,7 +25,6 @@ class @Problem
     @$('section.action input.reset').click @reset
     @$('section.action input.show').click @show
     @$('section.action input.save').click @save
-    @$('section.evaluation input.submit-message').click @message_post
 
     # Collapsibles
     Collapsible.setCollapsibles(@el)
@@ -198,35 +197,6 @@ class @Problem
         else
           @gentle_alert response.success
 
-  message_post: =>
-    Logger.log 'message_post', @answers
-
-    fd = new FormData()
-    feedback = @$('section.evaluation textarea.feedback-on-feedback')[0].value
-    submission_id = $('div.external-grader-message div.submission_id')[0].innerHTML
-    grader_id = $('div.external-grader-message div.grader_id')[0].innerHTML
-    score = $(".evaluation-scoring input:radio[name='evaluation-score']:checked").val()
-    fd.append('feedback', feedback)
-    fd.append('submission_id', submission_id)
-    fd.append('grader_id', grader_id)
-    if(!score)
-      @gentle_alert "You need to pick a rating before you can submit."
-      return
-    else
-      fd.append('score', score)
-
-
-    settings =
-      type: "POST"
-      data: fd
-      processData: false
-      contentType: false
-      success: (response) =>
-        @gentle_alert response.message
-        @$('section.evaluation').slideToggle()
-
-    $.ajaxWithPrefix("#{@url}/message_post", settings)
-
   reset: =>
     Logger.log 'problem_reset', @answers
     $.postWithPrefix "#{@url}/problem_reset", id: @id, (response) =>
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 682ba983bd..8a5ef42270 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -218,7 +218,7 @@ class @CombinedOpenEnded
           @reinitialize(@element)
           @rebind()
           @next_problem_button.hide()
-          if response.allow_reset=="False"
+          if !response.allow_reset
             @gentle_alert "Moved to next step."
           else
             @gentle_alert "Your score did not meet the criteria to move to the next step."
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 0e16156f1a..024422773d 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -245,7 +245,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
                 that will have more complex feedback.
 
         Output:
-            String -- html that can be displayed to the student.
+            String -- html that can be displayincorrect-icon.pnged to the student.
         """
 
         # We want to display available feedback in a particular order.

From 2f841c8a334d329ea5d281668d714abd21c4d8d1 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Tue, 8 Jan 2013 18:55:28 -0500
Subject: [PATCH 173/541] Document combined open ended module

---
 .../xmodule/combined_open_ended_module.py     | 144 ++++++++++++++++--
 1 file changed, 128 insertions(+), 16 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index ee36690b1c..a639d6997a 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -36,6 +36,10 @@ MAX_ATTEMPTS = 10000
 MAX_SCORE = 1
 
 class CombinedOpenEndedModule(XModule):
+    """
+    This is a module that encapsulates all open ended grading (self assessment, peer assessment, etc).
+    It transitions between problems, and support arbitrary ordering.
+    """
     STATE_VERSION = 1
 
     # states
@@ -59,16 +63,37 @@ class CombinedOpenEndedModule(XModule):
             instance_state, shared_state, **kwargs)
 
         """
-        Definition file should have multiple task blocks:
+        Definition file should have one or many task blocks, a rubric block, and a prompt block:
 
         Sample file:
-
-        <combinedopenended max_score="1" attempts="1">
-            <task type="self">
+        <combinedopenended attempts="10000" max_score="1">
+            <rubric>
+                Blah blah rubric.
+            </rubric>
+            <prompt>
+                Some prompt.
+            </prompt>
+            <task>
                 <selfassessment>
+                    <hintprompt>
+                        What hint about this problem would you give to someone?
+                    </hintprompt>
+                    <submitmessage>
+                        Save Succcesful.  Thanks for participating!
+                    </submitmessage>
                 </selfassessment>
             </task>
+            <task>
+                <openended min_score_to_attempt="1" max_score_to_attempt="1">
+                        <openendedparam>
+                            <initial_display>Enter essay here.</initial_display>
+                            <answer_display>This is the answer.</answer_display>
+                            <grader_payload>{"grader_settings" : "ml_grading.conf", "problem_id" : "6.002x/Welcome/OETest"}</grader_payload>
+                        </openendedparam>
+                </openended>
+            </task>
         </combinedopenended>
+
         """
 
         # Load instance state
@@ -77,17 +102,19 @@ class CombinedOpenEndedModule(XModule):
         else:
             instance_state = {}
 
-        # History is a list of tuples of (answer, score, hint), where hint may be
-        # None for any element, and score and hint can be None for the last (current)
-        # element.
-        # Scores are on scale from 0 to max_score
+        #We need to set the location here so the child modules can use it
         system.set('location', location)
-        self.current_task_number = instance_state.get('current_task_number', 0)
-        self.task_states= instance_state.get('task_states', [])
 
+        #Tells the system which xml definition to load
+        self.current_task_number = instance_state.get('current_task_number', 0)
+        #This loads the states of the individual children
+        self.task_states= instance_state.get('task_states', [])
+        #Overall state of the combined open ended module
         self.state = instance_state.get('state', 'initial')
 
         self.attempts = instance_state.get('attempts', 0)
+
+        #Allow reset is true if student has failed the criteria to move to the next child task
         self.allow_reset = instance_state.get('ready_to_reset', False)
         self.max_attempts = int(self.metadata.get('attempts', MAX_ATTEMPTS))
 
@@ -95,6 +122,7 @@ class CombinedOpenEndedModule(XModule):
         # completion (doesn't matter if you self-assessed correct/incorrect).
         self._max_score = int(self.metadata.get('max_score', MAX_SCORE))
 
+        #Static data is passed to the child modules to render
         self.static_data = {
             'max_score' : self._max_score,
             'max_attempts' : self.max_attempts,
@@ -106,10 +134,21 @@ class CombinedOpenEndedModule(XModule):
         self.setup_next_task()
 
     def get_tag_name(self, xml):
+        """
+        Gets the tag name of a given xml block.
+        Input: XML string
+        Output: The name of the root tag
+        """
         tag=etree.fromstring(xml).tag
         return tag
 
     def overwrite_state(self, current_task_state):
+        """
+        Overwrites an instance state and sets the latest response to the current response.  This is used
+        to ensure that the student response is carried over from the first child to the rest.
+        Input: Task state json string
+        Output: Task state json string
+        """
         last_response_data=self.get_last_response(self.current_task_number-1)
         last_response = last_response_data['response']
 
@@ -122,6 +161,12 @@ class CombinedOpenEndedModule(XModule):
         return current_task_state
 
     def child_modules(self):
+        """
+        Returns the functions associated with the child modules in a dictionary.  This makes writing functions
+        simpler (saves code duplication)
+        Input: None
+        Output: A dictionary of dictionaries containing the descriptor functions and module functions
+        """
         child_modules={
             'openended' : open_ended_module.OpenEndedModule,
             'selfassessment' : self_assessment_module.SelfAssessmentModule,
@@ -137,6 +182,12 @@ class CombinedOpenEndedModule(XModule):
         return children
 
     def setup_next_task(self, reset=False):
+        """
+        Sets up the next task for the module.  Creates an instance state if none exists, carries over the answer
+        from the last instance state to the next if needed.
+        Input: A boolean indicating whether or not the reset function is calling.
+        Output: Boolean True (not useful right now)
+        """
         current_task_state=None
         if len(self.task_states)>self.current_task_number:
             current_task_state=self.task_states[self.current_task_number]
@@ -176,6 +227,12 @@ class CombinedOpenEndedModule(XModule):
         return True
 
     def check_allow_reset(self):
+        """
+        Checks to see if the student has passed the criteria to move to the next module.  If not, sets
+        allow_reset to true and halts the student progress through the tasks.
+        Input: None
+        Output: the allow_reset attribute of the current module.
+        """
         if not self.allow_reset:
             if self.current_task_number>0:
                 last_response_data=self.get_last_response(self.current_task_number-1)
@@ -188,6 +245,11 @@ class CombinedOpenEndedModule(XModule):
         return self.allow_reset
 
     def get_context(self):
+        """
+        Generates a context dictionary that is used to render html.
+        Input: None
+        Output: A dictionary that can be rendered into the combined open ended template.
+        """
         task_html=self.get_html_base()
         #set context variables and render template
 
@@ -200,27 +262,47 @@ class CombinedOpenEndedModule(XModule):
             'task_number' : self.current_task_number+1,
             'status' : self.get_status(),
             }
-        log.debug(context)
 
         return context
 
     def get_html(self):
+        """
+        Gets HTML for rendering.
+        Input: None
+        Output: rendered html
+        """
         context=self.get_context()
         html = self.system.render_template('combined_open_ended.html', context)
         return html
 
     def get_html_nonsystem(self):
+        """
+        Gets HTML for rendering via AJAX.  Does not use system, because system contains some additional
+        html, which is not appropriate for returning via ajax calls.
+        Input: None
+        Output: HTML rendered directly via Mako
+        """
         context=self.get_context()
         html = render_to_string('combined_open_ended.html', context)
         return html
 
     def get_html_base(self):
+        """
+        Gets the HTML associated with the current child task
+        Input: None
+        Output: Child task HTML
+        """
         self.update_task_states()
         html = self.current_task.get_html(self.system)
         return_html = rewrite_links(html, self.rewrite_content_links)
         return return_html
 
     def get_current_attributes(self, task_number):
+        """
+        Gets the min and max score to attempt attributes of the specified task.
+        Input: The number of the task.
+        Output: The minimum and maximum scores needed to move on to the specified task.
+        """
         task_xml=self.task_xml[task_number]
         etree_xml=etree.fromstring(task_xml)
         min_score_to_attempt=int(etree_xml.attrib.get('min_score_to_attempt',0))
@@ -228,6 +310,11 @@ class CombinedOpenEndedModule(XModule):
         return {'min_score_to_attempt' : min_score_to_attempt, 'max_score_to_attempt' : max_score_to_attempt}
 
     def get_last_response(self, task_number):
+        """
+        Returns data associated with the specified task number, such as the last response, score, etc.
+        Input: The number of the task.
+        Output: A dictionary that contains information about the specified task.
+        """
         last_response=""
         task_state = self.task_states[task_number]
         task_xml=self.task_xml[task_number]
@@ -270,6 +357,11 @@ class CombinedOpenEndedModule(XModule):
         return last_response_dict
 
     def update_task_states(self):
+        """
+        Updates the task state of the combined open ended module with the task state of the current child module.
+        Input: None
+        Output: boolean indicating whether or not the task state changed.
+        """
         changed=False
         if not self.allow_reset:
             self.task_states[self.current_task_number] = self.current_task.get_instance_state()
@@ -286,6 +378,11 @@ class CombinedOpenEndedModule(XModule):
         return changed
 
     def update_task_states_ajax(self,return_html):
+        """
+        Runs the update task states function for ajax calls.  Currently the same as update_task_states
+        Input: The html returned by the handle_ajax function of the child
+        Output: New html that should be rendered
+        """
         changed=self.update_task_states()
         if changed:
             #return_html=self.get_html()
@@ -293,6 +390,11 @@ class CombinedOpenEndedModule(XModule):
         return return_html
 
     def get_results(self, get):
+        """
+        Gets the results of a given grader via ajax.
+        Input: AJAX get dictionary
+        Output: Dictionary to be rendered via ajax that contains the result html.
+        """
         task_number=int(get['task_number'])
         self.update_task_states()
         response_dict=self.get_last_response(task_number)
@@ -325,15 +427,19 @@ class CombinedOpenEndedModule(XModule):
         return json.dumps(d,cls=ComplexEncoder)
 
     def next_problem(self, get):
+        """
+        Called via ajax to advance to the next problem.
+        Input: AJAX get request.
+        Output: Dictionary to be rendered
+        """
         self.update_task_states()
         return {'success' : True, 'html' : self.get_html_nonsystem(), 'allow_reset' : self.allow_reset}
 
     def reset(self, get):
         """
-        If resetting is allowed, reset the state.
-
-        Returns {'success': bool, 'error': msg}
-        (error only present if not success)
+        If resetting is allowed, reset the state of the combined open ended module.
+        Input: AJAX get dictionary
+        Output: AJAX dictionary to tbe rendered
         """
         if self.state != self.DONE:
             if not self.allow_reset:
@@ -358,7 +464,9 @@ class CombinedOpenEndedModule(XModule):
 
     def get_instance_state(self):
         """
-        Get the current score and state
+        Returns the current instance state.  The module can be recreated from the instance state.
+        Input: None
+        Output: A dictionary containing the instance state.
         """
 
         state = {
@@ -373,6 +481,10 @@ class CombinedOpenEndedModule(XModule):
         return json.dumps(state)
 
     def get_status(self):
+        """
+        Input:
+        Output:
+        """
         status=[]
         for i in xrange(0,self.current_task_number+1):
             task_data = self.get_last_response(i)

From 134c3f3db08250a3019591b287c868ee58ea1ec3 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Tue, 8 Jan 2013 18:57:37 -0500
Subject: [PATCH 174/541] Document open ended descriptor

---
 .../xmodule/xmodule/combined_open_ended_module.py    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index a639d6997a..4bc0c1fc85 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -482,8 +482,9 @@ class CombinedOpenEndedModule(XModule):
 
     def get_status(self):
         """
-        Input:
-        Output:
+        Gets the status panel to be displayed at the top right.
+        Input: None
+        Output: The status html to be rendered
         """
         status=[]
         for i in xrange(0,self.current_task_number+1):
@@ -497,7 +498,7 @@ class CombinedOpenEndedModule(XModule):
 
 class CombinedOpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
     """
-    Module for adding self assessment questions to courses
+    Module for adding combined open ended questions
     """
     mako_template = "widgets/html-edit.html"
     module_class = CombinedOpenEndedModule
@@ -513,14 +514,13 @@ class CombinedOpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
     @classmethod
     def definition_from_xml(cls, xml_object, system):
         """
-        Pull out the rubric, prompt, and submitmessage into a dictionary.
+        Pull out the individual tasks, the rubric, and the prompt, and parse
 
         Returns:
         {
         'rubric': 'some-html',
         'prompt': 'some-html',
-        'submitmessage': 'some-html'
-        'hintprompt': 'some-html'
+        'task_xml': dictionary of xml strings,
         }
         """
         expected_children = ['task', 'rubric', 'prompt']

From 5303086a1044fef7ce5da357335a9387a99b5c31 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Tue, 8 Jan 2013 19:07:34 -0500
Subject: [PATCH 175/541] Start commenting open ended module

---
 .../lib/xmodule/xmodule/open_ended_module.py  | 77 ++++++++++++++++---
 1 file changed, 68 insertions(+), 9 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 024422773d..e4008309cd 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -37,8 +37,18 @@ from datetime import datetime
 log = logging.getLogger("mitx.courseware")
 
 class OpenEndedModule(openendedchild.OpenEndedChild):
-
+    """
+    The open ended module supports all external open ended grader problems.
+    """
     def setup_response(self, system, location, definition, descriptor):
+        """
+        Sets up the response type.
+        @param system: Modulesystem object
+        @param location: The location of the problem
+        @param definition: The xml definition of the problem
+        @param descriptor: The OpenEndedDescriptor associated with this
+        @return: None
+        """
         oeparam = definition['oeparam']
 
         self.url = definition.get('url', None)
@@ -106,6 +116,12 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         self.payload = {'grader_payload': updated_grader_payload}
 
     def skip_post_assessment(self, get, system):
+        """
+        Ajax function that allows one to skip the post assessment phase
+        @param get: AJAX dictionary
+        @param system: ModuleSystem
+        @return: Success indicator
+        """
         self.state=self.DONE
         return {'success' : True}
 
@@ -172,6 +188,12 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         return {'success' : success, 'msg' : "Successfully submitted your feedback."}
 
     def send_to_grader(self, submission, system):
+        """
+        Send a given submission to the grader, via the xqueue
+        @param submission: The student submission to send to the grader
+        @param system: Modulesystem
+        @return: Boolean true (not useful right now)
+        """
 
         # Prepare xqueue request
         #------------------------------------------------------------
@@ -214,6 +236,13 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         return True
 
     def _update_score(self, score_msg, queuekey, system):
+        """
+        Called by xqueue to update the score
+        @param score_msg: The message from xqueue
+        @param queuekey: The key sent by xqueue
+        @param system: Modulesystem
+        @return: Boolean True (not useful currently)
+        """
         new_score_msg = self._parse_score_msg(score_msg)
         if not new_score_msg['valid']:
             score_msg['feedback'] = 'Invalid grader reply. Please contact the course staff.'
@@ -226,10 +255,18 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
 
     def get_answers(self):
+        """
+        Gets and shows the answer for this problem.
+        @return: Answer html
+        """
         anshtml = '<span class="openended-answer"><pre><code>{0}</code></pre></span>'.format(self.answer)
         return {self.answer_id: anshtml}
 
     def get_initial_display(self):
+        """
+        Gets and shows the initial display for the input box.
+        @return: Initial display html
+        """
         return {self.answer_id: self.initial_display}
 
     def _convert_longform_feedback_to_html(self, response_items):
@@ -385,7 +422,11 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         return {'valid' : True, 'score' : score_result['score'], 'feedback' : feedback}
 
     def latest_post_assessment(self, short_feedback=False):
-        """None if not available"""
+        """
+        Gets the latest feedback, parses, and returns
+        @param short_feedback: If the long feedback is wanted or not
+        @return: Returns formatted feedback
+        """
         if not self.history:
             return ""
 
@@ -397,6 +438,11 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         return short_feedback if feedback_dict['valid'] else ''
 
     def format_feedback_with_evaluation(self,feedback):
+        """
+        Renders a given html feedback into an evaluation template
+        @param feedback: HTML feedback
+        @return: Rendered html
+        """
         context={'msg' : feedback, 'id' : "1", 'rows' : 50, 'cols' : 50}
         html= render_to_string('open_ended_evaluation.html', context)
         return html
@@ -432,10 +478,22 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         return json.dumps(d, cls=ComplexEncoder)
 
     def check_for_score(self, get, system):
+        """
+        Checks to see if a score has been received yet.
+        @param get: AJAX get dictionary
+        @param system: Modulesystem (needed to align with other ajax functions)
+        @return: Returns the current state
+        """
         state = self.state
         return {'state' : state}
 
     def save_answer(self, get, system):
+        """
+        Saves a student answer
+        @param get: AJAX get dictionary
+        @param system: modulesystem
+        @return: Success indicator
+        """
         if self.attempts > self.max_attempts:
             # If too many attempts, prevent student from saving answer and
             # seeing rubric.  In normal use, students shouldn't see this because
@@ -457,13 +515,9 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
     def update_score(self, get, system):
         """
-        Delivers grading response (e.g. from asynchronous code checking) to
-            the capa problem, so its score can be updated
-
-        'get' must have a field 'response' which is a string that contains the
-            grader's response
-
-        No ajax return is needed. Return empty dict.
+        Updates the current score via ajax.  Called by xqueue.
+        Input: AJAX get dictionary, modulesystem
+        Output: None
         """
         queuekey = get['queuekey']
         score_msg = get['xqueue_body']
@@ -473,6 +527,11 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         return dict()  # No AJAX return is needed
 
     def get_html(self, system):
+        """
+        Gets the HTML for this problem and renders it
+        Input: Modulesystem object
+        Output: Rendered HTML
+        """
         #set context variables and render template
         if self.state != self.INITIAL:
             latest = self.latest_answer()

From f858dce753565e4555e875d01ea8909ff4599668 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Tue, 8 Jan 2013 19:12:30 -0500
Subject: [PATCH 176/541] Document self assessment

---
 .../lib/xmodule/xmodule/open_ended_module.py  | 14 +++++--
 common/lib/xmodule/xmodule/openendedchild.py  | 41 ++-----------------
 .../xmodule/xmodule/self_assessment_module.py | 37 +++++++++++++----
 3 files changed, 41 insertions(+), 51 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index e4008309cd..ebd1cbfc02 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -39,6 +39,14 @@ log = logging.getLogger("mitx.courseware")
 class OpenEndedModule(openendedchild.OpenEndedChild):
     """
     The open ended module supports all external open ended grader problems.
+    Sample XML file:
+    <openended min_score_to_attempt="1" max_score_to_attempt="1">
+        <openendedparam>
+            <initial_display>Enter essay here.</initial_display>
+            <answer_display>This is the answer.</answer_display>
+            <grader_payload>{"grader_settings" : "ml_grading.conf", "problem_id" : "6.002x/Welcome/OETest"}</grader_payload>
+        </openendedparam>
+    </openended>
     """
     def setup_response(self, system, location, definition, descriptor):
         """
@@ -562,7 +570,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
 class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
     """
-    Module for adding self assessment questions to courses
+    Module for adding open ended response questions to courses
     """
     mako_template = "widgets/html-edit.html"
     module_class = OpenEndedModule
@@ -578,12 +586,10 @@ class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
     @classmethod
     def definition_from_xml(cls, xml_object, system):
         """
-        Pull out the rubric, prompt, and submitmessage into a dictionary.
+        Pull out the open ended parameters into a dictionary.
 
         Returns:
         {
-        'rubric': 'some-html',
-        'prompt': 'some-html',
         'oeparam': 'some-html'
         }
         """
diff --git a/common/lib/xmodule/xmodule/openendedchild.py b/common/lib/xmodule/xmodule/openendedchild.py
index 304271c620..5c2bdea76b 100644
--- a/common/lib/xmodule/xmodule/openendedchild.py
+++ b/common/lib/xmodule/xmodule/openendedchild.py
@@ -1,10 +1,3 @@
-"""
-A Self Assessment module that allows students to write open-ended responses,
-submit, then see a rubric and rate themselves.  Persists student supplied
-hints, answers, and assessment judgment (currently only correct/incorrect).
-Parses xml definition file--see below for exact format.
-"""
-
 import copy
 from fs.errors import ResourceNotFoundError
 import itertools
@@ -48,9 +41,9 @@ class OpenEndedChild():
 
     initial (prompt, textbox shown)
          |
-    assessing (read-only textbox, rubric + assessment input shown)
+    assessing (read-only textbox, rubric + assessment input shown for self assessment, response queued for open ended)
          |
-    request_hint (read-only textbox, read-only rubric and assessment, hint input box shown)
+    post_assessment (read-only textbox, read-only rubric and assessment, hint input box shown)
          |
     done (submitted msg, green checkmark, everything else read-only.  If attempts < max, shows
          a reset button that goes back to initial state.  Saves previous
@@ -69,6 +62,7 @@ class OpenEndedChild():
     POST_ASSESSMENT = 'post_assessment'
     DONE = 'done'
 
+    #This is used to tell students where they are at in the module
     HUMAN_NAMES={
         'initial' : 'Started',
         'assessing' : 'Being scored',
@@ -78,35 +72,6 @@ class OpenEndedChild():
 
     def __init__(self, system, location, definition, descriptor, static_data,
                  instance_state=None, shared_state=None, **kwargs):
-        """
-        Definition file should have 4 blocks -- prompt, rubric, submitmessage, hintprompt,
-        and two optional attributes:
-        attempts, which should be an integer that defaults to 1.
-        If it's > 1, the student will be able to re-submit after they see
-        the rubric.
-        max_score, which should be an integer that defaults to 1.
-        It defines the maximum number of points a student can get.  Assumed to be integer scale
-        from 0 to max_score, with an interval of 1.
-
-        Note: all the submissions are stored.
-
-        Sample file:
-
-        <selfassessment attempts="1" max_score="1">
-            <prompt>
-                Insert prompt text here.  (arbitrary html)
-            </prompt>
-            <rubric>
-                Insert grading rubric here.  (arbitrary html)
-            </rubric>
-            <hintprompt>
-                Please enter a hint below: (arbitrary html)
-            </hintprompt>
-            <submitmessage>
-                Thanks for submitting!  (arbitrary html)
-            </submitmessage>
-        </selfassessment>
-        """
 
         # Load instance state
         if instance_state is not None:
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index 52701a8cf1..88632a38d0 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -1,10 +1,3 @@
-"""
-A Self Assessment module that allows students to write open-ended responses,
-submit, then see a rubric and rate themselves.  Persists student supplied
-hints, answers, and assessment judgment (currently only correct/incorrect).
-Parses xml definition file--see below for exact format.
-"""
-
 import copy
 from fs.errors import ResourceNotFoundError
 import itertools
@@ -31,14 +24,42 @@ import openendedchild
 log = logging.getLogger("mitx.courseware")
 
 class SelfAssessmentModule(openendedchild.OpenEndedChild):
+    """
+    A Self Assessment module that allows students to write open-ended responses,
+    submit, then see a rubric and rate themselves.  Persists student supplied
+    hints, answers, and assessment judgment (currently only correct/incorrect).
+    Parses xml definition file--see below for exact format.
 
+    Sample XML format:
+    <selfassessment>
+        <hintprompt>
+            What hint about this problem would you give to someone?
+        </hintprompt>
+        <submitmessage>
+            Save Succcesful.  Thanks for participating!
+        </submitmessage>
+    </selfassessment>
+    """
     def setup_response(self, system, location, definition, descriptor):
+        """
+        Sets up the module
+        @param system: Modulesystem
+        @param location: location, to let the module know where it is.
+        @param definition: XML definition of the module.
+        @param descriptor: SelfAssessmentDescriptor
+        @return: None
+        """
         self.submit_message = definition['submitmessage']
         self.hint_prompt = definition['hintprompt']
         self.prompt = stringify_children(self.prompt)
         self.rubric = stringify_children(self.rubric)
 
     def get_html(self, system):
+        """
+        Gets context and renders HTML that represents the module
+        @param system: Modulesystem
+        @return: Rendered HTML
+        """
         #set context variables and render template
         if self.state != self.INITIAL:
             latest = self.latest_answer()
@@ -266,8 +287,6 @@ class SelfAssessmentDescriptor(XmlDescriptor, EditingDescriptor):
 
         Returns:
         {
-        'rubric': 'some-html',
-        'prompt': 'some-html',
         'submitmessage': 'some-html'
         'hintprompt': 'some-html'
         }

From 4a2875ccdd302fa1d08990ed02912dd2e2182c0e Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Tue, 8 Jan 2013 19:15:57 -0500
Subject: [PATCH 177/541] Document open ended child

---
 common/lib/xmodule/xmodule/openendedchild.py | 31 +++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/openendedchild.py b/common/lib/xmodule/xmodule/openendedchild.py
index 5c2bdea76b..ce1b15074f 100644
--- a/common/lib/xmodule/xmodule/openendedchild.py
+++ b/common/lib/xmodule/xmodule/openendedchild.py
@@ -72,7 +72,6 @@ class OpenEndedChild():
 
     def __init__(self, system, location, definition, descriptor, static_data,
                  instance_state=None, shared_state=None, **kwargs):
-
         # Load instance state
         if instance_state is not None:
             instance_state = json.loads(instance_state)
@@ -102,6 +101,14 @@ class OpenEndedChild():
         self.setup_response(system, location, definition, descriptor)
 
     def setup_response(self, system, location, definition, descriptor):
+        """
+        Needs to be implemented by the inheritors of this module.  Sets up additional fields used by the child modules.
+        @param system: Modulesystem
+        @param location: Module location
+        @param definition: XML definition
+        @param descriptor: Descriptor of the module
+        @return: None
+        """
         pass
 
     def latest_answer(self):
@@ -123,6 +130,11 @@ class OpenEndedChild():
         return self.history[-1].get('post_assessment', "")
 
     def new_history_entry(self, answer):
+        """
+        Adds a new entry to the history dictionary
+        @param answer: The student supplied answer
+        @return: None
+        """
         self.history.append({'answer': answer})
 
     def record_latest_score(self, score):
@@ -213,12 +225,25 @@ class OpenEndedChild():
                 'error': 'The problem state got out-of-sync'}
 
     def get_html(self):
+        """
+         Needs to be implemented by inheritors.  Renders the HTML that students see.
+        @return:
+        """
         pass
 
     def handle_ajax(self):
+        """
+        Needs to be implemented by child modules.  Handles AJAX events.
+        @return:
+        """
         pass
 
     def is_submission_correct(self, score):
+        """
+        Checks to see if a given score makes the answer correct.  Very naive right now (>66% is correct)
+        @param score: Numeric score.
+        @return: Boolean correct.
+        """
         correct=False
         if(isinstance(score,(int, long, float, complex))):
             score_ratio = int(score) / float(self.max_score())
@@ -226,6 +251,10 @@ class OpenEndedChild():
         return correct
 
     def is_last_response_correct(self):
+        """
+        Checks to see if the last response in the module is correct.
+        @return: 'correct' if correct, otherwise 'incorrect'
+        """
         score=self.get_score()['score']
         correctness = 'correct' if self.is_submission_correct(score) else 'incorrect'
         return correctness

From 5a3a537c1b1668eec294966d5d1ea15cdc43543a Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Wed, 9 Jan 2013 13:00:37 -0500
Subject: [PATCH 178/541] Support formatting of peer grading feedback

---
 .../lib/xmodule/xmodule/open_ended_module.py   | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index ebd1cbfc02..0d30950592 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -422,8 +422,22 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
                 log.error("External grader message is missing required tag: {0}"
                 .format(tag))
                 return fail
-
-        feedback = self._format_feedback(score_result)
+        #This is to support peer grading
+        if isinstance(score_result['score'], list):
+            feedback_items=[]
+            for i in xrange(0,len(score_result['score'])):
+                new_score_result={
+                    'score' : score_result['score'][i],
+                    'feedback' : score_result['feedback'][i],
+                    'grader_type' : score_result['grader_type'],
+                    'success' : score_result['success'],
+                    'grader_id' : score_result['grader_id'][i],
+                    'submission_id' : score_result['submission_id']
+                    }
+                feedback_items.append(self._format_feedback(new_score_result))
+            feedback="".join(feedback_items)
+        else:
+            feedback = self._format_feedback(score_result)
         self.submission_id=score_result['submission_id']
         self.grader_id=score_result['grader_id']
 

From c267efb40099d6fc2e3508257caa21e94378b800 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Wed, 9 Jan 2013 13:03:01 -0500
Subject: [PATCH 179/541] Add in a comment

---
 common/lib/xmodule/xmodule/open_ended_module.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 0d30950592..1ce1e09e03 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -437,6 +437,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
                 feedback_items.append(self._format_feedback(new_score_result))
             feedback="".join(feedback_items)
         else:
+            #This is for instructor and ML grading
             feedback = self._format_feedback(score_result)
         self.submission_id=score_result['submission_id']
         self.grader_id=score_result['grader_id']

From c4b1c8d074bdb4efe1588acc474f26a2635e61c9 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Wed, 9 Jan 2013 14:29:49 -0500
Subject: [PATCH 180/541] Correct peer grading score parsing

---
 common/lib/xmodule/xmodule/open_ended_module.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 1ce1e09e03..07ceb79b1a 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -31,6 +31,7 @@ from capa.util import *
 import openendedchild
 
 from mitxmako.shortcuts import render_to_string
+from numpy import median
 
 from datetime import datetime
 
@@ -436,9 +437,11 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
                     }
                 feedback_items.append(self._format_feedback(new_score_result))
             feedback="".join(feedback_items)
+            score = median(score_result['score'])
         else:
             #This is for instructor and ML grading
             feedback = self._format_feedback(score_result)
+
         self.submission_id=score_result['submission_id']
         self.grader_id=score_result['grader_id']
 

From 742d9475c79ae1faa7d6043e3597d70ece7cef11 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Wed, 9 Jan 2013 14:31:02 -0500
Subject: [PATCH 181/541] Parse int from score

---
 common/lib/xmodule/xmodule/open_ended_module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 07ceb79b1a..ac852e4e5e 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -437,7 +437,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
                     }
                 feedback_items.append(self._format_feedback(new_score_result))
             feedback="".join(feedback_items)
-            score = median(score_result['score'])
+            score = int(median(score_result['score']))
         else:
             #This is for instructor and ML grading
             feedback = self._format_feedback(score_result)

From 62e93870957c01e0e6b013103c2c06dee4bb6d4d Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Wed, 9 Jan 2013 14:42:29 -0500
Subject: [PATCH 182/541] Fix score passing from controller

---
 common/lib/xmodule/xmodule/open_ended_module.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index ac852e4e5e..2a253c663f 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -441,11 +441,12 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         else:
             #This is for instructor and ML grading
             feedback = self._format_feedback(score_result)
+            score=score_result['score']
 
         self.submission_id=score_result['submission_id']
         self.grader_id=score_result['grader_id']
 
-        return {'valid' : True, 'score' : score_result['score'], 'feedback' : feedback}
+        return {'valid' : True, 'score' : score, 'feedback' : feedback}
 
     def latest_post_assessment(self, short_feedback=False):
         """

From cb203a6f5532ec052c668fd5969261385fce56cc Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Wed, 9 Jan 2013 15:54:15 -0500
Subject: [PATCH 183/541] Better error messages

---
 .../xmodule/combined_open_ended_module.py      |  1 +
 .../lib/xmodule/xmodule/open_ended_module.py   | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 4bc0c1fc85..42f2393ad9 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -224,6 +224,7 @@ class CombinedOpenEndedModule(XModule):
                 current_task_state=self.overwrite_state(current_task_state)
             self.current_task=children['modules'][current_task_type](self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, self.static_data, instance_state=current_task_state)
 
+        log.debug(current_task_state)
         return True
 
     def check_allow_reset(self):
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 2a253c663f..367b5d9e67 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -405,23 +405,29 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             correct:         Correctness of submission (Boolean)
             score:           Points to be assigned (numeric, can be float)
         """
-        fail = {'valid' : False, 'correct' : False, 'points' : 0, 'msg' : ''}
+        fail = {'valid' : False, 'score' : 0, 'feedback' : ''}
         try:
             score_result = json.loads(score_msg)
         except (TypeError, ValueError):
-            log.error("External grader message should be a JSON-serialized dict."
-                      " Received score_msg = {0}".format(score_msg))
+            error_message=("External grader message should be a JSON-serialized dict."
+            " Received score_msg = {0}".format(score_msg))
+            log.error(error_message)
+            fail['feedback']=error_message
             return fail
 
         if not isinstance(score_result, dict):
-            log.error("External grader message should be a JSON-serialized dict."
-                      " Received score_result = {0}".format(score_result))
+            error_message=("External grader message should be a JSON-serialized dict."
+            " Received score_result = {0}".format(score_result))
+            log.error(error_message)
+            fail['feedback']=error_message
             return fail
 
         for tag in ['score', 'feedback', 'grader_type', 'success', 'grader_id', 'submission_id']:
             if tag not in score_result:
-                log.error("External grader message is missing required tag: {0}"
+                error_message=("External grader message is missing required tag: {0}"
                 .format(tag))
+                log.error(error_message)
+                fail['feedback']=error _message
                 return fail
         #This is to support peer grading
         if isinstance(score_result['score'], list):

From f4968e1e8e1b80677130a662b5adb5c85c6a7f44 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Wed, 9 Jan 2013 16:01:03 -0500
Subject: [PATCH 184/541] Fix spacing error

---
 common/lib/xmodule/xmodule/open_ended_module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 367b5d9e67..0420faf534 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -427,7 +427,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
                 error_message=("External grader message is missing required tag: {0}"
                 .format(tag))
                 log.error(error_message)
-                fail['feedback']=error _message
+                fail['feedback']=error_message
                 return fail
         #This is to support peer grading
         if isinstance(score_result['score'], list):

From b0d3bcc5166feced1285826f745e42c8bd5ed871 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Wed, 9 Jan 2013 16:37:15 -0500
Subject: [PATCH 185/541] Fix feedback response for peer grading so that
 students can respond to multiple feedback items

---
 .../capa/capa/templates/openendedinput.html   | 56 -----------------
 .../xmodule/combined_open_ended_module.py     | 10 ++-
 .../js/src/combinedopenended/display.coffee   | 62 ++++++++++---------
 .../lib/xmodule/xmodule/open_ended_module.py  | 11 ++--
 4 files changed, 48 insertions(+), 91 deletions(-)
 delete mode 100644 common/lib/capa/capa/templates/openendedinput.html

diff --git a/common/lib/capa/capa/templates/openendedinput.html b/common/lib/capa/capa/templates/openendedinput.html
deleted file mode 100644
index c42ad73faf..0000000000
--- a/common/lib/capa/capa/templates/openendedinput.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<section id="openended_${id}" class="openended">
-  <textarea rows="${rows}" cols="${cols}" name="input_${id}" class="short-form-response" id="input_${id}"
-       % if hidden:
-      	    style="display:none;"
-       % endif
-  >${value|h}</textarea>
-
-  <div class="grader-status">
-    % if status == 'unsubmitted':
-      <span class="unanswered" style="display:inline-block;" id="status_${id}">Unanswered</span>
-    % elif status == 'correct':
-      <span class="correct" id="status_${id}">Correct</span>
-    % elif status == 'incorrect':
-      <span class="incorrect" id="status_${id}">Incorrect</span>
-    % elif status == 'queued':
-      <span class="grading" id="status_${id}">Submitted for grading</span>
-    % endif
-
-    % if hidden:
-      <div style="display:none;" name="${hidden}" inputid="input_${id}" />
-    % endif
-  </div>
-
-  <span id="answer_${id}"></span>
-
-    % if status == 'queued':
-    <input name="reload" class="reload" type="button" value="Recheck for Feedback" onclick="document.location.reload(true);" />
-    % endif
-  <div class="external-grader-message">
-      ${msg|n}
-    % if status in ['correct','incorrect']:
-    <div class="collapsible evaluation-response">
-      <header>
-      <a href="#">Respond to Feedback</a>
-      </header>
-    <section id="evaluation_${id}" class="evaluation">
-    <p>How accurate do you find this feedback?</p>
-        <div class="evaluation-scoring">
-            <ul class="scoring-list">
-                <li><input type="radio" name="evaluation-score" id="evaluation-score-5" value="5" /> <label for="evaluation-score-5"> Correct</label></li>
-                <li><input type="radio" name="evaluation-score" id="evaluation-score-4" value="4" /> <label for="evaluation-score-4"> Partially Correct</label></li>
-                <li><input type="radio" name="evaluation-score" id="evaluation-score-3" value="3" /> <label for="evaluation-score-3"> No Opinion</label></li>
-                <li><input type="radio" name="evaluation-score" id="evaluation-score-2" value="2" /> <label for="evaluation-score-2"> Partially Incorrect</label></li>
-                <li><input type="radio" name="evaluation-score" id="evaluation-score-1" value="1" /> <label for="evaluation-score-1"> Incorrect</label></li>
-            </ul>
-        </div>
-        <p>Additional comments:</p>
-        <textarea rows="${rows}" cols="${cols}" name="feedback_${id}" class="feedback-on-feedback" id="feedback_${id}"></textarea>
-        <div class="submit-message-container">
-            <input name="submit-message" class="submit-message" type="button" value="Submit your message"/>
-        </div>
-    </section>
-    </div>
-    % endif
-  </div>
-</section>
diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 42f2393ad9..244346625a 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -336,8 +336,14 @@ class CombinedOpenEndedModule(XModule):
         last_post_assessment = task.latest_post_assessment()
         last_post_feedback=""
         if task_type=="openended":
-            last_post_assessment = task.latest_post_assessment(short_feedback=False)
-            last_post_evaluation = task.format_feedback_with_evaluation(last_post_assessment)
+            last_post_assessment = task.latest_post_assessment(short_feedback=False, join_feedback=False)
+            if isinstance(last_post_assessment,list):
+                eval_list=[]
+                for i in xrange(0,len(last_post_assessment)):
+                    eval_list.append(task.format_feedback_with_evaluation(last_post_assessment[i]))
+                last_post_evaluation="".join(eval_list)
+            else:
+                last_post_evaluation = task.format_feedback_with_evaluation(last_post_assessment)
             last_post_assessment = last_post_evaluation
         last_correctness = task.is_last_response_correct()
         max_score = task.max_score()
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 8a5ef42270..5e2d2db86e 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -69,6 +69,39 @@ class @CombinedOpenEnded
       else
         @errors_area.html(response.error)
 
+  message_post: (event)=>
+    Logger.log 'message_post', @answers
+    external_grader_message=$(event.target).parent().parent().parent()
+    evaluation_scoring = $(event.target).parent()
+
+    fd = new FormData()
+    feedback = evaluation_scoring.find('textarea.feedback-on-feedback')[0].value
+    submission_id = external_grader_message.find('div.submission_id')[0].innerHTML
+    grader_id = external_grader_message.find('div.grader_id')[0].innerHTML
+    score = evaluation_scoring.find("input:radio[name='evaluation-score']:checked").val()
+
+    fd.append('feedback', feedback)
+    fd.append('submission_id', submission_id)
+    fd.append('grader_id', grader_id)
+    if(!score)
+      @gentle_alert "You need to pick a rating before you can submit."
+      return
+    else
+      fd.append('score', score)
+
+    settings =
+      type: "POST"
+      data: fd
+      processData: false
+      contentType: false
+      success: (response) =>
+        @gentle_alert response.msg
+        $('section.evaluation').slideToggle()
+        @message_wrapper.html(response.message_html)
+
+    $.ajaxWithPrefix("#{@ajax_url}/save_post_assessment", settings)
+
+
   rebind: () =>
     # rebind to the appropriate function for the current state
     @submit_button.unbind('click')
@@ -227,35 +260,6 @@ class @CombinedOpenEnded
     else
       @errors_area.html('Problem state got out of sync.  Try reloading the page.')
 
-  message_post: =>
-    Logger.log 'message_post', @answers
-
-    fd = new FormData()
-    feedback = $('section.evaluation textarea.feedback-on-feedback')[0].value
-    submission_id = $('div.external-grader-message div.submission_id')[0].innerHTML
-    grader_id = $('div.external-grader-message div.grader_id')[0].innerHTML
-    score = $(".evaluation-scoring input:radio[name='evaluation-score']:checked").val()
-    fd.append('feedback', feedback)
-    fd.append('submission_id', submission_id)
-    fd.append('grader_id', grader_id)
-    if(!score)
-      @gentle_alert "You need to pick a rating before you can submit."
-      return
-    else
-      fd.append('score', score)
-
-    settings =
-      type: "POST"
-      data: fd
-      processData: false
-      contentType: false
-      success: (response) =>
-        @gentle_alert response.msg
-        $('section.evaluation').slideToggle()
-        @message_wrapper.html(response.message_html)
-
-    $.ajaxWithPrefix("#{@ajax_url}/save_post_assessment", settings)
-
   gentle_alert: (msg) =>
     if @el.find('.open-ended-alert').length
       @el.find('.open-ended-alert').remove()
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 0420faf534..f715c9d76a 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -391,7 +391,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         return feedback_template
 
 
-    def _parse_score_msg(self, score_msg):
+    def _parse_score_msg(self, score_msg, join_feedback=True):
         """
          Grader reply is a JSON-dump of the following dict
            { 'correct': True/False,
@@ -442,7 +442,10 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
                     'submission_id' : score_result['submission_id']
                     }
                 feedback_items.append(self._format_feedback(new_score_result))
-            feedback="".join(feedback_items)
+            if join_feedback:
+                feedback="".join(feedback_items)
+            else:
+                feedback=feedback_items
             score = int(median(score_result['score']))
         else:
             #This is for instructor and ML grading
@@ -454,7 +457,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         return {'valid' : True, 'score' : score, 'feedback' : feedback}
 
-    def latest_post_assessment(self, short_feedback=False):
+    def latest_post_assessment(self, short_feedback=False, join_feedback=True):
         """
         Gets the latest feedback, parses, and returns
         @param short_feedback: If the long feedback is wanted or not
@@ -463,7 +466,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         if not self.history:
             return ""
 
-        feedback_dict = self._parse_score_msg(self.history[-1].get('post_assessment', ""))
+        feedback_dict = self._parse_score_msg(self.history[-1].get('post_assessment', ""), join_feedback=join_feedback)
         if not short_feedback:
             return feedback_dict['feedback'] if feedback_dict['valid'] else ''
         if feedback_dict['valid']:

From e4568c3a2061b7ba17a6a1af45fac9f87e955762 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Wed, 9 Jan 2013 16:41:17 -0500
Subject: [PATCH 186/541] Use include clearfix in css

---
 .../xmodule/xmodule/css/combinedopenended/display.scss   | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
index be86757aee..8ebb3a2888 100644
--- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -21,6 +21,7 @@ h2 {
 }
 
 section.combined-open-ended {
+  @include clearfix;
   .status-container
   {
       float:right;
@@ -40,14 +41,6 @@ section.combined-open-ended {
       position:relative;
   }
 
-  &:after
-  {
-      content:".";
-      display:block;
-      height:0;
-      visibility: hidden;
-      clear:both;
-  }
 }
 
 section.combined-open-ended-status {

From ee2990da4f0c8151a00f2fb7ed401c44344d860c Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Wed, 9 Jan 2013 17:05:08 -0500
Subject: [PATCH 187/541] Change hidden div to input name

---
 common/lib/xmodule/xmodule/css/combinedopenended/display.scss | 1 -
 .../xmodule/xmodule/js/src/combinedopenended/display.coffee   | 4 ++--
 common/lib/xmodule/xmodule/open_ended_module.py               | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
index 8ebb3a2888..b5eb4b52e6 100644
--- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -40,7 +40,6 @@ section.combined-open-ended {
       width: 93%;
       position:relative;
   }
-
 }
 
 section.combined-open-ended-status {
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 5e2d2db86e..29b0424a6d 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -76,8 +76,8 @@ class @CombinedOpenEnded
 
     fd = new FormData()
     feedback = evaluation_scoring.find('textarea.feedback-on-feedback')[0].value
-    submission_id = external_grader_message.find('div.submission_id')[0].innerHTML
-    grader_id = external_grader_message.find('div.grader_id')[0].innerHTML
+    submission_id = external_grader_message.find('input.submission_id')[0].innerHTML
+    grader_id = external_grader_message.find('input.grader_id')[0].innerHTML
     score = evaluation_scoring.find("input:radio[name='evaluation-score']:checked").val()
 
     fd.append('feedback', feedback)
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index f715c9d76a..3f5d5b0110 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -332,9 +332,9 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         def format_feedback_hidden(feedback_type , value):
             feedback_type,value=encode_values(feedback_type,value)
             feedback = """
-            <div class="{feedback_type}" style="display: none;">
+            <input class="{feedback_type}" style="display: none;" type="hidden">
             {value}
-            </div>
+            </input>
             """.format(feedback_type=feedback_type, value=value)
             return feedback
 

From c76786ae4ee6ad63a88ed875e601884c24dcebdd Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Wed, 9 Jan 2013 17:08:10 -0500
Subject: [PATCH 188/541] Roll back hidden input changes

---
 .../xmodule/xmodule/js/src/combinedopenended/display.coffee   | 4 ++--
 common/lib/xmodule/xmodule/open_ended_module.py               | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 29b0424a6d..5e2d2db86e 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -76,8 +76,8 @@ class @CombinedOpenEnded
 
     fd = new FormData()
     feedback = evaluation_scoring.find('textarea.feedback-on-feedback')[0].value
-    submission_id = external_grader_message.find('input.submission_id')[0].innerHTML
-    grader_id = external_grader_message.find('input.grader_id')[0].innerHTML
+    submission_id = external_grader_message.find('div.submission_id')[0].innerHTML
+    grader_id = external_grader_message.find('div.grader_id')[0].innerHTML
     score = evaluation_scoring.find("input:radio[name='evaluation-score']:checked").val()
 
     fd.append('feedback', feedback)
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 3f5d5b0110..f715c9d76a 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -332,9 +332,9 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         def format_feedback_hidden(feedback_type , value):
             feedback_type,value=encode_values(feedback_type,value)
             feedback = """
-            <input class="{feedback_type}" style="display: none;" type="hidden">
+            <div class="{feedback_type}" style="display: none;">
             {value}
-            </input>
+            </div>
             """.format(feedback_type=feedback_type, value=value)
             return feedback
 

From 8dbbb021a730256ef0ba3a9f04d58085d78ad9f2 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Wed, 9 Jan 2013 17:23:33 -0500
Subject: [PATCH 189/541] Change value passing to hidden input type

---
 .../xmodule/xmodule/js/src/combinedopenended/display.coffee   | 4 ++--
 common/lib/xmodule/xmodule/open_ended_module.py               | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 5e2d2db86e..2cbba143a3 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -76,8 +76,8 @@ class @CombinedOpenEnded
 
     fd = new FormData()
     feedback = evaluation_scoring.find('textarea.feedback-on-feedback')[0].value
-    submission_id = external_grader_message.find('div.submission_id')[0].innerHTML
-    grader_id = external_grader_message.find('div.grader_id')[0].innerHTML
+    submission_id = external_grader_message.find('input.submission_id')[0].value
+    grader_id = external_grader_message.find('input.grader_id')[0].value
     score = evaluation_scoring.find("input:radio[name='evaluation-score']:checked").val()
 
     fd.append('feedback', feedback)
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index f715c9d76a..5649cbbd2c 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -332,9 +332,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         def format_feedback_hidden(feedback_type , value):
             feedback_type,value=encode_values(feedback_type,value)
             feedback = """
-            <div class="{feedback_type}" style="display: none;">
-            {value}
-            </div>
+            <input class="{feedback_type}" type="hidden" value="{value}" />
             """.format(feedback_type=feedback_type, value=value)
             return feedback
 

From 200493a54f4e7c4ffdd6a7c6d307098ff4aa7782 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@mit.edu>
Date: Sun, 6 Jan 2013 20:57:44 +0000
Subject: [PATCH 190/541] instructor dashboard upgrade - add enrollment
 management

---
 ...ed__add_unique_courseenrollmentallowed_.py | 155 +++++++++++++
 .../migrations/0021_remove_askbot.py.old      | 157 ++++++++++++++
 common/djangoapps/student/models.py           |  18 ++
 lms/djangoapps/instructor/views.py            | 205 ++++++++++++++++--
 lms/envs/dev.py                               |   4 +
 .../courseware/instructor_dashboard.html      |  51 ++++-
 6 files changed, 567 insertions(+), 23 deletions(-)
 create mode 100644 common/djangoapps/student/migrations/0021_auto__add_courseenrollmentallowed__add_unique_courseenrollmentallowed_.py
 create mode 100644 common/djangoapps/student/migrations/0021_remove_askbot.py.old

diff --git a/common/djangoapps/student/migrations/0021_auto__add_courseenrollmentallowed__add_unique_courseenrollmentallowed_.py b/common/djangoapps/student/migrations/0021_auto__add_courseenrollmentallowed__add_unique_courseenrollmentallowed_.py
new file mode 100644
index 0000000000..f7e2571685
--- /dev/null
+++ b/common/djangoapps/student/migrations/0021_auto__add_courseenrollmentallowed__add_unique_courseenrollmentallowed_.py
@@ -0,0 +1,155 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'CourseEnrollmentAllowed'
+        db.create_table('student_courseenrollmentallowed', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('email', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)),
+            ('course_id', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)),
+            ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, null=True, db_index=True, blank=True)),
+        ))
+        db.send_create_signal('student', ['CourseEnrollmentAllowed'])
+
+        # Adding unique constraint on 'CourseEnrollmentAllowed', fields ['email', 'course_id']
+        db.create_unique('student_courseenrollmentallowed', ['email', 'course_id'])
+
+
+    def backwards(self, orm):
+        # Removing unique constraint on 'CourseEnrollmentAllowed', fields ['email', 'course_id']
+        db.delete_unique('student_courseenrollmentallowed', ['email', 'course_id'])
+
+        # Deleting model 'CourseEnrollmentAllowed'
+        db.delete_table('student_courseenrollmentallowed')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'student.courseenrollment': {
+            'Meta': {'unique_together': "(('user', 'course_id'),)", 'object_name': 'CourseEnrollment'},
+            'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'student.courseenrollmentallowed': {
+            'Meta': {'unique_together': "(('email', 'course_id'),)", 'object_name': 'CourseEnrollmentAllowed'},
+            'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'email': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'student.pendingemailchange': {
+            'Meta': {'object_name': 'PendingEmailChange'},
+            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'new_email': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'})
+        },
+        'student.pendingnamechange': {
+            'Meta': {'object_name': 'PendingNameChange'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'new_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'rationale': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'})
+        },
+        'student.registration': {
+            'Meta': {'object_name': 'Registration', 'db_table': "'auth_registration'"},
+            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'unique': 'True'})
+        },
+        'student.testcenteruser': {
+            'Meta': {'object_name': 'TestCenterUser'},
+            'address_1': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+            'address_2': ('django.db.models.fields.CharField', [], {'max_length': '40', 'blank': 'True'}),
+            'address_3': ('django.db.models.fields.CharField', [], {'max_length': '40', 'blank': 'True'}),
+            'candidate_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'db_index': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'}),
+            'client_candidate_id': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
+            'company_name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
+            'country': ('django.db.models.fields.CharField', [], {'max_length': '3', 'db_index': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'extension': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '8', 'blank': 'True'}),
+            'fax': ('django.db.models.fields.CharField', [], {'max_length': '35', 'blank': 'True'}),
+            'fax_country_code': ('django.db.models.fields.CharField', [], {'max_length': '3', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
+            'middle_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'phone': ('django.db.models.fields.CharField', [], {'max_length': '35'}),
+            'phone_country_code': ('django.db.models.fields.CharField', [], {'max_length': '3', 'db_index': 'True'}),
+            'postal_code': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '16', 'blank': 'True'}),
+            'salutation': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
+            'state': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '20', 'blank': 'True'}),
+            'suffix': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['auth.User']", 'unique': 'True'}),
+            'user_updated_at': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'})
+        },
+        'student.userprofile': {
+            'Meta': {'object_name': 'UserProfile', 'db_table': "'auth_userprofile'"},
+            'courseware': ('django.db.models.fields.CharField', [], {'default': "'course.xml'", 'max_length': '255', 'blank': 'True'}),
+            'gender': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '6', 'null': 'True', 'blank': 'True'}),
+            'goals': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'language': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
+            'level_of_education': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '6', 'null': 'True', 'blank': 'True'}),
+            'location': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
+            'mailing_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'meta': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'profile'", 'unique': 'True', 'to': "orm['auth.User']"}),
+            'year_of_birth': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'})
+        },
+        'student.usertestgroup': {
+            'Meta': {'object_name': 'UserTestGroup'},
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'}),
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.User']", 'db_index': 'True', 'symmetrical': 'False'})
+        }
+    }
+
+    complete_apps = ['student']
\ No newline at end of file
diff --git a/common/djangoapps/student/migrations/0021_remove_askbot.py.old b/common/djangoapps/student/migrations/0021_remove_askbot.py.old
new file mode 100644
index 0000000000..89f7208f40
--- /dev/null
+++ b/common/djangoapps/student/migrations/0021_remove_askbot.py.old
@@ -0,0 +1,157 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+ASKBOT_AUTH_USER_COLUMNS = (
+    'website',
+    'about',
+    'gold',
+    'email_isvalid',
+    'real_name',
+    'location',
+    'reputation',
+    'gravatar',
+    'bronze',
+    'last_seen',
+    'silver',
+    'questions_per_page',
+    'new_response_count',
+    'seen_response_count',
+)
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        "Kill the askbot"
+        # For MySQL, we're batching the alters together for performance reasons
+        if db.backend_name == 'mysql':
+            drops = ["drop `{0}`".format(col) for col in ASKBOT_AUTH_USER_COLUMNS]
+            statement = "alter table `auth_user` {0};".format(", ".join(drops))
+            db.execute(statement)
+        else:
+            for column in ASKBOT_AUTH_USER_COLUMNS:
+                db.delete_column('auth_user', column)            
+
+    def backwards(self, orm):
+        raise RuntimeError("Cannot reverse this migration: there's no going back to Askbot.")
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'student.courseenrollment': {
+            'Meta': {'unique_together': "(('user', 'course_id'),)", 'object_name': 'CourseEnrollment'},
+            'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'student.pendingemailchange': {
+            'Meta': {'object_name': 'PendingEmailChange'},
+            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'new_email': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'})
+        },
+        'student.pendingnamechange': {
+            'Meta': {'object_name': 'PendingNameChange'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'new_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'rationale': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'})
+        },
+        'student.registration': {
+            'Meta': {'object_name': 'Registration', 'db_table': "'auth_registration'"},
+            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'unique': 'True'})
+        },
+        'student.testcenteruser': {
+            'Meta': {'object_name': 'TestCenterUser'},
+            'address_1': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+            'address_2': ('django.db.models.fields.CharField', [], {'max_length': '40', 'blank': 'True'}),
+            'address_3': ('django.db.models.fields.CharField', [], {'max_length': '40', 'blank': 'True'}),
+            'candidate_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'db_index': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'}),
+            'client_candidate_id': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
+            'company_name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
+            'country': ('django.db.models.fields.CharField', [], {'max_length': '3', 'db_index': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'extension': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '8', 'blank': 'True'}),
+            'fax': ('django.db.models.fields.CharField', [], {'max_length': '35', 'blank': 'True'}),
+            'fax_country_code': ('django.db.models.fields.CharField', [], {'max_length': '3', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
+            'middle_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'phone': ('django.db.models.fields.CharField', [], {'max_length': '35'}),
+            'phone_country_code': ('django.db.models.fields.CharField', [], {'max_length': '3', 'db_index': 'True'}),
+            'postal_code': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '16', 'blank': 'True'}),
+            'salutation': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
+            'state': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '20', 'blank': 'True'}),
+            'suffix': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['auth.User']", 'unique': 'True'}),
+            'user_updated_at': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'})
+        },
+        'student.userprofile': {
+            'Meta': {'object_name': 'UserProfile', 'db_table': "'auth_userprofile'"},
+            'courseware': ('django.db.models.fields.CharField', [], {'default': "'course.xml'", 'max_length': '255', 'blank': 'True'}),
+            'gender': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '6', 'null': 'True', 'blank': 'True'}),
+            'goals': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'language': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
+            'level_of_education': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '6', 'null': 'True', 'blank': 'True'}),
+            'location': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
+            'mailing_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'meta': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'profile'", 'unique': 'True', 'to': "orm['auth.User']"}),
+            'year_of_birth': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'})
+        },
+        'student.usertestgroup': {
+            'Meta': {'object_name': 'UserTestGroup'},
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'}),
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.User']", 'db_index': 'True', 'symmetrical': 'False'})
+        }
+    }
+
+    complete_apps = ['student']
diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index 2f5bc3ac04..d3254532bc 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -262,6 +262,24 @@ class CourseEnrollment(models.Model):
         return "[CourseEnrollment] %s: %s (%s)" % (self.user, self.course_id, self.created)
 
 
+class CourseEnrollmentAllowed(models.Model):
+    """
+    Table of users (specified by email address strings) who are allowed to enroll in a specified course.
+    The user may or may not (yet) exist.  Enrollment by users listed in this table is allowed
+    even if the enrollment time window is past.
+    """
+    email = models.CharField(max_length=255, db_index=True)
+    course_id = models.CharField(max_length=255, db_index=True)
+
+    created = models.DateTimeField(auto_now_add=True, null=True, db_index=True)
+
+    class Meta:
+        unique_together = (('email', 'course_id'), )
+
+    def __unicode__(self):
+        return "[CourseEnrollmentAllowed] %s: %s (%s)" % (self.email, self.course_id, self.created)
+
+
 @receiver(post_save, sender=CourseEnrollment)
 def assign_default_role(sender, instance, **kwargs):
     if instance.user.is_staff:
diff --git a/lms/djangoapps/instructor/views.py b/lms/djangoapps/instructor/views.py
index 2bad058ad8..b74fd495a1 100644
--- a/lms/djangoapps/instructor/views.py
+++ b/lms/djangoapps/instructor/views.py
@@ -2,8 +2,10 @@
 
 from collections import defaultdict
 import csv
+import json
 import logging
 import os
+import requests
 import urllib
 
 from django.conf import settings
@@ -20,7 +22,7 @@ from courseware.courses import get_course_with_access
 from django_comment_client.models import Role, FORUM_ROLE_ADMINISTRATOR, FORUM_ROLE_MODERATOR, FORUM_ROLE_COMMUNITY_TA
 from django_comment_client.utils import has_forum_access
 from psychometrics import psychoanalyze
-from student.models import CourseEnrollment
+from student.models import CourseEnrollment, CourseEnrollmentAllowed
 from xmodule.course_module import CourseDescriptor
 from xmodule.modulestore import Location
 from xmodule.modulestore.django import modulestore
@@ -125,7 +127,7 @@ def instructor_dashboard(request, course_id):
             except Exception as err:
                 msg += '<br/><p>Error: {0}</p>'.format(escape(err))
 
-    if action == 'Dump list of enrolled students':
+    if action == 'Dump list of enrolled students' or action=='List enrolled students':
         log.debug(action)
         datatable = get_student_grade_summary_data(request, course, course_id, get_grades=False)
         datatable['title'] = 'List of students enrolled in {0}'.format(course_id)
@@ -257,6 +259,70 @@ def instructor_dashboard(request, course_id):
         track.views.server_track(request, '{0} {1} as {2} for {3}'.format(FORUM_ROLE_ADD, uname, FORUM_ROLE_COMMUNITY_TA, course_id), 
                                  {}, page='idashboard')
 
+    #----------------------------------------
+    # enrollment
+
+    elif action == 'List students who may enroll but may not have yet signed up':
+        ceaset = CourseEnrollmentAllowed.objects.filter(course_id=course_id)
+        datatable = {'header': ['StudentEmail']}
+        datatable['data'] = [[x.email] for x in ceaset]
+        datatable['title'] = action
+
+    elif action == 'Enroll student':
+
+        student = request.POST.get('enstudent','')
+        datatable = {}
+        try:
+            nce = CourseEnrollment(user=User.objects.get(email=student), course_id=course_id)
+            nce.save()
+            msg += "Enrolled student with email '%s'" % student
+        except Exception as err:
+            msg += "Error!  Failed to enroll student with email '%s'\n" % student
+            msg += str(err) + '\n'
+
+    elif action == 'Un-enroll student':
+
+        student = request.POST.get('enstudent','')
+        datatable = {}
+        try:
+            nce = CourseEnrollment.objects.get(user=User.objects.get(email=student), course_id=course_id)
+            nce.delete()
+            msg += "Un-enrolled student with email '%s'" % student
+        except Exception as err:
+            msg += "Error!  Failed to un-enroll student with email '%s'\n" % student
+            msg += str(err) + '\n'
+
+    elif action == 'Un-enroll ALL students':
+
+        ret = _do_enroll_students(course, course_id, '', overload=True)
+        datatable = ret['datatable']
+
+    elif action == 'Enroll multiple students':
+
+        students = request.POST.get('enroll_multiple','')
+        ret = _do_enroll_students(course, course_id, students)
+        datatable = ret['datatable']
+
+    elif action == 'List sections available in remote gradebook':
+
+        msg2, datatable = _do_remote_gradebook(course, 'get-sections')
+        msg += msg2
+
+    elif action in ['List students in section in remote gradebook', 
+                    'Overload enrollment list using remote gradebook',
+                    'Merge enrollment list with remote gradebook']:
+
+        section = request.POST.get('gradebook_section','')
+        msg2, datatable = _do_remote_gradebook(course, 'get-membership', dict(section=section) )
+        msg += msg2
+
+        if not 'List' in action:
+            students = ','.join([x['email'] for x in datatable['retdata']])
+            overload = 'Overload' in action
+            ret = _do_enroll_students(course, course_id, students, overload=overload)
+            datatable = ret['datatable']
+        
+
     #----------------------------------------
     # psychometrics
 
@@ -270,9 +336,9 @@ def instructor_dashboard(request, course_id):
         problems = psychoanalyze.problems_with_psychometric_data(course_id)
 
 
-
     #----------------------------------------
     # context for rendering
+
     context = {'course': course,
                'staff_access': True,
                'admin_access': request.user.is_staff,
@@ -285,16 +351,65 @@ def instructor_dashboard(request, course_id):
                'plots': plots,			# psychometrics
                'course_errors': modulestore().get_item_errors(course.location),
                'djangopid' : os.getpid(),
+               'mitx_version' : getattr(settings,'MITX_VERSION_STRING','')
                }
 
     return render_to_response('courseware/instructor_dashboard.html', context)
 
+
+def _do_remote_gradebook(course, action, args=None):
+    '''
+    Perform remote gradebook action.  Returns msg, datatable.
+    '''
+    rg = course.metadata.get('remote_gradebook','')
+    if not rg:
+        msg = "No remote gradebook defined in course metadata"
+        return msg, {}
+    
+    rgurl = settings.MITX_FEATURES.get('REMOTE_GRADEBOOK_URL','')
+    if not rgurl:
+        msg = "No remote gradebook url defined in settings.MITX_FEATURES"
+        return msg, {}
+    
+    rgname = rg.get('name','')
+    if not rgname:
+        msg = "No gradebook name defined in course remote_gradebook metadata"
+        return msg, {}
+    
+    if args is None:
+        args = {}
+    data = dict(submit=action, gradebook=rgname)
+    data.update(args)
+
+    try:
+        resp = requests.post(rgurl, data=data, verify=False)
+        retdict = json.loads(resp.content)
+    except Exception as err:
+        msg = "Failed to communicate with gradebook server at %s<br/>" % rgurl
+        msg += "Error: %s" % err
+        msg += "<br/>resp=%s" % resp.content
+        msg += "<br/>data=%s" % data
+        return msg, {}
+
+    msg = '<pre>%s</pre>' % retdict['msg'].replace('\n','<br/>')
+    retdata = retdict['data']
+
+    if retdata:
+        datatable = {'header': retdata[0].keys()}
+        datatable['data'] = [x.values() for x in retdata]
+        datatable['title'] = 'Remote gradebook response for %s' % action
+        datatable['retdata'] = retdata
+    else:
+        datatable = {}
+
+    return msg, datatable
+
 def _list_course_forum_members(course_id, rolename, datatable):
     ''' 
     Fills in datatable with forum membership information, for a given role,
     so that it will be displayed on instructor dashboard.
     
-      course_ID = course's ID string
+      course_ID = the ID string for a course
       rolename = one of "Administrator", "Moderator", "Community TA"
     
     Returns message status string to append to displayed message, if role is unknown.
@@ -455,6 +570,68 @@ def grade_summary(request, course_id):
     return render_to_response('courseware/grade_summary.html', context)
 
 
+def _do_enroll_students(course, course_id, students, overload=False):
+    """Do the actual work of enrolling multiple students, presented as a string
+    of emails separated by commas or returns"""
+
+    ns = [x.split('\n') for x in students.split(',')]
+    new_students = [item for sublist in ns for item in sublist]
+    new_students = [str(s.strip()) for s in new_students]
+    new_students_lc = [x.lower() for x in new_students]
+
+    if '' in new_students:
+        new_students.remove('')
+
+    status = dict([x,'unprocessed'] for x in new_students)
+
+    if overload:	# delete all but staff
+        todelete = CourseEnrollment.objects.filter(course_id=course_id)
+        for ce in todelete:
+            if not has_access(ce.user, course, 'staff') and ce.user.email.lower() not in new_students_lc:
+                status[ce.user.email] = 'deleted'
+                ce.delete()
+            else:
+                status[ce.user.email] = 'is staff'
+        ceaset = CourseEnrollmentAllowed.objects.filter(course_id=course_id)
+        for cea in ceaset:
+            status[cea.email] = 'removed from pending enrollment list'
+        ceaset.delete()
+
+    for student in new_students:
+        try:
+            user=User.objects.get(email=student)
+        except User.DoesNotExist:
+            # user not signed up yet, put in pending enrollment allowed table
+            if CourseEnrollmentAllowed.objects.filter(email=student, course_id=course_id):
+                status[student] = 'user does not exist, enrollment already allowed, pending'
+                continue
+            cea = CourseEnrollmentAllowed(email=student, course_id=course_id)
+            cea.save()
+            status[student] = 'user does not exist, enrollment allowed, pending'
+            continue
+
+        if CourseEnrollment.objects.filter(user=user, course_id=course_id):
+            status[student] = 'already enrolled'
+            continue
+        try:
+            nce = CourseEnrollment(user=user, course_id=course_id)
+            nce.save()
+            status[student] = 'added'
+        except:
+            status[student] = 'rejected'
+
+    datatable = {'header': ['StudentEmail', 'action']}
+    datatable['data'] = [[x, status[x]] for x in status]
+    datatable['title'] = 'Enrollment of students'
+
+    def sf(stat): return [x for x in status if status[x]==stat]
+
+    data = dict(added=sf('added'), rejected=sf('rejected')+sf('exists'), 
+                deleted=sf('deleted'), datatable=datatable)
+
+    return data
+
+
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 def enroll_students(request, course_id):
@@ -473,22 +650,10 @@ def enroll_students(request, course_id):
     course = get_course_with_access(request.user, course_id, 'staff')
     existing_students = [ce.user.email for ce in CourseEnrollment.objects.filter(course_id=course_id)]
 
-    if 'new_students' in request.POST:
-        new_students = request.POST['new_students'].split('\n')
-    else:
-        new_students = []
-    new_students = [s.strip() for s in new_students]
-
-    added_students = []
-    rejected_students = []
-
-    for student in new_students:
-        try:
-            nce = CourseEnrollment(user=User.objects.get(email=student), course_id=course_id)
-            nce.save()
-            added_students.append(student)
-        except:
-            rejected_students.append(student)
+    new_students = request.POST.get('new_students')
+    ret = _do_enroll_students(course, course_id, new_students)
+    added_students = ret['added']
+    rejected_students = ret['rejected']
 
     return render_to_response("enroll_students.html", {'course': course_id,
                                                        'existing_students': existing_students,
diff --git a/lms/envs/dev.py b/lms/envs/dev.py
index 058c67fa4d..f5999bf52e 100644
--- a/lms/envs/dev.py
+++ b/lms/envs/dev.py
@@ -102,6 +102,10 @@ SUBDOMAIN_BRANDING = {
 
 COMMENTS_SERVICE_KEY = "PUT_YOUR_API_KEY_HERE"
 
+################################# mitx revision string  #####################
+
+MITX_VERSION_STRING = os.popen('cd %s; git describe' % REPO_ROOT).read().strip()
+
 ################################# Staff grading config  #####################
 
 STAFF_GRADING_INTERFACE = {
diff --git a/lms/templates/courseware/instructor_dashboard.html b/lms/templates/courseware/instructor_dashboard.html
index 74bc25fcbe..bb0dcef970 100644
--- a/lms/templates/courseware/instructor_dashboard.html
+++ b/lms/templates/courseware/instructor_dashboard.html
@@ -57,10 +57,13 @@ function goto( mode)
             <a href="#" onclick="goto('Psychometrics');" class="${modeflag.get('Psychometrics')}">Psychometrics</a> | 
           %endif
           <a href="#" onclick="goto('Admin');" class="${modeflag.get('Admin')}">Admin</a> |
-          <a href="#" onclick="goto('Forum Admin');" class="${modeflag.get('Forum Admin')}">Forum Admin</a> ]
+          <a href="#" onclick="goto('Forum Admin');" class="${modeflag.get('Forum Admin')}">Forum Admin</a> |
+          <a href="#" onclick="goto('Enrollment');" class="${modeflag.get('Enrollment')}">Enrollment</a>
+	 ]
     </h2>
 
-  <div style="text-align:right" id="djangopid">${djangopid}</div>
+  <div style="text-align:right"><span id="djangopid">${djangopid}</span>
+  | <span id="mitxver">${mitx_version}</span></div>
 
     <form name="idashform" method="POST">
     <input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }">
@@ -163,10 +166,52 @@ function goto( mode)
   %endif
 %endif
 
+##----------------------------------------------------------------------------- 
+%if modeflag.get('Enrollment'):
+
+    <hr width="40%" style="align:left">
+    <p>
+    <input type="submit" name="action" value="List enrolled students">
+    <input type="submit" name="action" value="List students who may enroll but may not have yet signed up">
+    <p>
+    Student Email: <input type="text" name="enstudent"> <input type="submit" name="action" value="Un-enroll student">
+    <input type="submit" name="action" value="Enroll student">
+    <input type="submit" name="action" value="Un-enroll ALL students">
+    <hr width="40%" style="align:left">
+
+  %if settings.MITX_FEATURES.get('REMOTE_GRADEBOOK_URL','') and instructor_access:
+  
+    <%
+        rg = course.metadata.get('remote_gradebook',{})
+    %>
+
+    <p>Pull enrollment from remote gradebook</p>
+    <ul>
+    <li>Gradebook name: <input type="text" name="gradebook_name" size=40 value="${rg.get('name','')}"></li>
+    <li>Section: <input type="text" name="gradebook_section" size=40 value="${rg.get('section','')}"></li>
+    </ul>
+    <input type="submit" name="action" value="List sections available in remote gradebook">
+    <input type="submit" name="action" value="List students in section in remote gradebook">
+    <input type="submit" name="action" value="Overload enrollment list using remote gradebook">
+    <input type="submit" name="action" value="Merge enrollment list with remote gradebook">
+    <hr width="40%" style="align:left">
+  
+  %endif
+
+  <p>Add students: enter emails, separated by returns or commas;</p>
+  <textarea rows="6" cols="70" name="enroll_multiple"></textarea>
+  <input type="submit" name="action" value="Enroll multiple students">
+
+%endif
+
+##----------------------------------------------------------------------------- 
+
     </form>
 
 ##----------------------------------------------------------------------------- 
-%if modeflag.get('Psychometrics') is None:
+##----------------------------------------------------------------------------- 
+
+%if datatable and modeflag.get('Psychometrics') is None:
 
     <br/>
     <br/>

From 97fb05444922c6def563e5fb56c0f3d4599ea0a4 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@mit.edu>
Date: Mon, 7 Jan 2013 00:50:59 +0000
Subject: [PATCH 191/541] add export grades to remote gradebook to instructor
 dashboard

---
 lms/djangoapps/instructor/views.py            | 96 ++++++++++++++++---
 .../courseware/instructor_dashboard.html      | 38 +++++++-
 2 files changed, 119 insertions(+), 15 deletions(-)

diff --git a/lms/djangoapps/instructor/views.py b/lms/djangoapps/instructor/views.py
index b74fd495a1..b5caeac964 100644
--- a/lms/djangoapps/instructor/views.py
+++ b/lms/djangoapps/instructor/views.py
@@ -8,6 +8,8 @@ import os
 import requests
 import urllib
 
+from StringIO import StringIO
+
 from django.conf import settings
 from django.contrib.auth.models import User, Group
 from django.http import HttpResponse
@@ -77,9 +79,12 @@ def instructor_dashboard(request, course_id):
         data.append(['metadata', escape(str(course.metadata))])
     datatable['data'] = data
 
-    def return_csv(fn, datatable):
-        response = HttpResponse(mimetype='text/csv')
-        response['Content-Disposition'] = 'attachment; filename={0}'.format(fn)
+    def return_csv(fn, datatable, fp=None):
+        if fp is None:
+            response = HttpResponse(mimetype='text/csv')
+            response['Content-Disposition'] = 'attachment; filename={0}'.format(fn)
+        else:
+            response = fp
         writer = csv.writer(response, dialect='excel', quotechar='"', quoting=csv.QUOTE_ALL)
         writer.writerow(datatable['header'])
         for datarow in datatable['data']:
@@ -160,6 +165,65 @@ def instructor_dashboard(request, course_id):
         track.views.server_track(request, 'dump-answer-dist-csv', {}, page='idashboard')
         return return_csv('answer_dist_{0}.csv'.format(course_id), get_answers_distribution(request, course_id))
 
+    #----------------------------------------
+    # export grades to remote gradebook
+
+    elif action=='List assignments available in remote gradebook':
+        msg2, datatable = _do_remote_gradebook(request.user, course, 'get-assignments')
+        msg += msg2
+
+    elif action=='List assignments available for this course':
+        log.debug(action)
+        allgrades = get_student_grade_summary_data(request, course, course_id, get_grades=True)
+
+        assignments = [[x] for x in allgrades['assignments']]
+        datatable = {'header': ['Assignment Name']}
+        datatable['data'] = assignments
+        datatable['title'] = action
+
+        msg += 'assignments=<pre>%s</pre>' % assignments
+
+    elif action=='List enrolled students matching remote gradebook':
+        stud_data = get_student_grade_summary_data(request, course, course_id, get_grades=False)
+        msg2, rg_stud_data = _do_remote_gradebook(request.user, course, 'get-membership')
+        datatable = {'header': ['Student  email', 'Match?']}
+        rg_students = [ x['email'] for x in rg_stud_data['retdata'] ]
+        def domatch(x):
+            return '<font color="green">yes</font>' if x.email in rg_students else '<font color="red">No</font>'
+        datatable['data'] = [[x.email, domatch(x)] for x in stud_data['students']]
+        datatable['title'] = action
+
+    elif action in ['Display grades for assignment', 'Export grades for assignment to remote gradebook',
+                    'Export CSV file of grades for assignment']:
+
+        log.debug(action)
+        datatable = {}
+        aname = request.POST.get('assignment_name','')
+        if not aname:
+            msg += "<font color='red'>Please enter an assignment name</font>"
+        else:
+            allgrades = get_student_grade_summary_data(request, course, course_id, get_grades=True)
+            if aname not in allgrades['assignments']:
+                msg += "<font color='red'>Invalid assignment name '%s'</font>" % aname
+            else:
+                aidx = allgrades['assignments'].index(aname)
+                datatable = {'header': ['External email', aname]}
+                datatable['data'] = [[x.email, x.grades[aidx]] for x in allgrades['students']]
+                datatable['title'] = 'Grades for assignment "%s"' % aname
+
+                if 'Export CSV' in action:
+                    # generate and return CSV file
+                    return return_csv('grades %s.csv' % aname, datatable)
+
+                elif 'remote gradebook' in action:
+                    fp = StringIO()
+                    return_csv('', datatable, fp=fp)
+                    fp.seek(0)
+                    files = {'datafile': fp}
+                    msg2, dataset = _do_remote_gradebook(request.user, course, 'post-grades', files=files)
+                    msg += msg2
+
+
     #----------------------------------------
     # Admin
 
@@ -305,7 +369,7 @@ def instructor_dashboard(request, course_id):
 
     elif action == 'List sections available in remote gradebook':
 
-        msg2, datatable = _do_remote_gradebook(course, 'get-sections')
+        msg2, datatable = _do_remote_gradebook(request.user, course, 'get-sections')
         msg += msg2
 
     elif action in ['List students in section in remote gradebook', 
@@ -313,7 +377,7 @@ def instructor_dashboard(request, course_id):
                     'Merge enrollment list with remote gradebook']:
 
         section = request.POST.get('gradebook_section','')
-        msg2, datatable = _do_remote_gradebook(course, 'get-membership', dict(section=section) )
+        msg2, datatable = _do_remote_gradebook(request.user, course, 'get-membership', dict(section=section) )
         msg += msg2
 
         if not 'List' in action:
@@ -357,7 +421,7 @@ def instructor_dashboard(request, course_id):
     return render_to_response('courseware/instructor_dashboard.html', context)
 
 
-def _do_remote_gradebook(course, action, args=None):
+def _do_remote_gradebook(user, course, action, args=None, files=None):
     '''
     Perform remote gradebook action.  Returns msg, datatable.
     '''
@@ -378,11 +442,11 @@ def _do_remote_gradebook(course, action, args=None):
     
     if args is None:
         args = {}
-    data = dict(submit=action, gradebook=rgname)
+    data = dict(submit=action, gradebook=rgname, user=user.email)
     data.update(args)
 
     try:
-        resp = requests.post(rgurl, data=data, verify=False)
+        resp = requests.post(rgurl, data=data, verify=False, files=files)
         retdict = json.loads(resp.content)
     except Exception as err:
         msg = "Failed to communicate with gradebook server at %s<br/>" % rgurl
@@ -392,7 +456,7 @@ def _do_remote_gradebook(course, action, args=None):
         return msg, {}
 
     msg = '<pre>%s</pre>' % retdict['msg'].replace('\n','<br/>')
-    retdata = retdict['data']
+    retdata = retdict['data']	# a list of dicts
 
     if retdata:
         datatable = {'header': retdata[0].keys()}
@@ -495,16 +559,18 @@ def get_student_grade_summary_data(request, course, course_id, get_grades=True,
     enrolled_students = User.objects.filter(courseenrollment__course_id=course_id).prefetch_related("groups").order_by('username')
 
     header = ['ID', 'Username', 'Full Name', 'edX email', 'External email']
+    assignments = []
     if get_grades and enrolled_students.count() > 0:
         # just to construct the header
         gradeset = grades.grade(enrolled_students[0], request, course, keep_raw_scores=get_raw_scores)
         # log.debug('student {0} gradeset {1}'.format(enrolled_students[0], gradeset))
         if get_raw_scores:
-            header += [score.section for score in gradeset['raw_scores']]
+            assignments += [score.section for score in gradeset['raw_scores']]
         else:
-            header += [x['label'] for x in gradeset['section_breakdown']]
+            assignments += [x['label'] for x in gradeset['section_breakdown']]
+    header += assignments
 
-    datatable = {'header': header}
+    datatable = {'header': header, 'assignments': assignments, 'students': enrolled_students}
     data = []
 
     for student in enrolled_students:
@@ -518,9 +584,11 @@ def get_student_grade_summary_data(request, course, course_id, get_grades=True,
             gradeset = grades.grade(student, request, course, keep_raw_scores=get_raw_scores)
             # log.debug('student={0}, gradeset={1}'.format(student,gradeset))
             if get_raw_scores:
-                datarow += [score.earned for score in gradeset['raw_scores']]
+                student_grades = [score.earned for score in gradeset['raw_scores']]
             else:
-                datarow += [x['percent'] for x in gradeset['section_breakdown']]
+                student_grades = [x['percent'] for x in gradeset['section_breakdown']]
+            datarow += student_grades
+            student.grades = student_grades	# store in student object
 
         data.append(datarow)
     datatable['data'] = data
diff --git a/lms/templates/courseware/instructor_dashboard.html b/lms/templates/courseware/instructor_dashboard.html
index bb0dcef970..b2ec220484 100644
--- a/lms/templates/courseware/instructor_dashboard.html
+++ b/lms/templates/courseware/instructor_dashboard.html
@@ -96,6 +96,42 @@ function goto( mode)
     <p>
     <input type="submit" name="action" value="Download CSV of answer distributions">
     </p>
+    <hr width="40%" style="align:left">
+
+  %if settings.MITX_FEATURES.get('REMOTE_GRADEBOOK_URL','') and instructor_access:
+  
+    <%
+        rg = course.metadata.get('remote_gradebook',{})
+    %>
+
+    <h3>Export grades to remote gradebook</h3>
+    <p>The assignments defined for this course should match the ones
+    stored in the gradebook, for this to work properly!</p>
+
+    <ul>
+    <li>Gradebook name: <font color="green">${rg.get('name','None defined!')}</font>
+    <br/>
+    <br/>
+    <input type="submit" name="action" value="List assignments available in remote gradebook">
+    <input type="submit" name="action" value="List enrolled students matching remote gradebook">
+    <br/>
+    <br/>
+    </li>
+    <li><input type="submit" name="action" value="List assignments available for this course">
+    <br/>
+    <br/>
+    </li>
+    <li>Assignment name: <input type="text" name="assignment_name" size=40 >
+    <br/>
+    <br/>
+    <input type="submit" name="action" value="Display grades for assignment">
+    <input type="submit" name="action" value="Export grades for assignment to remote gradebook">
+    <input type="submit" name="action" value="Export CSV file of grades for assignment">
+    </li>
+    </ul>
+
+  %endif
+
  %endif
 
 ##----------------------------------------------------------------------------- 
@@ -187,7 +223,7 @@ function goto( mode)
 
     <p>Pull enrollment from remote gradebook</p>
     <ul>
-    <li>Gradebook name: <input type="text" name="gradebook_name" size=40 value="${rg.get('name','')}"></li>
+    <li>Gradebook name: <font color="green">${rg.get('name','None defined!')}</font>
     <li>Section: <input type="text" name="gradebook_section" size=40 value="${rg.get('section','')}"></li>
     </ul>
     <input type="submit" name="action" value="List sections available in remote gradebook">

From 82e31d533b1640836b683e9f408b8d9afb5cc6e7 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@mit.edu>
Date: Mon, 7 Jan 2013 02:03:27 +0000
Subject: [PATCH 192/541] Hookup CourseEnrollmentAllowed to
 lms/djangoapps/courseware/access.py

---
 lms/djangoapps/courseware/access.py |  6 ++++++
 lms/djangoapps/instructor/views.py  | 23 ++++++++++++-----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/lms/djangoapps/courseware/access.py b/lms/djangoapps/courseware/access.py
index ba9b8a3bc0..0d4a37eda5 100644
--- a/lms/djangoapps/courseware/access.py
+++ b/lms/djangoapps/courseware/access.py
@@ -5,6 +5,8 @@ like DISABLE_START_DATES"""
 import logging
 import time
 
+import student.models
+
 from django.conf import settings
 
 from xmodule.course_module import CourseDescriptor
@@ -124,6 +126,10 @@ def _has_access_course_desc(user, course, action):
             debug("Allow: in enrollment period")
             return True
 
+        # if user is in CourseEnrollmentAllowed with right course_id then can also enroll
+        if user is not None and student.models.CourseEnrollmentAllowed.objects.filter(email=user.email, course_id=course.id):
+            return True
+
         # otherwise, need staff access
         return _has_staff_access_to_descriptor(user, course)
 
diff --git a/lms/djangoapps/instructor/views.py b/lms/djangoapps/instructor/views.py
index b5caeac964..0ea3cf0435 100644
--- a/lms/djangoapps/instructor/views.py
+++ b/lms/djangoapps/instructor/views.py
@@ -335,26 +335,27 @@ def instructor_dashboard(request, course_id):
     elif action == 'Enroll student':
 
         student = request.POST.get('enstudent','')
-        datatable = {}
-        try:
-            nce = CourseEnrollment(user=User.objects.get(email=student), course_id=course_id)
-            nce.save()
-            msg += "Enrolled student with email '%s'" % student
-        except Exception as err:
-            msg += "Error!  Failed to enroll student with email '%s'\n" % student
-            msg += str(err) + '\n'
+        ret = _do_enroll_students(course, course_id, student)
+        datatable = ret['datatable']
 
     elif action == 'Un-enroll student':
 
         student = request.POST.get('enstudent','')
         datatable = {}
+        isok = False
+        cea = CourseEnrollmentAllowed.objects.filter(course_id=course_id, email=student)
+        if cea:
+            cea.delete()
+            msg += "Un-enrolled student with email '%s'" % student
+            isok = True
         try:
             nce = CourseEnrollment.objects.get(user=User.objects.get(email=student), course_id=course_id)
             nce.delete()
             msg += "Un-enrolled student with email '%s'" % student
         except Exception as err:
-            msg += "Error!  Failed to un-enroll student with email '%s'\n" % student
-            msg += str(err) + '\n'
+            if not isok:
+                msg += "Error!  Failed to un-enroll student with email '%s'\n" % student
+                msg += str(err) + '\n'
 
     elif action == 'Un-enroll ALL students':
 
@@ -582,7 +583,7 @@ def get_student_grade_summary_data(request, course, course_id, get_grades=True,
 
         if get_grades:
             gradeset = grades.grade(student, request, course, keep_raw_scores=get_raw_scores)
-            # log.debug('student={0}, gradeset={1}'.format(student,gradeset))
+            log.debug('student={0}, gradeset={1}'.format(student,gradeset))
             if get_raw_scores:
                 student_grades = [score.earned for score in gradeset['raw_scores']]
             else:

From 04d6f08c0cd4c901649c90edc0bca71424e2af7b Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@mit.edu>
Date: Mon, 7 Jan 2013 04:17:02 +0000
Subject: [PATCH 193/541] add offline grade computation & DB table for this

---
 common/djangoapps/student/admin.py            |   2 +
 lms/djangoapps/courseware/access.py           |  14 ++-
 lms/djangoapps/courseware/admin.py            |   5 +
 ..._add_unique_offlinecomputedgrade_user_c.py | 117 ++++++++++++++++++
 lms/djangoapps/courseware/models.py           |  37 ++++++
 .../management/commands/compute_grades.py     |  50 ++++++++
 .../instructor/offline_gradecalc.py           | 103 +++++++++++++++
 lms/djangoapps/instructor/views.py            |  56 ++++++---
 .../courseware/instructor_dashboard.html      |   6 +
 9 files changed, 367 insertions(+), 23 deletions(-)
 create mode 100644 lms/djangoapps/courseware/migrations/0005_auto__add_offlinecomputedgrade__add_unique_offlinecomputedgrade_user_c.py
 create mode 100644 lms/djangoapps/instructor/management/commands/compute_grades.py
 create mode 100644 lms/djangoapps/instructor/offline_gradecalc.py

diff --git a/common/djangoapps/student/admin.py b/common/djangoapps/student/admin.py
index ec3b708ca7..64fe844801 100644
--- a/common/djangoapps/student/admin.py
+++ b/common/djangoapps/student/admin.py
@@ -12,6 +12,8 @@ admin.site.register(UserTestGroup)
 
 admin.site.register(CourseEnrollment)
 
+admin.site.register(CourseEnrollmentAllowed)
+
 admin.site.register(Registration)
 
 admin.site.register(PendingNameChange)
diff --git a/lms/djangoapps/courseware/access.py b/lms/djangoapps/courseware/access.py
index 0d4a37eda5..b58f8d5470 100644
--- a/lms/djangoapps/courseware/access.py
+++ b/lms/djangoapps/courseware/access.py
@@ -5,8 +5,6 @@ like DISABLE_START_DATES"""
 import logging
 import time
 
-import student.models
-
 from django.conf import settings
 
 from xmodule.course_module import CourseDescriptor
@@ -15,6 +13,13 @@ from xmodule.modulestore import Location
 from xmodule.timeparse import parse_time
 from xmodule.x_module import XModule, XModuleDescriptor
 
+# student.models imports Role, which imports courseware.access ; use a try, to break the circular import
+try:
+    from student.models import CourseEnrollmentAllowed
+except Exception as err:
+    CourseEnrollmentAllowed = None
+
+
 DEBUG_ACCESS = False
 
 log = logging.getLogger(__name__)
@@ -127,8 +132,9 @@ def _has_access_course_desc(user, course, action):
             return True
 
         # if user is in CourseEnrollmentAllowed with right course_id then can also enroll
-        if user is not None and student.models.CourseEnrollmentAllowed.objects.filter(email=user.email, course_id=course.id):
-            return True
+        if user is not None and CourseEnrollmentAllowed:
+            if CourseEnrollmentAllowed.objects.filter(email=user.email, course_id=course.id):
+                return True
 
         # otherwise, need staff access
         return _has_staff_access_to_descriptor(user, course)
diff --git a/lms/djangoapps/courseware/admin.py b/lms/djangoapps/courseware/admin.py
index cda4fbb788..f7e54d1800 100644
--- a/lms/djangoapps/courseware/admin.py
+++ b/lms/djangoapps/courseware/admin.py
@@ -7,3 +7,8 @@ from django.contrib import admin
 from django.contrib.auth.models import User
 
 admin.site.register(StudentModule)
+
+admin.site.register(OfflineComputedGrade)
+
+admin.site.register(OfflineComputedGradeLog)
+
diff --git a/lms/djangoapps/courseware/migrations/0005_auto__add_offlinecomputedgrade__add_unique_offlinecomputedgrade_user_c.py b/lms/djangoapps/courseware/migrations/0005_auto__add_offlinecomputedgrade__add_unique_offlinecomputedgrade_user_c.py
new file mode 100644
index 0000000000..674f97cec8
--- /dev/null
+++ b/lms/djangoapps/courseware/migrations/0005_auto__add_offlinecomputedgrade__add_unique_offlinecomputedgrade_user_c.py
@@ -0,0 +1,117 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'OfflineComputedGrade'
+        db.create_table('courseware_offlinecomputedgrade', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+            ('course_id', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)),
+            ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, null=True, db_index=True, blank=True)),
+            ('updated', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, db_index=True, blank=True)),
+            ('gradeset', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+        ))
+        db.send_create_signal('courseware', ['OfflineComputedGrade'])
+
+        # Adding unique constraint on 'OfflineComputedGrade', fields ['user', 'course_id']
+        db.create_unique('courseware_offlinecomputedgrade', ['user_id', 'course_id'])
+
+        # Adding model 'OfflineComputedGradeLog'
+        db.create_table('courseware_offlinecomputedgradelog', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('course_id', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)),
+            ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, null=True, db_index=True, blank=True)),
+            ('seconds', self.gf('django.db.models.fields.IntegerField')(default=0)),
+            ('nstudents', self.gf('django.db.models.fields.IntegerField')(default=0)),
+        ))
+        db.send_create_signal('courseware', ['OfflineComputedGradeLog'])
+
+
+    def backwards(self, orm):
+        # Removing unique constraint on 'OfflineComputedGrade', fields ['user', 'course_id']
+        db.delete_unique('courseware_offlinecomputedgrade', ['user_id', 'course_id'])
+
+        # Deleting model 'OfflineComputedGrade'
+        db.delete_table('courseware_offlinecomputedgrade')
+
+        # Deleting model 'OfflineComputedGradeLog'
+        db.delete_table('courseware_offlinecomputedgradelog')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'courseware.offlinecomputedgrade': {
+            'Meta': {'unique_together': "(('user', 'course_id'),)", 'object_name': 'OfflineComputedGrade'},
+            'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'gradeset': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'courseware.offlinecomputedgradelog': {
+            'Meta': {'object_name': 'OfflineComputedGradeLog'},
+            'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nstudents': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'seconds': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+        },
+        'courseware.studentmodule': {
+            'Meta': {'unique_together': "(('student', 'module_state_key', 'course_id'),)", 'object_name': 'StudentModule'},
+            'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'done': ('django.db.models.fields.CharField', [], {'default': "'na'", 'max_length': '8', 'db_index': 'True'}),
+            'grade': ('django.db.models.fields.FloatField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max_grade': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'module_state_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_column': "'module_id'", 'db_index': 'True'}),
+            'module_type': ('django.db.models.fields.CharField', [], {'default': "'problem'", 'max_length': '32', 'db_index': 'True'}),
+            'state': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        }
+    }
+
+    complete_apps = ['courseware']
\ No newline at end of file
diff --git a/lms/djangoapps/courseware/models.py b/lms/djangoapps/courseware/models.py
index ffc7c929de..21ef8b3d66 100644
--- a/lms/djangoapps/courseware/models.py
+++ b/lms/djangoapps/courseware/models.py
@@ -177,3 +177,40 @@ class StudentModuleCache(object):
 
     def append(self, student_module):
         self.cache.append(student_module)
+
+
+class OfflineComputedGrade(models.Model):
+    """
+    Table of grades computed offline for a given user and course.
+    """
+    user = models.ForeignKey(User, db_index=True)
+    course_id = models.CharField(max_length=255, db_index=True)
+
+    created = models.DateTimeField(auto_now_add=True, null=True, db_index=True)
+    updated = models.DateTimeField(auto_now=True, db_index=True)
+
+    gradeset = models.TextField(null=True, blank=True)		# grades, stored as JSON
+
+    class Meta:
+        unique_together = (('user', 'course_id'), )
+
+    def __unicode__(self):
+        return "[OfflineComputedGrade] %s: %s (%s) = %s" % (self.user, self.course_id, self.created, self.gradeset)
+
+
+class OfflineComputedGradeLog(models.Model):
+    """
+    Log of when offline grades are computed.
+    Use this to be able to show instructor when the last computed grades were done.
+    """
+    class Meta:
+        ordering = ["-created"]
+        get_latest_by = "created"
+
+    course_id = models.CharField(max_length=255, db_index=True)
+    created = models.DateTimeField(auto_now_add=True, null=True, db_index=True)
+    seconds = models.IntegerField(default=0)	# seconds elapsed for computation
+    nstudents = models.IntegerField(default=0)
+
+    def __unicode__(self):
+        return "[OCGLog] %s: %s" % (self.course_id, self.created)
diff --git a/lms/djangoapps/instructor/management/commands/compute_grades.py b/lms/djangoapps/instructor/management/commands/compute_grades.py
new file mode 100644
index 0000000000..717bfd5802
--- /dev/null
+++ b/lms/djangoapps/instructor/management/commands/compute_grades.py
@@ -0,0 +1,50 @@
+#!/usr/bin/python
+#
+# django management command: dump grades to csv files
+# for use by batch processes
+
+import os, sys, string
+import datetime
+import json
+
+#import student.models
+from instructor.offline_gradecalc import *
+from courseware.courses import get_course_by_id
+from xmodule.modulestore.django import modulestore
+
+from django.conf import settings
+from django.core.management.base import BaseCommand
+
+class Command(BaseCommand):
+    help = "Compute grades for all students in a course, and store result in DB.\n"
+    help += "Usage: compute_grades course_id_or_dir \n"
+    help += "   course_id_or_dir: either course_id or course_dir\n"
+
+    def handle(self, *args, **options):
+
+        print "args = ", args
+
+        course_id = 'MITx/8.01rq_MW/Classical_Mechanics_Reading_Questions_Fall_2012_MW_Section'
+
+        if len(args)>0:
+            course_id = args[0]
+
+        try:
+            course = get_course_by_id(course_id)
+        except Exception as err:
+            if course_id in modulestore().courses:
+                course = modulestore().courses[course_id]
+            else:
+                print "-----------------------------------------------------------------------------"
+                print "Sorry, cannot find course %s" % course_id
+                print "Please provide a course ID or course data directory name, eg content-mit-801rq"
+                return
+
+        print "-----------------------------------------------------------------------------"
+        print "Computing grades for %s" % (course.id)
+
+        offline_grade_calculation(course.id)
+
+
+    
+        
diff --git a/lms/djangoapps/instructor/offline_gradecalc.py b/lms/djangoapps/instructor/offline_gradecalc.py
new file mode 100644
index 0000000000..7c102805b4
--- /dev/null
+++ b/lms/djangoapps/instructor/offline_gradecalc.py
@@ -0,0 +1,103 @@
+# ======== Offline calculation of grades =============================================================================
+#
+# Computing grades of a large number of students can take a long time.  These routines allow grades to
+# be computed offline, by a batch process (eg cronjob).
+#
+# The grades are stored in the OfflineComputedGrade table of the courseware model.
+
+import json
+import logging
+import time
+
+import courseware.models
+
+from collections import namedtuple
+from json import JSONEncoder
+from courseware import grades, models
+from courseware.courses import get_course_by_id
+from django.contrib.auth.models import User, Group
+
+
+class MyEncoder(JSONEncoder):
+
+    def _iterencode(self, obj, markers=None):
+        if isinstance(obj, tuple) and hasattr(obj, '_asdict'):
+            gen = self._iterencode_dict(obj._asdict(), markers)
+        else:
+            gen = JSONEncoder._iterencode(self, obj, markers)
+        for chunk in gen:
+            yield chunk
+
+
+def offline_grade_calculation(course_id):
+    '''
+    Compute grades for all students for a specified course, and save results to the DB.  
+    '''
+
+    tstart = time.time()
+    enrolled_students = User.objects.filter(courseenrollment__course_id=course_id).prefetch_related("groups").order_by('username')
+
+    enc = MyEncoder()
+
+    class DummyRequest(object):
+        META = {}
+        def __init__(self):
+            return
+        def get_host(self):
+            return 'edx.mit.edu'
+        def is_secure(self):
+            return False
+
+    request = DummyRequest()
+
+    print "%d enrolled students" % len(enrolled_students)
+    course = get_course_by_id(course_id)
+
+    for student in enrolled_students:
+        gradeset = grades.grade(student, request, course, keep_raw_scores=True)
+        gs = enc.encode(gradeset)
+        ocg, created = models.OfflineComputedGrade.objects.get_or_create(user=student, course_id=course_id)
+        ocg.gradeset = gs
+        ocg.save()
+        print "%s done" % student	# print statement used because this is run by a management command
+
+    tend = time.time()
+    dt = tend - tstart
+    
+    ocgl = models.OfflineComputedGradeLog(course_id=course_id, seconds=dt, nstudents=len(enrolled_students))
+    ocgl.save()
+    print ocgl
+    print "All Done!"
+    
+
+def offline_grades_available(course_id):
+    '''
+    Returns False if no offline grades available for specified course.
+    Otherwise returns latest log field entry about the available pre-computed grades.
+    '''
+    ocgl = models.OfflineComputedGradeLog.objects.filter(course_id=course_id)
+    if not ocgl:
+        return False
+    return ocgl.latest('created')
+
+    
+def student_grades(student, request, course, keep_raw_scores=False, use_offline=False):
+    '''
+    This is the main interface to get grades.  It has the same parameters as grades.grade, as well
+    as use_offline.  If use_offline is True then this will look for an offline computed gradeset in the DB.
+    '''
+
+    if not use_offline:
+        return grades.grade(student, request, course, keep_raw_scores=keep_raw_scores)
+    
+    try:
+        ocg = models.OfflineComputedGrade.objects.get(user=student, course_id=course.id)
+    except models.OfflineComputedGrade.DoesNotExist:
+        return dict(raw_scores=[], section_breakdown=[], 
+                    msg='Error: no offline gradeset available for %s, %s' % (student, course.id))
+    
+    return json.loads(ocg.gradeset)
+
+
+        
+
diff --git a/lms/djangoapps/instructor/views.py b/lms/djangoapps/instructor/views.py
index 0ea3cf0435..2e8db884ff 100644
--- a/lms/djangoapps/instructor/views.py
+++ b/lms/djangoapps/instructor/views.py
@@ -32,7 +32,8 @@ from xmodule.modulestore.exceptions import InvalidLocationError, ItemNotFoundErr
 from xmodule.modulestore.search import path_to_location
 import track.views
 
-
+from .grading import StaffGrading
+from .offline_gradecalc import student_grades, offline_grades_available
 
 log = logging.getLogger(__name__)
 
@@ -103,6 +104,7 @@ def instructor_dashboard(request, course_id):
 
     # process actions from form POST
     action = request.POST.get('action', '')
+    use_offline = request.POST.get('use_offline_grades',False)
 
     if settings.MITX_FEATURES['ENABLE_MANUAL_GIT_RELOAD']:
         if 'GIT pull' in action:
@@ -134,32 +136,32 @@ def instructor_dashboard(request, course_id):
 
     if action == 'Dump list of enrolled students' or action=='List enrolled students':
         log.debug(action)
-        datatable = get_student_grade_summary_data(request, course, course_id, get_grades=False)
+        datatable = get_student_grade_summary_data(request, course, course_id, get_grades=False, use_offline=use_offline)
         datatable['title'] = 'List of students enrolled in {0}'.format(course_id)
         track.views.server_track(request, 'list-students', {}, page='idashboard')
 
     elif 'Dump Grades' in action:
         log.debug(action)
-        datatable = get_student_grade_summary_data(request, course, course_id, get_grades=True)
+        datatable = get_student_grade_summary_data(request, course, course_id, get_grades=True, use_offline=use_offline)
         datatable['title'] = 'Summary Grades of students enrolled in {0}'.format(course_id)
         track.views.server_track(request, 'dump-grades', {}, page='idashboard')
 
     elif 'Dump all RAW grades' in action:
         log.debug(action)
         datatable = get_student_grade_summary_data(request, course, course_id, get_grades=True,
-                                                   get_raw_scores=True)
+                                                   get_raw_scores=True, use_offline=use_offline)
         datatable['title'] = 'Raw Grades of students enrolled in {0}'.format(course_id)
         track.views.server_track(request, 'dump-grades-raw', {}, page='idashboard')
 
     elif 'Download CSV of all student grades' in action:
         track.views.server_track(request, 'dump-grades-csv', {}, page='idashboard')
         return return_csv('grades_{0}.csv'.format(course_id),
-                          get_student_grade_summary_data(request, course, course_id))
+                          get_student_grade_summary_data(request, course, course_id, use_offline=use_offline))
 
     elif 'Download CSV of all RAW grades' in action:
         track.views.server_track(request, 'dump-grades-csv-raw', {}, page='idashboard')
         return return_csv('grades_{0}_raw.csv'.format(course_id),
-                          get_student_grade_summary_data(request, course, course_id, get_raw_scores=True))
+                          get_student_grade_summary_data(request, course, course_id, get_raw_scores=True, use_offline=use_offline))
 
     elif 'Download CSV of answer distributions' in action:
         track.views.server_track(request, 'dump-answer-dist-csv', {}, page='idashboard')
@@ -174,7 +176,7 @@ def instructor_dashboard(request, course_id):
 
     elif action=='List assignments available for this course':
         log.debug(action)
-        allgrades = get_student_grade_summary_data(request, course, course_id, get_grades=True)
+        allgrades = get_student_grade_summary_data(request, course, course_id, get_grades=True, use_offline=use_offline)
 
         assignments = [[x] for x in allgrades['assignments']]
         datatable = {'header': ['Assignment Name']}
@@ -184,7 +186,7 @@ def instructor_dashboard(request, course_id):
         msg += 'assignments=<pre>%s</pre>' % assignments
 
     elif action=='List enrolled students matching remote gradebook':
-        stud_data = get_student_grade_summary_data(request, course, course_id, get_grades=False)
+        stud_data = get_student_grade_summary_data(request, course, course_id, get_grades=False, use_offline=use_offline)
         msg2, rg_stud_data = _do_remote_gradebook(request.user, course, 'get-membership')
         datatable = {'header': ['Student  email', 'Match?']}
         rg_students = [ x['email'] for x in rg_stud_data['retdata'] ]
@@ -202,7 +204,7 @@ def instructor_dashboard(request, course_id):
         if not aname:
             msg += "<font color='red'>Please enter an assignment name</font>"
         else:
-            allgrades = get_student_grade_summary_data(request, course, course_id, get_grades=True)
+            allgrades = get_student_grade_summary_data(request, course, course_id, get_grades=True, use_offline=use_offline)
             if aname not in allgrades['assignments']:
                 msg += "<font color='red'>Invalid assignment name '%s'</font>" % aname
             else:
@@ -401,6 +403,12 @@ def instructor_dashboard(request, course_id):
         problems = psychoanalyze.problems_with_psychometric_data(course_id)
 
 
+    #----------------------------------------
+    # offline grades?
+    
+    if use_offline:
+        msg += "<br/><font color='orange'>Grades from %s</font>" % offline_grades_available(course_id)
+
     #----------------------------------------
     # context for rendering
 
@@ -416,7 +424,8 @@ def instructor_dashboard(request, course_id):
                'plots': plots,			# psychometrics
                'course_errors': modulestore().get_item_errors(course.location),
                'djangopid' : os.getpid(),
-               'mitx_version' : getattr(settings,'MITX_VERSION_STRING','')
+               'mitx_version' : getattr(settings,'MITX_VERSION_STRING',''),
+               'offline_grade_log' : offline_grades_available(course_id),
                }
 
     return render_to_response('courseware/instructor_dashboard.html', context)
@@ -539,7 +548,7 @@ def _update_forum_role_membership(uname, course, rolename, add_or_remove):
     return msg
     
 
-def get_student_grade_summary_data(request, course, course_id, get_grades=True, get_raw_scores=False):
+def get_student_grade_summary_data(request, course, course_id, get_grades=True, get_raw_scores=False, use_offline=False):
     '''
     Return data arrays with student identity and grades for specified course.
 
@@ -563,7 +572,7 @@ def get_student_grade_summary_data(request, course, course_id, get_grades=True,
     assignments = []
     if get_grades and enrolled_students.count() > 0:
         # just to construct the header
-        gradeset = grades.grade(enrolled_students[0], request, course, keep_raw_scores=get_raw_scores)
+        gradeset = student_grades(enrolled_students[0], request, course, keep_raw_scores=get_raw_scores, use_offline=use_offline)
         # log.debug('student {0} gradeset {1}'.format(enrolled_students[0], gradeset))
         if get_raw_scores:
             assignments += [score.section for score in gradeset['raw_scores']]
@@ -582,20 +591,22 @@ def get_student_grade_summary_data(request, course, course_id, get_grades=True,
             datarow.append('')
 
         if get_grades:
-            gradeset = grades.grade(student, request, course, keep_raw_scores=get_raw_scores)
+            gradeset = student_grades(student, request, course, keep_raw_scores=get_raw_scores, use_offline=use_offline)
             log.debug('student={0}, gradeset={1}'.format(student,gradeset))
             if get_raw_scores:
-                student_grades = [score.earned for score in gradeset['raw_scores']]
+                # TODO (ichuang) encode Score as dict instead of as list, so score[0] -> score['earned']
+                sgrades = [(getattr(score,'earned','') or score[0]) for score in gradeset['raw_scores']]
             else:
-                student_grades = [x['percent'] for x in gradeset['section_breakdown']]
-            datarow += student_grades
-            student.grades = student_grades	# store in student object
+                sgrades = [x['percent'] for x in gradeset['section_breakdown']]
+            datarow += sgrades
+            student.grades = sgrades	# store in student object
 
         data.append(datarow)
     datatable['data'] = data
     return datatable
 
-
+#-----------------------------------------------------------------------------
+# Staff grading
 
 
 
@@ -616,7 +627,7 @@ def gradebook(request, course_id):
     student_info = [{'username': student.username,
                      'id': student.id,
                      'email': student.email,
-                     'grade_summary': grades.grade(student, request, course),
+                     'grade_summary': student_grades(student, request, course),
                      'realname': student.profile.name,
                      }
                      for student in enrolled_students]
@@ -639,6 +650,10 @@ def grade_summary(request, course_id):
     return render_to_response('courseware/grade_summary.html', context)
 
 
+#-----------------------------------------------------------------------------
+# enrollment
+
+
 def _do_enroll_students(course, course_id, students, overload=False):
     """Do the actual work of enrolling multiple students, presented as a string
     of emails separated by commas or returns"""
@@ -731,6 +746,9 @@ def enroll_students(request, course_id):
                                                        'debug': new_students})
 
 
+#-----------------------------------------------------------------------------
+# answer distribution
+
 def get_answers_distribution(request, course_id):
     """
     Get the distribution of answers for all graded problems in the course.
diff --git a/lms/templates/courseware/instructor_dashboard.html b/lms/templates/courseware/instructor_dashboard.html
index b2ec220484..235505fc29 100644
--- a/lms/templates/courseware/instructor_dashboard.html
+++ b/lms/templates/courseware/instructor_dashboard.html
@@ -71,6 +71,12 @@ function goto( mode)
 
 ##----------------------------------------------------------------------------- 
 %if modeflag.get('Grades'):
+
+    %if offline_grade_log:
+      <p><font color='orange'>Pre-computed grades ${offline_grade_log} available: Use?
+          <input type='checkbox' name='use_offline_grades' value='yes'></font> </p>
+    %endif
+
     <p>
     <a href="${reverse('gradebook', kwargs=dict(course_id=course.id))}">Gradebook</a>
     </p>

From 16b91cf73277e900ad746deba1ba25bd0a027f34 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@mit.edu>
Date: Mon, 7 Jan 2013 04:35:55 +0000
Subject: [PATCH 194/541] remove spurious old migration file

---
 .../migrations/0021_remove_askbot.py.old      | 157 ------------------
 1 file changed, 157 deletions(-)
 delete mode 100644 common/djangoapps/student/migrations/0021_remove_askbot.py.old

diff --git a/common/djangoapps/student/migrations/0021_remove_askbot.py.old b/common/djangoapps/student/migrations/0021_remove_askbot.py.old
deleted file mode 100644
index 89f7208f40..0000000000
--- a/common/djangoapps/student/migrations/0021_remove_askbot.py.old
+++ /dev/null
@@ -1,157 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-ASKBOT_AUTH_USER_COLUMNS = (
-    'website',
-    'about',
-    'gold',
-    'email_isvalid',
-    'real_name',
-    'location',
-    'reputation',
-    'gravatar',
-    'bronze',
-    'last_seen',
-    'silver',
-    'questions_per_page',
-    'new_response_count',
-    'seen_response_count',
-)
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        "Kill the askbot"
-        # For MySQL, we're batching the alters together for performance reasons
-        if db.backend_name == 'mysql':
-            drops = ["drop `{0}`".format(col) for col in ASKBOT_AUTH_USER_COLUMNS]
-            statement = "alter table `auth_user` {0};".format(", ".join(drops))
-            db.execute(statement)
-        else:
-            for column in ASKBOT_AUTH_USER_COLUMNS:
-                db.delete_column('auth_user', column)            
-
-    def backwards(self, orm):
-        raise RuntimeError("Cannot reverse this migration: there's no going back to Askbot.")
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'student.courseenrollment': {
-            'Meta': {'unique_together': "(('user', 'course_id'),)", 'object_name': 'CourseEnrollment'},
-            'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
-        },
-        'student.pendingemailchange': {
-            'Meta': {'object_name': 'PendingEmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'})
-        },
-        'student.pendingnamechange': {
-            'Meta': {'object_name': 'PendingNameChange'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'rationale': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'})
-        },
-        'student.registration': {
-            'Meta': {'object_name': 'Registration', 'db_table': "'auth_registration'"},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'unique': 'True'})
-        },
-        'student.testcenteruser': {
-            'Meta': {'object_name': 'TestCenterUser'},
-            'address_1': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'address_2': ('django.db.models.fields.CharField', [], {'max_length': '40', 'blank': 'True'}),
-            'address_3': ('django.db.models.fields.CharField', [], {'max_length': '40', 'blank': 'True'}),
-            'candidate_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'db_index': 'True'}),
-            'city': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'}),
-            'client_candidate_id': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
-            'company_name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
-            'country': ('django.db.models.fields.CharField', [], {'max_length': '3', 'db_index': 'True'}),
-            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
-            'extension': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '8', 'blank': 'True'}),
-            'fax': ('django.db.models.fields.CharField', [], {'max_length': '35', 'blank': 'True'}),
-            'fax_country_code': ('django.db.models.fields.CharField', [], {'max_length': '3', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
-            'middle_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'phone': ('django.db.models.fields.CharField', [], {'max_length': '35'}),
-            'phone_country_code': ('django.db.models.fields.CharField', [], {'max_length': '3', 'db_index': 'True'}),
-            'postal_code': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '16', 'blank': 'True'}),
-            'salutation': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
-            'state': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '20', 'blank': 'True'}),
-            'suffix': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['auth.User']", 'unique': 'True'}),
-            'user_updated_at': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'})
-        },
-        'student.userprofile': {
-            'Meta': {'object_name': 'UserProfile', 'db_table': "'auth_userprofile'"},
-            'courseware': ('django.db.models.fields.CharField', [], {'default': "'course.xml'", 'max_length': '255', 'blank': 'True'}),
-            'gender': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '6', 'null': 'True', 'blank': 'True'}),
-            'goals': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'language': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
-            'level_of_education': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '6', 'null': 'True', 'blank': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
-            'mailing_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'meta': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'profile'", 'unique': 'True', 'to': "orm['auth.User']"}),
-            'year_of_birth': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'})
-        },
-        'student.usertestgroup': {
-            'Meta': {'object_name': 'UserTestGroup'},
-            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'}),
-            'users': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.User']", 'db_index': 'True', 'symmetrical': 'False'})
-        }
-    }
-
-    complete_apps = ['student']

From e5c958082bff84c79bde4e979828796813335d72 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@mit.edu>
Date: Sat, 5 Jan 2013 21:08:35 +0000
Subject: [PATCH 195/541] list/add/delete instructors on instructor dashboard

---
 lms/djangoapps/courseware/access.py           | 14 ++++--
 lms/djangoapps/instructor/views.py            | 50 +++++++++++++++++--
 .../courseware/instructor_dashboard.html      | 10 ++++
 3 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/lms/djangoapps/courseware/access.py b/lms/djangoapps/courseware/access.py
index b58f8d5470..60fcbff3a3 100644
--- a/lms/djangoapps/courseware/access.py
+++ b/lms/djangoapps/courseware/access.py
@@ -171,13 +171,19 @@ def _has_access_course_desc(user, course, action):
 
     return _dispatch(checkers, action, user, course)
 
+
 def _get_access_group_name_course_desc(course, action):
     '''
-    Return name of group which gives staff access to course.  Only understands action = 'staff'
+    Return name of group which gives staff access to course.  Only understands action = 'staff' and 'instructor'
     '''
-    if not action=='staff':
-        return []
-    return _course_staff_group_name(course.location)
+    if action=='staff':
+        return _course_staff_group_name(course.location)
+    elif action=='instructor':
+        return _course_instructor_group_name(course.location)
+
+    return []
+
+
 
 def _has_access_error_desc(user, descriptor, action):
     """
diff --git a/lms/djangoapps/instructor/views.py b/lms/djangoapps/instructor/views.py
index 2e8db884ff..2e8b9fd6bc 100644
--- a/lms/djangoapps/instructor/views.py
+++ b/lms/djangoapps/instructor/views.py
@@ -94,11 +94,17 @@ def instructor_dashboard(request, course_id):
         return response
 
     def get_staff_group(course):
-        staffgrp = get_access_group_name(course, 'staff')
+        return get_group(course, 'staff')
+
+    def get_instructor_group(course):
+        return get_group(course, 'instructor')
+
+    def get_group(course, groupname):
+        grpname = get_access_group_name(course, groupname)
         try:
-            group = Group.objects.get(name=staffgrp)
+            group = Group.objects.get(name=grpname)
         except Group.DoesNotExist:
-            group = Group(name=staffgrp)     # create the group
+            group = Group(name=grpname)     # create the group
             group.save()
         return group
 
@@ -239,6 +245,16 @@ def instructor_dashboard(request, course_id):
         datatable['title'] = 'List of Staff in course {0}'.format(course_id)
         track.views.server_track(request, 'list-staff', {}, page='idashboard')
 
+    elif 'List course instructors' in action:
+        group = get_instructor_group(course)
+        msg += 'Instructor group = {0}'.format(group.name)
+        log.debug('instructor grp={0}'.format(group.name))
+        uset = group.user_set.all()
+        datatable = {'header': ['Username', 'Full name']}
+        datatable['data'] = [[x.username, x.profile.name] for x in uset]
+        datatable['title'] = 'List of Instructors in course {0}'.format(course_id)
+        track.views.server_track(request, 'list-instructors', {}, page='idashboard')
+
     elif action == 'Add course staff':
         uname = request.POST['staffuser']
         try:
@@ -253,6 +269,20 @@ def instructor_dashboard(request, course_id):
             user.groups.add(group)
             track.views.server_track(request, 'add-staff {0}'.format(user), {}, page='idashboard')
 
+    elif action == 'Add instructor':
+        uname = request.POST['instructor']
+        try:
+            user = User.objects.get(username=uname)
+        except User.DoesNotExist:
+            msg += '<font color="red">Error: unknown username "{0}"</font>'.format(uname)
+            user = None
+        if user is not None:
+            group = get_instructor_group(course)
+            msg += '<font color="green">Added {0} to instructor group = {1}</font>'.format(user, group.name)
+            log.debug('staffgrp={0}'.format(group.name))
+            user.groups.add(group)
+            track.views.server_track(request, 'add-instructor {0}'.format(user), {}, page='idashboard')
+
     elif action == 'Remove course staff':
         uname = request.POST['staffuser']
         try:
@@ -267,6 +297,20 @@ def instructor_dashboard(request, course_id):
             user.groups.remove(group)
             track.views.server_track(request, 'remove-staff {0}'.format(user), {}, page='idashboard')
 
+    elif action == 'Remove instructor':
+        uname = request.POST['instructor']
+        try:
+            user = User.objects.get(username=uname)
+        except User.DoesNotExist:
+            msg += '<font color="red">Error: unknown username "{0}"</font>'.format(uname)
+            user = None
+        if user is not None:
+            group = get_instructor_group(course)
+            msg += '<font color="green">Removed {0} from instructor group = {1}</font>'.format(user, group.name)
+            log.debug('instructorgrp={0}'.format(group.name))
+            user.groups.remove(group)
+            track.views.server_track(request, 'remove-instructor {0}'.format(user), {}, page='idashboard')
+
     #----------------------------------------
     # forum administration
   
diff --git a/lms/templates/courseware/instructor_dashboard.html b/lms/templates/courseware/instructor_dashboard.html
index 235505fc29..7f1912cd45 100644
--- a/lms/templates/courseware/instructor_dashboard.html
+++ b/lms/templates/courseware/instructor_dashboard.html
@@ -173,6 +173,16 @@ function goto( mode)
     <hr width="40%" style="align:left">
   %endif
 
+  %if admin_access:
+    <hr width="40%" style="align:left">
+    <p>
+    <input type="submit" name="action" value="List course instructors">
+    <p>
+    <input type="text" name="instructor"> <input type="submit" name="action" value="Remove instructor">
+    <input type="submit" name="action" value="Add instructor">
+    <hr width="40%" style="align:left">
+  %endif
+
   %if settings.MITX_FEATURES['ENABLE_MANUAL_GIT_RELOAD'] and admin_access:
     <p>
     <input type="submit" name="action" value="Reload course from XML files">

From ec94f7328ce77d61329c0b477da52ae8a5037893 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@mit.edu>
Date: Thu, 10 Jan 2013 23:13:05 -0500
Subject: [PATCH 196/541] remove try...except workaround for circular import
 bug fixed by https://github.com/MITx/mitx/issues/1260

---
 lms/djangoapps/courseware/access.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lms/djangoapps/courseware/access.py b/lms/djangoapps/courseware/access.py
index 60fcbff3a3..26f9fcdfd3 100644
--- a/lms/djangoapps/courseware/access.py
+++ b/lms/djangoapps/courseware/access.py
@@ -13,12 +13,7 @@ from xmodule.modulestore import Location
 from xmodule.timeparse import parse_time
 from xmodule.x_module import XModule, XModuleDescriptor
 
-# student.models imports Role, which imports courseware.access ; use a try, to break the circular import
-try:
-    from student.models import CourseEnrollmentAllowed
-except Exception as err:
-    CourseEnrollmentAllowed = None
-
+from student.models import CourseEnrollmentAllowed
 
 DEBUG_ACCESS = False
 

From 9853c6323f5c3f7d6b65dce6126e647275d56e8b Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Thu, 10 Jan 2013 15:19:38 -0500
Subject: [PATCH 197/541] Remove circular dependencies that connect
 student.models and django_comment_client Includes removal of "from
 django_comment_client.models import Role" from
 common/djangoapps/student/models.py

Conflicts:

	common/djangoapps/student/models.py
---
 common/djangoapps/student/models.py            | 11 -----------
 lms/djangoapps/django_comment_client/models.py | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index d3254532bc..d9ce790ebe 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -49,7 +49,6 @@ from django.db.models.signals import post_save
 from django.dispatch import receiver
 
 import comment_client as cc
-from django_comment_client.models import Role
 
 
 log = logging.getLogger(__name__)
@@ -280,16 +279,6 @@ class CourseEnrollmentAllowed(models.Model):
         return "[CourseEnrollmentAllowed] %s: %s (%s)" % (self.email, self.course_id, self.created)
 
 
-@receiver(post_save, sender=CourseEnrollment)
-def assign_default_role(sender, instance, **kwargs):
-    if instance.user.is_staff:
-        role = Role.objects.get_or_create(course_id=instance.course_id, name="Moderator")[0]
-    else:
-        role = Role.objects.get_or_create(course_id=instance.course_id, name="Student")[0]
-
-    logging.info("assign_default_role: adding %s as %s" % (instance.user, role))
-    instance.user.roles.add(role)
-
 #cache_relation(User.profile)
 
 #### Helper methods for use from python manage.py shell.
diff --git a/lms/djangoapps/django_comment_client/models.py b/lms/djangoapps/django_comment_client/models.py
index 628ac21a4a..a6a2c23603 100644
--- a/lms/djangoapps/django_comment_client/models.py
+++ b/lms/djangoapps/django_comment_client/models.py
@@ -2,6 +2,10 @@ import logging
 
 from django.db import models
 from django.contrib.auth.models import User
+from django.dispatch import receiver
+from django.db.models.signals import post_save
+
+from student.models import CourseEnrollment
 
 from courseware.courses import get_course_by_id
 
@@ -45,3 +49,14 @@ class Permission(models.Model):
 
     def __unicode__(self):
         return self.name
+
+
+@receiver(post_save, sender=CourseEnrollment)
+def assign_default_role(sender, instance, **kwargs):
+    if instance.user.is_staff:
+        role = Role.objects.get_or_create(course_id=instance.course_id, name="Moderator")[0]
+    else:
+        role = Role.objects.get_or_create(course_id=instance.course_id, name="Student")[0]
+
+    logging.info("assign_default_role: adding %s as %s" % (instance.user, role))
+    instance.user.roles.add(role)

From 5cc88ec1adbc04b4a6459c8acd90209bb2e5adc9 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@mit.edu>
Date: Thu, 10 Jan 2013 23:25:29 -0500
Subject: [PATCH 198/541] example course_id for compute_grades management
 command

---
 .../instructor/management/commands/compute_grades.py        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lms/djangoapps/instructor/management/commands/compute_grades.py b/lms/djangoapps/instructor/management/commands/compute_grades.py
index 717bfd5802..462833ba3c 100644
--- a/lms/djangoapps/instructor/management/commands/compute_grades.py
+++ b/lms/djangoapps/instructor/management/commands/compute_grades.py
@@ -19,15 +19,17 @@ class Command(BaseCommand):
     help = "Compute grades for all students in a course, and store result in DB.\n"
     help += "Usage: compute_grades course_id_or_dir \n"
     help += "   course_id_or_dir: either course_id or course_dir\n"
+    help += 'Example course_id: MITx/8.01rq_MW/Classical_Mechanics_Reading_Questions_Fall_2012_MW_Section'
 
     def handle(self, *args, **options):
 
         print "args = ", args
 
-        course_id = 'MITx/8.01rq_MW/Classical_Mechanics_Reading_Questions_Fall_2012_MW_Section'
-
         if len(args)>0:
             course_id = args[0]
+        else:
+            print self.help
+            return
 
         try:
             course = get_course_by_id(course_id)

From 37f848949d80a0dc8aea45e6d8f7f560bbb61628 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@mit.edu>
Date: Thu, 10 Jan 2013 23:29:52 -0500
Subject: [PATCH 199/541] only is_staff users can add/edit/delete course
 instructors

---
 lms/djangoapps/instructor/views.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lms/djangoapps/instructor/views.py b/lms/djangoapps/instructor/views.py
index 2e8b9fd6bc..07dbfacc64 100644
--- a/lms/djangoapps/instructor/views.py
+++ b/lms/djangoapps/instructor/views.py
@@ -245,7 +245,7 @@ def instructor_dashboard(request, course_id):
         datatable['title'] = 'List of Staff in course {0}'.format(course_id)
         track.views.server_track(request, 'list-staff', {}, page='idashboard')
 
-    elif 'List course instructors' in action:
+    elif 'List course instructors' in action and request.user.is_staff:
         group = get_instructor_group(course)
         msg += 'Instructor group = {0}'.format(group.name)
         log.debug('instructor grp={0}'.format(group.name))
@@ -269,7 +269,7 @@ def instructor_dashboard(request, course_id):
             user.groups.add(group)
             track.views.server_track(request, 'add-staff {0}'.format(user), {}, page='idashboard')
 
-    elif action == 'Add instructor':
+    elif action == 'Add instructor' and request.user.is_staff:
         uname = request.POST['instructor']
         try:
             user = User.objects.get(username=uname)
@@ -297,7 +297,7 @@ def instructor_dashboard(request, course_id):
             user.groups.remove(group)
             track.views.server_track(request, 'remove-staff {0}'.format(user), {}, page='idashboard')
 
-    elif action == 'Remove instructor':
+    elif action == 'Remove instructor' and request.user.is_staff:
         uname = request.POST['instructor']
         try:
             user = User.objects.get(username=uname)

From ed96046ad77e609330968834eeee8e4e6a573037 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@mit.edu>
Date: Thu, 10 Jan 2013 23:59:20 -0500
Subject: [PATCH 200/541] add documentation on remote gradebook xserver API

---
 doc/remote_gradebook.md | 47 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 doc/remote_gradebook.md

diff --git a/doc/remote_gradebook.md b/doc/remote_gradebook.md
new file mode 100644
index 0000000000..3743e98753
--- /dev/null
+++ b/doc/remote_gradebook.md
@@ -0,0 +1,47 @@
+Grades can be pushed to a remote gradebook, and course enrollment membership can be pulled from a remote gradebook.  This file documents how to setup such a remote gradebook, and what the API should be for writing new remote gradebook "xservers".
+
+1. Definitions
+
+An "xserver" is a web-based server that is part of the MITx eco system.  There are a number of "xserver" programs, including one which does python code grading, an xqueue server, and graders for other coding languages.
+
+"Stellar" is the MIT on-campus gradebook system.
+
+2. Setup
+
+The remote gradebook xserver should be specified in the lms.envs configuration using
+
+    MITX_FEATURES[REMOTE_GRADEBOOK_URL]
+
+Each course, in addition, should define the name of the gradebook being used.  A class "section" may also be specified.  This goes in the policy.json file, eg:
+
+    "remote_gradebook": {                                                                                                          
+       "name" : "STELLAR:/project/mitxdemosite",                                                                                  
+       "section" : "r01"                                                                                                          
+        },     
+
+3. The API for the remote gradebook xserver is an almost RESTful service model, which only employs POSTs, to the xserver url, with form data for the fields:
+
+ - submit: get-assignments, get-membership, post-grades, or get-sections
+ - gradebook: name of gradebook
+ - user: username of staff person initiating the request (for logging)
+ - section: (optional) name of section
+
+The return body content should be a JSON string, of the format {'msg': message, 'data': data}.  The message is displayed in the instructor dashboard.  
+
+The data is a list of dicts (associative arrays).  Each dict should be key:value.
+
+## For submit=post-grades:
+
+A file is also posted, with the field name "datafile".  This file is CSV format, with two columns, one being "External email" and the other being the name of the assignment (that column contains the grades for the assignment).  
+
+## For submit=get-assignments
+
+data keys = "AssignmentName"
+
+## For submit=get-membership
+
+data keys = "email", "name", "section"
+
+## For submit=get-sections
+
+data keys = "SectionName"

From b7ad39a0b96de070776933ed96690ff4d3f9b35b Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@mit.edu>
Date: Fri, 11 Jan 2013 00:09:46 -0500
Subject: [PATCH 201/541] instructor dashboard shouldn't import .grading
 anymore

---
 lms/djangoapps/instructor/views.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lms/djangoapps/instructor/views.py b/lms/djangoapps/instructor/views.py
index 07dbfacc64..3a3380407d 100644
--- a/lms/djangoapps/instructor/views.py
+++ b/lms/djangoapps/instructor/views.py
@@ -32,7 +32,6 @@ from xmodule.modulestore.exceptions import InvalidLocationError, ItemNotFoundErr
 from xmodule.modulestore.search import path_to_location
 import track.views
 
-from .grading import StaffGrading
 from .offline_gradecalc import student_grades, offline_grades_available
 
 log = logging.getLogger(__name__)

From 4f869ad38258a8664344188c5e20fa8a328311e7 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@mit.edu>
Date: Fri, 11 Jan 2013 00:10:52 -0500
Subject: [PATCH 202/541] remove spurious comment

---
 lms/djangoapps/instructor/views.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lms/djangoapps/instructor/views.py b/lms/djangoapps/instructor/views.py
index 3a3380407d..2d58799efe 100644
--- a/lms/djangoapps/instructor/views.py
+++ b/lms/djangoapps/instructor/views.py
@@ -649,9 +649,6 @@ def get_student_grade_summary_data(request, course, course_id, get_grades=True,
     return datatable
 
 #-----------------------------------------------------------------------------
-# Staff grading
-
-
 
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 def gradebook(request, course_id):

From bcbf65e2b9f1108452f68136d802796463b1f974 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 11 Jan 2013 09:45:10 -0500
Subject: [PATCH 203/541] Code reformat, line length fix, change text names to
 variables

---
 .../xmodule/combined_open_ended_module.py     | 282 +++++++++---------
 .../lib/xmodule/xmodule/open_ended_module.py  | 214 ++++++-------
 common/lib/xmodule/xmodule/openendedchild.py  |  22 +-
 .../xmodule/xmodule/self_assessment_module.py |  18 +-
 4 files changed, 275 insertions(+), 261 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 244346625a..358a3b6995 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -45,14 +45,14 @@ class CombinedOpenEndedModule(XModule):
     # states
     INITIAL = 'initial'
     ASSESSING = 'assessing'
-    INTERMEDIATE_DONE='intermediate_done'
+    INTERMEDIATE_DONE = 'intermediate_done'
     DONE = 'done'
-    TASK_TYPES=["self", "ml", "instructor", "peer"]
+    TASK_TYPES = ["self", "ml", "instructor", "peer"]
 
     js = {'coffee': [resource_string(__name__, 'js/src/combinedopenended/display.coffee'),
                      resource_string(__name__, 'js/src/collapsible.coffee'),
                      resource_string(__name__, 'js/src/javascript_loader.coffee'),
-                     ]}
+    ]}
     js_module_name = "CombinedOpenEnded"
 
     css = {'scss': [resource_string(__name__, 'css/combinedopenended/display.scss')]}
@@ -88,7 +88,8 @@ class CombinedOpenEndedModule(XModule):
                         <openendedparam>
                             <initial_display>Enter essay here.</initial_display>
                             <answer_display>This is the answer.</answer_display>
-                            <grader_payload>{"grader_settings" : "ml_grading.conf", "problem_id" : "6.002x/Welcome/OETest"}</grader_payload>
+                            <grader_payload>{"grader_settings" : "ml_grading.conf",
+                            "problem_id" : "6.002x/Welcome/OETest"}</grader_payload>
                         </openendedparam>
                 </openended>
             </task>
@@ -108,9 +109,9 @@ class CombinedOpenEndedModule(XModule):
         #Tells the system which xml definition to load
         self.current_task_number = instance_state.get('current_task_number', 0)
         #This loads the states of the individual children
-        self.task_states= instance_state.get('task_states', [])
+        self.task_states = instance_state.get('task_states', [])
         #Overall state of the combined open ended module
-        self.state = instance_state.get('state', 'initial')
+        self.state = instance_state.get('state', self.INITIAL)
 
         self.attempts = instance_state.get('attempts', 0)
 
@@ -124,13 +125,13 @@ class CombinedOpenEndedModule(XModule):
 
         #Static data is passed to the child modules to render
         self.static_data = {
-            'max_score' : self._max_score,
-            'max_attempts' : self.max_attempts,
-            'prompt' : definition['prompt'],
-            'rubric' : definition['rubric']
+            'max_score': self._max_score,
+            'max_attempts': self.max_attempts,
+            'prompt': definition['prompt'],
+            'rubric': definition['rubric']
         }
 
-        self.task_xml=definition['task_xml']
+        self.task_xml = definition['task_xml']
         self.setup_next_task()
 
     def get_tag_name(self, xml):
@@ -139,7 +140,7 @@ class CombinedOpenEndedModule(XModule):
         Input: XML string
         Output: The name of the root tag
         """
-        tag=etree.fromstring(xml).tag
+        tag = etree.fromstring(xml).tag
         return tag
 
     def overwrite_state(self, current_task_state):
@@ -149,15 +150,15 @@ class CombinedOpenEndedModule(XModule):
         Input: Task state json string
         Output: Task state json string
         """
-        last_response_data=self.get_last_response(self.current_task_number-1)
+        last_response_data = self.get_last_response(self.current_task_number - 1)
         last_response = last_response_data['response']
 
-        loaded_task_state=json.loads(current_task_state)
-        if loaded_task_state['state']== self.INITIAL:
-            loaded_task_state['state']=self.ASSESSING
+        loaded_task_state = json.loads(current_task_state)
+        if loaded_task_state['state'] == self.INITIAL:
+            loaded_task_state['state'] = self.ASSESSING
             loaded_task_state['created'] = "True"
-            loaded_task_state['history'].append({'answer' : last_response})
-            current_task_state=json.dumps(loaded_task_state)
+            loaded_task_state['history'].append({'answer': last_response})
+            current_task_state = json.dumps(loaded_task_state)
         return current_task_state
 
     def child_modules(self):
@@ -167,17 +168,17 @@ class CombinedOpenEndedModule(XModule):
         Input: None
         Output: A dictionary of dictionaries containing the descriptor functions and module functions
         """
-        child_modules={
-            'openended' : open_ended_module.OpenEndedModule,
-            'selfassessment' : self_assessment_module.SelfAssessmentModule,
+        child_modules = {
+            'openended': open_ended_module.OpenEndedModule,
+            'selfassessment': self_assessment_module.SelfAssessmentModule,
         }
-        child_descriptors={
-            'openended' : open_ended_module.OpenEndedDescriptor,
-            'selfassessment' : self_assessment_module.SelfAssessmentDescriptor,
+        child_descriptors = {
+            'openended': open_ended_module.OpenEndedDescriptor,
+            'selfassessment': self_assessment_module.SelfAssessmentDescriptor,
         }
-        children={
-            'modules' : child_modules,
-            'descriptors' : child_descriptors,
+        children = {
+            'modules': child_modules,
+            'descriptors': child_descriptors,
         }
         return children
 
@@ -188,41 +189,47 @@ class CombinedOpenEndedModule(XModule):
         Input: A boolean indicating whether or not the reset function is calling.
         Output: Boolean True (not useful right now)
         """
-        current_task_state=None
-        if len(self.task_states)>self.current_task_number:
-            current_task_state=self.task_states[self.current_task_number]
+        current_task_state = None
+        if len(self.task_states) > self.current_task_number:
+            current_task_state = self.task_states[self.current_task_number]
 
-        self.current_task_xml=self.task_xml[self.current_task_number]
+        self.current_task_xml = self.task_xml[self.current_task_number]
 
-        if self.current_task_number>0:
-            self.allow_reset=self.check_allow_reset()
+        if self.current_task_number > 0:
+            self.allow_reset = self.check_allow_reset()
             if self.allow_reset:
-                self.current_task_number=self.current_task_number-1
+                self.current_task_number = self.current_task_number - 1
 
-        current_task_type=self.get_tag_name(self.current_task_xml)
+        current_task_type = self.get_tag_name(self.current_task_xml)
 
-        children=self.child_modules()
+        children = self.child_modules()
 
-        self.current_task_descriptor=children['descriptors'][current_task_type](self.system)
-        etree_xml=etree.fromstring(self.current_task_xml)
+        self.current_task_descriptor = children['descriptors'][current_task_type](self.system)
+        etree_xml = etree.fromstring(self.current_task_xml)
 
-        self.current_task_parsed_xml=self.current_task_descriptor.definition_from_xml(etree_xml,self.system)
-        if current_task_state is None and self.current_task_number==0:
-            self.current_task=children['modules'][current_task_type](self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, self.static_data)
+        self.current_task_parsed_xml = self.current_task_descriptor.definition_from_xml(etree_xml, self.system)
+        if current_task_state is None and self.current_task_number == 0:
+            self.current_task = children['modules'][current_task_type](self.system, self.location,
+                self.current_task_parsed_xml, self.current_task_descriptor, self.static_data)
             self.task_states.append(self.current_task.get_instance_state())
-            self.state=self.ASSESSING
-        elif current_task_state is None and self.current_task_number>0:
-            last_response_data =self.get_last_response(self.current_task_number-1)
+            self.state = self.ASSESSING
+        elif current_task_state is None and self.current_task_number > 0:
+            last_response_data = self.get_last_response(self.current_task_number - 1)
             last_response = last_response_data['response']
-            current_task_state = ('{"state": "assessing", "version": 1, "max_score": ' + str(self._max_score) + ', ' +
-                                  '"attempts": 0, "created": "True", "history": [{"answer": "' + str(last_response) + '"}]}')
-            self.current_task=children['modules'][current_task_type](self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, self.static_data, instance_state=current_task_state)
+            current_task_state = (
+            '{"state": "' + str(self.ASSESSING) + '", "version": 1, "max_score": ' + str(self._max_score) + ', ' +
+            '"attempts": 0, "created": "True", "history": [{"answer": "' + str(last_response) + '"}]}')
+            self.current_task = children['modules'][current_task_type](self.system, self.location,
+                self.current_task_parsed_xml, self.current_task_descriptor, self.static_data,
+                instance_state=current_task_state)
             self.task_states.append(self.current_task.get_instance_state())
-            self.state=self.ASSESSING
+            self.state = self.ASSESSING
         else:
-            if self.current_task_number>0 and not reset:
-                current_task_state=self.overwrite_state(current_task_state)
-            self.current_task=children['modules'][current_task_type](self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, self.static_data, instance_state=current_task_state)
+            if self.current_task_number > 0 and not reset:
+                current_task_state = self.overwrite_state(current_task_state)
+            self.current_task = children['modules'][current_task_type](self.system, self.location,
+                self.current_task_parsed_xml, self.current_task_descriptor, self.static_data,
+                instance_state=current_task_state)
 
         log.debug(current_task_state)
         return True
@@ -235,13 +242,14 @@ class CombinedOpenEndedModule(XModule):
         Output: the allow_reset attribute of the current module.
         """
         if not self.allow_reset:
-            if self.current_task_number>0:
-                last_response_data=self.get_last_response(self.current_task_number-1)
-                current_response_data=self.get_current_attributes(self.current_task_number)
+            if self.current_task_number > 0:
+                last_response_data = self.get_last_response(self.current_task_number - 1)
+                current_response_data = self.get_current_attributes(self.current_task_number)
 
-                if current_response_data['min_score_to_attempt']>last_response_data['score'] or current_response_data['max_score_to_attempt']<last_response_data['score']:
-                    self.state=self.DONE
-                    self.allow_reset=True
+                if(current_response_data['min_score_to_attempt'] > last_response_data['score']
+                   or current_response_data['max_score_to_attempt'] < last_response_data['score']):
+                    self.state = self.DONE
+                    self.allow_reset = True
 
         return self.allow_reset
 
@@ -251,18 +259,18 @@ class CombinedOpenEndedModule(XModule):
         Input: None
         Output: A dictionary that can be rendered into the combined open ended template.
         """
-        task_html=self.get_html_base()
+        task_html = self.get_html_base()
         #set context variables and render template
 
         context = {
-            'items': [{'content' : task_html}],
+            'items': [{'content': task_html}],
             'ajax_url': self.system.ajax_url,
             'allow_reset': self.allow_reset,
-            'state' : self.state,
-            'task_count' : len(self.task_xml),
-            'task_number' : self.current_task_number+1,
-            'status' : self.get_status(),
-            }
+            'state': self.state,
+            'task_count': len(self.task_xml),
+            'task_number': self.current_task_number + 1,
+            'status': self.get_status(),
+        }
 
         return context
 
@@ -272,7 +280,7 @@ class CombinedOpenEndedModule(XModule):
         Input: None
         Output: rendered html
         """
-        context=self.get_context()
+        context = self.get_context()
         html = self.system.render_template('combined_open_ended.html', context)
         return html
 
@@ -283,7 +291,7 @@ class CombinedOpenEndedModule(XModule):
         Input: None
         Output: HTML rendered directly via Mako
         """
-        context=self.get_context()
+        context = self.get_context()
         html = render_to_string('combined_open_ended.html', context)
         return html
 
@@ -304,11 +312,11 @@ class CombinedOpenEndedModule(XModule):
         Input: The number of the task.
         Output: The minimum and maximum scores needed to move on to the specified task.
         """
-        task_xml=self.task_xml[task_number]
-        etree_xml=etree.fromstring(task_xml)
-        min_score_to_attempt=int(etree_xml.attrib.get('min_score_to_attempt',0))
-        max_score_to_attempt=int(etree_xml.attrib.get('max_score_to_attempt',self._max_score))
-        return {'min_score_to_attempt' : min_score_to_attempt, 'max_score_to_attempt' : max_score_to_attempt}
+        task_xml = self.task_xml[task_number]
+        etree_xml = etree.fromstring(task_xml)
+        min_score_to_attempt = int(etree_xml.attrib.get('min_score_to_attempt', 0))
+        max_score_to_attempt = int(etree_xml.attrib.get('max_score_to_attempt', self._max_score))
+        return {'min_score_to_attempt': min_score_to_attempt, 'max_score_to_attempt': max_score_to_attempt}
 
     def get_last_response(self, task_number):
         """
@@ -316,49 +324,50 @@ class CombinedOpenEndedModule(XModule):
         Input: The number of the task.
         Output: A dictionary that contains information about the specified task.
         """
-        last_response=""
+        last_response = ""
         task_state = self.task_states[task_number]
-        task_xml=self.task_xml[task_number]
-        task_type=self.get_tag_name(task_xml)
+        task_xml = self.task_xml[task_number]
+        task_type = self.get_tag_name(task_xml)
 
-        children=self.child_modules()
+        children = self.child_modules()
 
-        task_descriptor=children['descriptors'][task_type](self.system)
-        etree_xml=etree.fromstring(task_xml)
+        task_descriptor = children['descriptors'][task_type](self.system)
+        etree_xml = etree.fromstring(task_xml)
 
-        min_score_to_attempt=int(etree_xml.attrib.get('min_score_to_attempt',0))
-        max_score_to_attempt=int(etree_xml.attrib.get('max_score_to_attempt',self._max_score))
+        min_score_to_attempt = int(etree_xml.attrib.get('min_score_to_attempt', 0))
+        max_score_to_attempt = int(etree_xml.attrib.get('max_score_to_attempt', self._max_score))
 
-        task_parsed_xml=task_descriptor.definition_from_xml(etree_xml,self.system)
-        task=children['modules'][task_type](self.system, self.location, task_parsed_xml, task_descriptor, self.static_data, instance_state=task_state)
-        last_response=task.latest_answer()
+        task_parsed_xml = task_descriptor.definition_from_xml(etree_xml, self.system)
+        task = children['modules'][task_type](self.system, self.location, task_parsed_xml, task_descriptor,
+            self.static_data, instance_state=task_state)
+        last_response = task.latest_answer()
         last_score = task.latest_score()
         last_post_assessment = task.latest_post_assessment()
-        last_post_feedback=""
-        if task_type=="openended":
+        last_post_feedback = ""
+        if task_type == "openended":
             last_post_assessment = task.latest_post_assessment(short_feedback=False, join_feedback=False)
-            if isinstance(last_post_assessment,list):
-                eval_list=[]
-                for i in xrange(0,len(last_post_assessment)):
+            if isinstance(last_post_assessment, list):
+                eval_list = []
+                for i in xrange(0, len(last_post_assessment)):
                     eval_list.append(task.format_feedback_with_evaluation(last_post_assessment[i]))
-                last_post_evaluation="".join(eval_list)
+                last_post_evaluation = "".join(eval_list)
             else:
                 last_post_evaluation = task.format_feedback_with_evaluation(last_post_assessment)
             last_post_assessment = last_post_evaluation
         last_correctness = task.is_last_response_correct()
         max_score = task.max_score()
         state = task.state
-        last_response_dict={
-            'response' : last_response,
-            'score' : last_score,
-            'post_assessment' : last_post_assessment,
-            'type' : task_type,
-            'max_score' : max_score,
-            'state' : state,
-            'human_state' : task.HUMAN_NAMES[state],
-            'correct' : last_correctness,
-            'min_score_to_attempt' : min_score_to_attempt,
-            'max_score_to_attempt' : max_score_to_attempt,
+        last_response_dict = {
+            'response': last_response,
+            'score': last_score,
+            'post_assessment': last_post_assessment,
+            'type': task_type,
+            'max_score': max_score,
+            'state': state,
+            'human_state': task.HUMAN_NAMES[state],
+            'correct': last_correctness,
+            'min_score_to_attempt': min_score_to_attempt,
+            'max_score_to_attempt': max_score_to_attempt,
         }
 
         return last_response_dict
@@ -369,28 +378,28 @@ class CombinedOpenEndedModule(XModule):
         Input: None
         Output: boolean indicating whether or not the task state changed.
         """
-        changed=False
+        changed = False
         if not self.allow_reset:
             self.task_states[self.current_task_number] = self.current_task.get_instance_state()
-            current_task_state=json.loads(self.task_states[self.current_task_number])
-            if current_task_state['state']==self.DONE:
-                self.current_task_number+=1
-                if self.current_task_number>=(len(self.task_xml)):
-                    self.state=self.DONE
-                    self.current_task_number=len(self.task_xml)-1
+            current_task_state = json.loads(self.task_states[self.current_task_number])
+            if current_task_state['state'] == self.DONE:
+                self.current_task_number += 1
+                if self.current_task_number >= (len(self.task_xml)):
+                    self.state = self.DONE
+                    self.current_task_number = len(self.task_xml) - 1
                 else:
-                    self.state=self.INITIAL
-                changed=True
+                    self.state = self.INITIAL
+                changed = True
                 self.setup_next_task()
         return changed
 
-    def update_task_states_ajax(self,return_html):
+    def update_task_states_ajax(self, return_html):
         """
         Runs the update task states function for ajax calls.  Currently the same as update_task_states
         Input: The html returned by the handle_ajax function of the child
         Output: New html that should be rendered
         """
-        changed=self.update_task_states()
+        changed = self.update_task_states()
         if changed:
             #return_html=self.get_html()
             pass
@@ -402,12 +411,12 @@ class CombinedOpenEndedModule(XModule):
         Input: AJAX get dictionary
         Output: Dictionary to be rendered via ajax that contains the result html.
         """
-        task_number=int(get['task_number'])
+        task_number = int(get['task_number'])
         self.update_task_states()
-        response_dict=self.get_last_response(task_number)
-        context = {'results' : response_dict['post_assessment'], 'task_number' : task_number+1}
+        response_dict = self.get_last_response(task_number)
+        context = {'results': response_dict['post_assessment'], 'task_number': task_number + 1}
         html = render_to_string('combined_open_ended_results.html', context)
-        return {'html' : html, 'success' : True}
+        return {'html': html, 'success': True}
 
     def handle_ajax(self, dispatch, get):
         """
@@ -423,15 +432,15 @@ class CombinedOpenEndedModule(XModule):
         handlers = {
             'next_problem': self.next_problem,
             'reset': self.reset,
-            'get_results' : self.get_results
-            }
+            'get_results': self.get_results
+        }
 
         if dispatch not in handlers:
-            return_html = self.current_task.handle_ajax(dispatch,get, self.system)
+            return_html = self.current_task.handle_ajax(dispatch, get, self.system)
             return self.update_task_states_ajax(return_html)
 
         d = handlers[dispatch](get)
-        return json.dumps(d,cls=ComplexEncoder)
+        return json.dumps(d, cls=ComplexEncoder)
 
     def next_problem(self, get):
         """
@@ -440,7 +449,7 @@ class CombinedOpenEndedModule(XModule):
         Output: Dictionary to be rendered
         """
         self.update_task_states()
-        return {'success' : True, 'html' : self.get_html_nonsystem(), 'allow_reset' : self.allow_reset}
+        return {'success': True, 'html': self.get_html_nonsystem(), 'allow_reset': self.allow_reset}
 
     def reset(self, get):
         """
@@ -457,17 +466,17 @@ class CombinedOpenEndedModule(XModule):
                 'success': False,
                 'error': 'Too many attempts.'
             }
-        self.state=self.INITIAL
-        self.allow_reset=False
-        for i in xrange(0,len(self.task_xml)):
-            self.current_task_number=i
+        self.state = self.INITIAL
+        self.allow_reset = False
+        for i in xrange(0, len(self.task_xml)):
+            self.current_task_number = i
             self.setup_next_task(reset=True)
             self.current_task.reset(self.system)
-            self.task_states[self.current_task_number]=self.current_task.get_instance_state()
-        self.current_task_number=0
-        self.allow_reset=False
+            self.task_states[self.current_task_number] = self.current_task.get_instance_state()
+        self.current_task_number = 0
+        self.allow_reset = False
         self.setup_next_task()
-        return {'success': True, 'html' : self.get_html_nonsystem()}
+        return {'success': True, 'html': self.get_html_nonsystem()}
 
     def get_instance_state(self):
         """
@@ -482,8 +491,8 @@ class CombinedOpenEndedModule(XModule):
             'state': self.state,
             'task_states': self.task_states,
             'attempts': self.attempts,
-            'ready_to_reset' : self.allow_reset,
-            }
+            'ready_to_reset': self.allow_reset,
+        }
 
         return json.dumps(state)
 
@@ -493,16 +502,17 @@ class CombinedOpenEndedModule(XModule):
         Input: None
         Output: The status html to be rendered
         """
-        status=[]
-        for i in xrange(0,self.current_task_number+1):
+        status = []
+        for i in xrange(0, self.current_task_number + 1):
             task_data = self.get_last_response(i)
-            task_data.update({'task_number' : i+1})
+            task_data.update({'task_number': i + 1})
             status.append(task_data)
-        context = {'status_list' : status}
+        context = {'status_list': status}
         status_html = self.system.render_template("combined_open_ended_status.html", context)
 
         return status_html
 
+
 class CombinedOpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
     """
     Module for adding combined open ended questions
@@ -532,18 +542,18 @@ class CombinedOpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
         """
         expected_children = ['task', 'rubric', 'prompt']
         for child in expected_children:
-            if len(xml_object.xpath(child)) == 0 :
+            if len(xml_object.xpath(child)) == 0:
                 raise ValueError("Combined Open Ended definition must include at least one '{0}' tag".format(child))
 
         def parse_task(k):
             """Assumes that xml_object has child k"""
-            return [stringify_children(xml_object.xpath(k)[i]) for i in xrange(0,len(xml_object.xpath(k)))]
+            return [stringify_children(xml_object.xpath(k)[i]) for i in xrange(0, len(xml_object.xpath(k)))]
 
         def parse(k):
             """Assumes that xml_object has child k"""
             return xml_object.xpath(k)[0]
 
-        return {'task_xml': parse_task('task'), 'prompt' : parse('prompt'), 'rubric' : parse('rubric')}
+        return {'task_xml': parse_task('task'), 'prompt': parse('prompt'), 'rubric': parse('rubric')}
 
 
     def definition_to_xml(self, resource_fs):
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 5649cbbd2c..45d6501816 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -49,6 +49,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         </openendedparam>
     </openended>
     """
+
     def setup_response(self, system, location, definition, descriptor):
         """
         Sets up the response type.
@@ -65,8 +66,8 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         self.message_queue_name = definition.get('message-queuename', self.DEFAULT_MESSAGE_QUEUE)
 
         #This is needed to attach feedback to specific responses later
-        self.submission_id=None
-        self.grader_id=None
+        self.submission_id = None
+        self.grader_id = None
 
         if oeparam is None:
             raise ValueError("No oeparam found in problem xml.")
@@ -77,10 +78,10 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         self._parse(oeparam, self.prompt, self.rubric, system)
 
-        if self.created=="True" and self.state == self.ASSESSING:
-            self.created="False"
+        if self.created == "True" and self.state == self.ASSESSING:
+            self.created = "False"
             self.send_to_grader(self.latest_answer(), system)
-            self.created="False"
+            self.created = "False"
 
     def _parse(self, oeparam, prompt, rubric, system):
         '''
@@ -94,8 +95,8 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         # Note that OpenEndedResponse is agnostic to the specific contents of grader_payload
         prompt_string = stringify_children(prompt)
         rubric_string = stringify_children(rubric)
-        self.prompt=prompt_string
-        self.rubric=rubric_string
+        self.prompt = prompt_string
+        self.rubric = rubric_string
 
         grader_payload = oeparam.find('grader_payload')
         grader_payload = grader_payload.text if grader_payload is not None else ''
@@ -113,13 +114,13 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         self.answer = find_with_default(oeparam, 'answer_display', 'No answer given.')
 
         parsed_grader_payload.update({
-            'location' : system.location.url(),
-            'course_id' : system.course_id,
-            'prompt' : prompt_string,
-            'rubric' : rubric_string,
-            'initial_display' : self.initial_display,
-            'answer' : self.answer,
-            })
+            'location': system.location.url(),
+            'course_id': system.course_id,
+            'prompt': prompt_string,
+            'rubric': rubric_string,
+            'initial_display': self.initial_display,
+            'answer': self.answer,
+        })
         updated_grader_payload = json.dumps(parsed_grader_payload)
 
         self.payload = {'grader_payload': updated_grader_payload}
@@ -131,10 +132,10 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         @param system: ModuleSystem
         @return: Success indicator
         """
-        self.state=self.DONE
-        return {'success' : True}
+        self.state = self.DONE
+        return {'success': True}
 
-    def message_post(self,get, system):
+    def message_post(self, get, system):
         """
         Handles a student message post (a reaction to the grade they received from an open ended grader type)
         Returns a boolean success/fail and an error message
@@ -143,22 +144,23 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         event_info = dict()
         event_info['problem_id'] = system.location.url()
         event_info['student_id'] = system.anonymous_student_id
-        event_info['survey_responses']= get
+        event_info['survey_responses'] = get
 
-        survey_responses=event_info['survey_responses']
+        survey_responses = event_info['survey_responses']
         for tag in ['feedback', 'submission_id', 'grader_id', 'score']:
             if tag not in survey_responses:
-                return {'success' : False, 'msg' : "Could not find needed tag {0}".format(tag)}
+                return {'success': False, 'msg': "Could not find needed tag {0}".format(tag)}
         try:
-            submission_id=int(survey_responses['submission_id'])
+            submission_id = int(survey_responses['submission_id'])
             grader_id = int(survey_responses['grader_id'])
             feedback = str(survey_responses['feedback'].encode('ascii', 'ignore'))
             score = int(survey_responses['score'])
         except:
-            error_message=("Could not parse submission id, grader id, "
-                           "or feedback from message_post ajax call.  Here is the message data: {0}".format(survey_responses))
+            error_message = ("Could not parse submission id, grader id, "
+                             "or feedback from message_post ajax call.  Here is the message data: {0}".format(
+                survey_responses))
             log.exception(error_message)
-            return {'success' : False, 'msg' : "There was an error saving your feedback.  Please contact course staff."}
+            return {'success': False, 'msg': "There was an error saving your feedback.  Please contact course staff."}
 
         qinterface = system.xqueue['interface']
         qtime = datetime.strftime(datetime.now(), xqueue_interface.dateformat)
@@ -175,26 +177,26 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         student_info = {'anonymous_student_id': anonymous_student_id,
                         'submission_time': qtime,
-                        }
-        contents= {
-            'feedback' : feedback,
-            'submission_id' : submission_id,
-            'grader_id' : grader_id,
+        }
+        contents = {
+            'feedback': feedback,
+            'submission_id': submission_id,
+            'grader_id': grader_id,
             'score': score,
-            'student_info' : json.dumps(student_info),
-            }
+            'student_info': json.dumps(student_info),
+        }
 
         (error, msg) = qinterface.send_to_queue(header=xheader,
             body=json.dumps(contents))
 
         #Convert error to a success value
-        success=True
+        success = True
         if error:
-            success=False
+            success = False
 
-        self.state=self.DONE
+        self.state = self.DONE
 
-        return {'success' : success, 'msg' : "Successfully submitted your feedback."}
+        return {'success': success, 'msg': "Successfully submitted your feedback."}
 
     def send_to_grader(self, submission, system):
         """
@@ -226,14 +228,14 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         # Metadata related to the student submission revealed to the external grader
         student_info = {'anonymous_student_id': anonymous_student_id,
                         'submission_time': qtime,
-                        }
+        }
 
         #Update contents with student response and student info
         contents.update({
             'student_info': json.dumps(student_info),
             'student_response': submission,
-            'max_score' : self.max_score(),
-            })
+            'max_score': self.max_score(),
+        })
 
         # Submit request. When successful, 'msg' is the prior length of the queue
         (error, msg) = qinterface.send_to_queue(header=xheader,
@@ -241,7 +243,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         # State associated with the queueing request
         queuestate = {'key': queuekey,
-                      'time': qtime,}
+                      'time': qtime, }
         return True
 
     def _update_score(self, score_msg, queuekey, system):
@@ -258,7 +260,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         self.record_latest_score(new_score_msg['score'])
         self.record_latest_post_assessment(score_msg)
-        self.state=self.POST_ASSESSMENT
+        self.state = self.POST_ASSESSMENT
 
         return True
 
@@ -313,24 +315,24 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             """
             return priorities.get(elt[0], default_priority)
 
-        def encode_values(feedback_type,value):
-            feedback_type=str(feedback_type).encode('ascii', 'ignore')
-            if not isinstance(value,basestring):
-                value=str(value)
-            value=value.encode('ascii', 'ignore')
-            return feedback_type,value
+        def encode_values(feedback_type, value):
+            feedback_type = str(feedback_type).encode('ascii', 'ignore')
+            if not isinstance(value, basestring):
+                value = str(value)
+            value = value.encode('ascii', 'ignore')
+            return feedback_type, value
 
         def format_feedback(feedback_type, value):
-            feedback_type,value=encode_values(feedback_type,value)
-            feedback= """
+            feedback_type, value = encode_values(feedback_type, value)
+            feedback = """
             <div class="{feedback_type}">
             {value}
             </div>
             """.format(feedback_type=feedback_type, value=value)
             return feedback
 
-        def format_feedback_hidden(feedback_type , value):
-            feedback_type,value=encode_values(feedback_type,value)
+        def format_feedback_hidden(feedback_type, value):
+            feedback_type, value = encode_values(feedback_type, value)
             feedback = """
             <input class="{feedback_type}" type="hidden" value="{value}" />
             """.format(feedback_type=feedback_type, value=value)
@@ -360,11 +362,11 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         else:
             feedback_list_part1 = format_feedback('errors', response_items['feedback'])
 
-        feedback_list_part2=(u"\n".join([format_feedback_hidden(feedback_type,value)
-                                         for feedback_type,value in response_items.items()
-                                         if feedback_type in ['submission_id', 'grader_id']]))
+        feedback_list_part2 = (u"\n".join([format_feedback_hidden(feedback_type, value)
+                                           for feedback_type, value in response_items.items()
+                                           if feedback_type in ['submission_id', 'grader_id']]))
 
-        return u"\n".join([feedback_list_part1,feedback_list_part2])
+        return u"\n".join([feedback_list_part1, feedback_list_part2])
 
     def _format_feedback(self, response_items):
         """
@@ -378,13 +380,13 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         if not response_items['success']:
             return system.render_template("open_ended_error.html",
-                {'errors' : feedback})
+                {'errors': feedback})
 
         feedback_template = render_to_string("open_ended_feedback.html", {
             'grader_type': response_items['grader_type'],
             'score': "{0} / {1}".format(response_items['score'], self.max_score()),
             'feedback': feedback,
-            })
+        })
 
         return feedback_template
 
@@ -403,57 +405,57 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             correct:         Correctness of submission (Boolean)
             score:           Points to be assigned (numeric, can be float)
         """
-        fail = {'valid' : False, 'score' : 0, 'feedback' : ''}
+        fail = {'valid': False, 'score': 0, 'feedback': ''}
         try:
             score_result = json.loads(score_msg)
         except (TypeError, ValueError):
-            error_message=("External grader message should be a JSON-serialized dict."
-            " Received score_msg = {0}".format(score_msg))
+            error_message = ("External grader message should be a JSON-serialized dict."
+                             " Received score_msg = {0}".format(score_msg))
             log.error(error_message)
-            fail['feedback']=error_message
+            fail['feedback'] = error_message
             return fail
 
         if not isinstance(score_result, dict):
-            error_message=("External grader message should be a JSON-serialized dict."
-            " Received score_result = {0}".format(score_result))
+            error_message = ("External grader message should be a JSON-serialized dict."
+                             " Received score_result = {0}".format(score_result))
             log.error(error_message)
-            fail['feedback']=error_message
+            fail['feedback'] = error_message
             return fail
 
         for tag in ['score', 'feedback', 'grader_type', 'success', 'grader_id', 'submission_id']:
             if tag not in score_result:
-                error_message=("External grader message is missing required tag: {0}"
-                .format(tag))
+                error_message = ("External grader message is missing required tag: {0}"
+                                 .format(tag))
                 log.error(error_message)
-                fail['feedback']=error_message
+                fail['feedback'] = error_message
                 return fail
-        #This is to support peer grading
+            #This is to support peer grading
         if isinstance(score_result['score'], list):
-            feedback_items=[]
-            for i in xrange(0,len(score_result['score'])):
-                new_score_result={
-                    'score' : score_result['score'][i],
-                    'feedback' : score_result['feedback'][i],
-                    'grader_type' : score_result['grader_type'],
-                    'success' : score_result['success'],
-                    'grader_id' : score_result['grader_id'][i],
-                    'submission_id' : score_result['submission_id']
-                    }
+            feedback_items = []
+            for i in xrange(0, len(score_result['score'])):
+                new_score_result = {
+                    'score': score_result['score'][i],
+                    'feedback': score_result['feedback'][i],
+                    'grader_type': score_result['grader_type'],
+                    'success': score_result['success'],
+                    'grader_id': score_result['grader_id'][i],
+                    'submission_id': score_result['submission_id']
+                }
                 feedback_items.append(self._format_feedback(new_score_result))
             if join_feedback:
-                feedback="".join(feedback_items)
+                feedback = "".join(feedback_items)
             else:
-                feedback=feedback_items
+                feedback = feedback_items
             score = int(median(score_result['score']))
         else:
             #This is for instructor and ML grading
             feedback = self._format_feedback(score_result)
-            score=score_result['score']
+            score = score_result['score']
 
-        self.submission_id=score_result['submission_id']
-        self.grader_id=score_result['grader_id']
+        self.submission_id = score_result['submission_id']
+        self.grader_id = score_result['grader_id']
 
-        return {'valid' : True, 'score' : score, 'feedback' : feedback}
+        return {'valid': True, 'score': score, 'feedback': feedback}
 
     def latest_post_assessment(self, short_feedback=False, join_feedback=True):
         """
@@ -468,17 +470,18 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         if not short_feedback:
             return feedback_dict['feedback'] if feedback_dict['valid'] else ''
         if feedback_dict['valid']:
-            short_feedback = self._convert_longform_feedback_to_html(json.loads(self.history[-1].get('post_assessment', "")))
+            short_feedback = self._convert_longform_feedback_to_html(
+                json.loads(self.history[-1].get('post_assessment', "")))
         return short_feedback if feedback_dict['valid'] else ''
 
-    def format_feedback_with_evaluation(self,feedback):
+    def format_feedback_with_evaluation(self, feedback):
         """
         Renders a given html feedback into an evaluation template
         @param feedback: HTML feedback
         @return: Rendered html
         """
-        context={'msg' : feedback, 'id' : "1", 'rows' : 50, 'cols' : 50}
-        html= render_to_string('open_ended_evaluation.html', context)
+        context = {'msg': feedback, 'id': "1", 'rows': 50, 'cols': 50}
+        html = render_to_string('open_ended_evaluation.html', context)
         return html
 
     def handle_ajax(self, dispatch, get, system):
@@ -494,10 +497,10 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         handlers = {
             'save_answer': self.save_answer,
             'score_update': self.update_score,
-            'save_post_assessment' : self.message_post,
-            'skip_post_assessment' : self.skip_post_assessment,
-            'check_for_score' : self.check_for_score,
-            }
+            'save_post_assessment': self.message_post,
+            'skip_post_assessment': self.skip_post_assessment,
+            'check_for_score': self.check_for_score,
+        }
 
         if dispatch not in handlers:
             return 'Error'
@@ -508,7 +511,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         d.update({
             'progress_changed': after != before,
             'progress_status': Progress.to_js_status_str(after),
-            })
+        })
         return json.dumps(d, cls=ComplexEncoder)
 
     def check_for_score(self, get, system):
@@ -519,7 +522,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         @return: Returns the current state
         """
         state = self.state
-        return {'state' : state}
+        return {'state': state}
 
     def save_answer(self, get, system):
         """
@@ -545,7 +548,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         self.send_to_grader(get['student_answer'], system)
         self.change_state(self.ASSESSING)
 
-        return {'success': True,}
+        return {'success': True, }
 
     def update_score(self, get, system):
         """
@@ -571,11 +574,11 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             latest = self.latest_answer()
             previous_answer = latest if latest is not None else self.initial_display
             post_assessment = self.latest_post_assessment()
-            score= self.latest_score()
+            score = self.latest_score()
             correct = 'correct' if self.is_submission_correct(score) else 'incorrect'
         else:
-            post_assessment=""
-            correct=""
+            post_assessment = ""
+            correct = ""
             previous_answer = self.initial_display
 
         context = {
@@ -583,17 +586,18 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             'previous_answer': previous_answer,
             'state': self.state,
             'allow_reset': self._allow_reset(),
-            'rows' : 30,
-            'cols' : 80,
-            'id' : 'open_ended',
-            'msg' : post_assessment,
-            'child_type' : 'openended',
-            'correct' : correct,
-            }
+            'rows': 30,
+            'cols': 80,
+            'id': 'open_ended',
+            'msg': post_assessment,
+            'child_type': 'openended',
+            'correct': correct,
+        }
         log.debug(context)
         html = system.render_template('open_ended.html', context)
         return html
 
+
 class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
     """
     Module for adding open ended response questions to courses
@@ -627,7 +631,7 @@ class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
             """Assumes that xml_object has child k"""
             return xml_object.xpath(k)[0]
 
-        return {'oeparam': parse('openendedparam'),}
+        return {'oeparam': parse('openendedparam'), }
 
 
     def definition_to_xml(self, resource_fs):
diff --git a/common/lib/xmodule/xmodule/openendedchild.py b/common/lib/xmodule/xmodule/openendedchild.py
index ce1b15074f..aa83a35c9d 100644
--- a/common/lib/xmodule/xmodule/openendedchild.py
+++ b/common/lib/xmodule/xmodule/openendedchild.py
@@ -63,11 +63,11 @@ class OpenEndedChild():
     DONE = 'done'
 
     #This is used to tell students where they are at in the module
-    HUMAN_NAMES={
-        'initial' : 'Started',
-        'assessing' : 'Being scored',
-        'post_assessment' : 'Scoring finished',
-        'done' : 'Problem complete',
+    HUMAN_NAMES = {
+        'initial': 'Started',
+        'assessing': 'Being scored',
+        'post_assessment': 'Scoring finished',
+        'done': 'Problem complete',
     }
 
     def __init__(self, system, location, definition, descriptor, static_data,
@@ -84,7 +84,7 @@ class OpenEndedChild():
         # Scores are on scale from 0 to max_score
         self.history = instance_state.get('history', [])
 
-        self.state = instance_state.get('state', 'initial')
+        self.state = instance_state.get('state', self.INITIAL)
 
         self.created = instance_state.get('created', "False")
 
@@ -171,8 +171,8 @@ class OpenEndedChild():
             'state': self.state,
             'max_score': self._max_score,
             'attempts': self.attempts,
-            'created' : "False",
-            }
+            'created': "False",
+        }
         return json.dumps(state)
 
     def _allow_reset(self):
@@ -244,8 +244,8 @@ class OpenEndedChild():
         @param score: Numeric score.
         @return: Boolean correct.
         """
-        correct=False
-        if(isinstance(score,(int, long, float, complex))):
+        correct = False
+        if(isinstance(score, (int, long, float, complex))):
             score_ratio = int(score) / float(self.max_score())
             correct = (score_ratio >= 0.66)
         return correct
@@ -255,7 +255,7 @@ class OpenEndedChild():
         Checks to see if the last response in the module is correct.
         @return: 'correct' if correct, otherwise 'incorrect'
         """
-        score=self.get_score()['score']
+        score = self.get_score()['score']
         correctness = 'correct' if self.is_submission_correct(score) else 'incorrect'
         return correctness
 
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index 88632a38d0..870f3ea169 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -40,6 +40,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         </submitmessage>
     </selfassessment>
     """
+
     def setup_response(self, system, location, definition, descriptor):
         """
         Sets up the module
@@ -76,7 +77,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
             'initial_message': self.get_message_html(),
             'state': self.state,
             'allow_reset': self._allow_reset(),
-            'child_type' : 'selfassessment',
+            'child_type': 'selfassessment',
         }
 
         html = system.render_template('self_assessment_prompt.html', context)
@@ -112,7 +113,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         })
         return json.dumps(d, cls=ComplexEncoder)
 
-    def get_rubric_html(self,system):
+    def get_rubric_html(self, system):
         """
         Return the appropriate version of the rubric, based on the state.
         """
@@ -121,8 +122,8 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
 
         # we'll render it
         context = {'rubric': self.rubric,
-                   'max_score' : self._max_score,
-                   }
+                   'max_score': self._max_score,
+        }
 
         if self.state == self.ASSESSING:
             context['read_only'] = False
@@ -133,7 +134,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
 
         return system.render_template('self_assessment_rubric.html', context)
 
-    def get_hint_html(self,system):
+    def get_hint_html(self, system):
         """
         Return the appropriate version of the hint view, based on state.
         """
@@ -201,7 +202,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         return {
             'success': True,
             'rubric_html': self.get_rubric_html(system)
-            }
+        }
 
     def save_assessment(self, get, system):
         """
@@ -228,7 +229,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
 
         self.record_latest_score(score)
 
-        d = {'success': True,}
+        d = {'success': True, }
 
         if score == self.max_score():
             self.change_state(self.DONE)
@@ -264,7 +265,6 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
                 'allow_reset': self._allow_reset()}
 
 
-
 class SelfAssessmentDescriptor(XmlDescriptor, EditingDescriptor):
     """
     Module for adding self assessment questions to courses
@@ -302,7 +302,7 @@ class SelfAssessmentDescriptor(XmlDescriptor, EditingDescriptor):
 
         return {'submitmessage': parse('submitmessage'),
                 'hintprompt': parse('hintprompt'),
-                }
+        }
 
     def definition_to_xml(self, resource_fs):
         '''Return an xml element representing this definition.'''

From 1dca370a7f9b0f328ebf1da826f1304aebd60696 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 11 Jan 2013 09:50:43 -0500
Subject: [PATCH 204/541] Better initial documentation of combined open ended

---
 .../xmodule/xmodule/combined_open_ended_module.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 358a3b6995..17355e9ce2 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -39,6 +39,19 @@ class CombinedOpenEndedModule(XModule):
     """
     This is a module that encapsulates all open ended grading (self assessment, peer assessment, etc).
     It transitions between problems, and support arbitrary ordering.
+    Each combined open ended module contains one or multiple "child" modules.
+    Child modules track their own state, and can transition between states.  They also implement get_html and
+    handle_ajax.
+    The combined open ended module transitions between child modules as appropriate, tracks its own state, and passess
+    ajax requests from the browser to the child module or handles them itself (in the cases of reset and next problem)
+    ajax actions implemented by all children are:
+        'save_answer' -- Saves the student answer
+        'save_assessment' -- Saves the student assessment (or external grader assessment)
+        'save_post_assessment' -- saves a post assessment (hint, feedback on feedback, etc)
+    ajax actions implemented by combined open ended module are:
+        'reset' -- resets the whole combined open ended module and returns to the first child module
+        'next_problem' -- moves to the next child module
+        'get_results' -- gets results from a given child module
     """
     STATE_VERSION = 1
 
@@ -163,7 +176,7 @@ class CombinedOpenEndedModule(XModule):
 
     def child_modules(self):
         """
-        Returns the functions associated with the child modules in a dictionary.  This makes writing functions
+        Returns the constructors associated with the child modules in a dictionary.  This makes writing functions
         simpler (saves code duplication)
         Input: None
         Output: A dictionary of dictionaries containing the descriptor functions and module functions

From 5d40d22136cd76acb999669446621138e765c14a Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Fri, 11 Jan 2013 09:52:46 -0500
Subject: [PATCH 205/541] revised rejected state error message content, markup,
 and styling on registration's right hand side status area

---
 .../sass/multicourse/_testcenter-register.scss  | 10 +++++++---
 lms/templates/test_center_register.html         | 17 ++++++++++++-----
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/lms/static/sass/multicourse/_testcenter-register.scss b/lms/static/sass/multicourse/_testcenter-register.scss
index b2b860b60b..974c108e0b 100644
--- a/lms/static/sass/multicourse/_testcenter-register.scss
+++ b/lms/static/sass/multicourse/_testcenter-register.scss
@@ -377,7 +377,7 @@ $red: rgb(178, 6, 16);
 						}
 					}
 
-					.details, .item {
+					.details, .item, .instructions {
 						@include transition(opacity, 0.10s, ease-in-out);
 						font-size: 13px;
 						opacity: 0.65;
@@ -432,6 +432,10 @@ $red: rgb(178, 6, 16);
 							color: red;
 							content: "rejected";
 						}
+
+						.call-link {
+							font-weight: bold;
+						}
 					}
 
 					&.status-initial {
@@ -448,14 +452,14 @@ $red: rgb(178, 6, 16);
 
 					&:hover {
 
-						.details, .item {
+						.details, .item, .instructions {
 							opacity: 1.0;
 						}
 					}
 				}
 
 				// sub menus
-				.accommodations-list {
+				.accommodations-list, .error-list {
 					list-style: none;
 					margin: ($baseline/2) 0;
 					padding: 0;
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index ea63b8261a..6e042d5dc2 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -8,7 +8,7 @@
 
 <%namespace name='static' file='static_content.html'/>
 
-<%block name="title"><title>Pearson VUE Test Center Proctoring - Sign Up</title></%block>
+<%block name="title"><title>Pearson VUE Test Center Proctoring - Registration</title></%block>
 
 <%block name="js_extra">
   <script type="text/javascript">
@@ -350,8 +350,12 @@
           <h4 class="title">Demographic Information</h4>
           <p class="details">The demographic information you most recently provided has been rejected by Pearson. You can correct and submit it again before the exam registration closes on <strong>${exam_info.registration_end_date_text}</strong>.
           The error message is:</p>
-          <p class="details">${registration.testcenter_user.upload_error_message}.</p>
-          <p class="details">If the error is not correctable by revising demographic information and resubmitting, please contact edX at <a href="${exam_help_href}">exam-help@edx.org</a>.</p>
+          
+          <ul class="error-list">
+            <li class="item">${registration.testcenter_user.upload_error_message}.</li>
+          </ul>
+          
+          <p class="instructions">If the error is not correctable by revising demographic information and resubmitting, please contact edX at <a class="contact-link" href="${exam_help_href}">exam-help@edx.org</a>.</p>
         </li>
         % endif     
 
@@ -398,8 +402,11 @@
         <li class="item status status-rejected status-registration">
           <h4 class="title">Registration Request</h4>
           <p class="details">Your exam registration has been rejected by Pearson. <strong>You currently cannot schedule an exam</strong>.
-          Please contact edX at <a href="${exam_help_href}">exam-help@edx.org</a>.  The error message is:</p>
-          <p class="details">${registration.upload_error_message}.</p>
+          Please contact edX at <a class="contact-link" href="${exam_help_href}">exam-help@edx.org</a>.  The errors found include:</p>
+          
+          <ul class="error-list">
+            <li class="item">${registration.upload_error_message}.</li>
+          </ul>
         </li>
         % endif     
 

From 5dd83e4d5fb2d31d18522be16aebfa3ff4e0a9c6 Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Fri, 11 Jan 2013 11:10:51 -0500
Subject: [PATCH 206/541] Remove import

---
 common/djangoapps/student/models.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index 46e316ac0b..cf7bc7696a 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -49,7 +49,6 @@ from django.db.models.signals import post_save
 from django.dispatch import receiver
 
 import comment_client as cc
-from django_comment_client.models import Role
 
 
 log = logging.getLogger(__name__)

From 52164f58ffb0edf577343df6856c8488457aedae Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 11 Jan 2013 11:39:32 -0500
Subject: [PATCH 207/541] Fix self.get call in peer grading service

---
 lms/djangoapps/open_ended_grading/grading_service.py      | 1 +
 lms/djangoapps/open_ended_grading/peer_grading_service.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lms/djangoapps/open_ended_grading/grading_service.py b/lms/djangoapps/open_ended_grading/grading_service.py
index 96bd931448..7362411daa 100644
--- a/lms/djangoapps/open_ended_grading/grading_service.py
+++ b/lms/djangoapps/open_ended_grading/grading_service.py
@@ -62,6 +62,7 @@ class GradingService(object):
         """
         Make a get request to the grading controller
         """
+        log.debug(params)
         op = lambda: self.session.get(url,
                                       allow_redirects=allow_redirects,
                                       params=params)
diff --git a/lms/djangoapps/open_ended_grading/peer_grading_service.py b/lms/djangoapps/open_ended_grading/peer_grading_service.py
index 859499ff7e..9ef0383fb5 100644
--- a/lms/djangoapps/open_ended_grading/peer_grading_service.py
+++ b/lms/djangoapps/open_ended_grading/peer_grading_service.py
@@ -81,7 +81,7 @@ class PeerGradingService(GradingService):
         self.get_problem_list_url = self.url + '/get_problem_list/'
 
     def get_next_submission(self, problem_location, grader_id):
-        response = self.get(self.get_next_submission_url, False, 
+        response = self.get(self.get_next_submission_url,
                 {'location': problem_location, 'grader_id': grader_id})
         return response
 

From 7febe2c2c811742d73d153cfd7afbe19025ca23d Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 11 Jan 2013 12:43:57 -0500
Subject: [PATCH 208/541] Integrate minimal rubric display

---
 .../css/combinedopenended/display.scss        |  45 ++++++++
 .../lib/xmodule/xmodule/open_ended_module.py  | 109 +++++++++++++++++-
 lms/templates/open_ended_feedback.html        |   1 +
 lms/templates/open_ended_rubric.html          |  17 +++
 4 files changed, 170 insertions(+), 2 deletions(-)
 create mode 100644 lms/templates/open_ended_rubric.html

diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
index b5eb4b52e6..75e87e1f07 100644
--- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -576,4 +576,49 @@ section.open-ended-child {
     font-size: 0.9em;
   }
 
+  .rubric {
+        tr {
+            margin:10px 0px;
+            height: 100%;
+        }
+        td {
+            padding: 20px 0px;
+            margin: 10px 0px;
+            height: 100%;
+        }
+        th {
+            padding: 5px;
+            margin: 5px;
+        }
+        label,
+        .view-only {
+            margin:10px;
+            position: relative;
+            padding: 15px;
+            width: 200px;
+            height:100%;
+            display: inline-block;
+            min-height: 50px;
+            min-width: 50px;
+            background-color: #CCC;
+            font-size: 1em;
+        }
+        .grade {
+          position: absolute;
+          bottom:0px;
+          right:0px;
+          margin:10px;
+        }
+        .selected-grade {
+          background: #666;
+          color: white;
+        }
+        input[type=radio]:checked + label {
+          background: #666;
+          color: white; }
+        input[class='score-selection'] {
+          display: none;
+        }
+    }
+
 }
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 45d6501816..e4f74a9124 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -376,7 +376,11 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             Return error message or feedback template
         """
 
+        log.debug(response_items)
+        rubric_feedback=""
         feedback = self._convert_longform_feedback_to_html(response_items)
+        if response_items['rubric_scores_complete']:
+            rubric_feedback = self.render_rubric(response_items['rubric_xml'])
 
         if not response_items['success']:
             return system.render_template("open_ended_error.html",
@@ -386,6 +390,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             'grader_type': response_items['grader_type'],
             'score': "{0} / {1}".format(response_items['score'], self.max_score()),
             'feedback': feedback,
+            'rubric_feedback' : rubric_feedback
         })
 
         return feedback_template
@@ -429,7 +434,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
                 log.error(error_message)
                 fail['feedback'] = error_message
                 return fail
-            #This is to support peer grading
+        #This is to support peer grading
         if isinstance(score_result['score'], list):
             feedback_items = []
             for i in xrange(0, len(score_result['score'])):
@@ -439,7 +444,9 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
                     'grader_type': score_result['grader_type'],
                     'success': score_result['success'],
                     'grader_id': score_result['grader_id'][i],
-                    'submission_id': score_result['submission_id']
+                    'submission_id': score_result['submission_id'],
+                    'rubric_scores_complete' : score_result['rubric_scores_complete'],
+                    'rubric_xml' : score_result['rubric_xml'],
                 }
                 feedback_items.append(self._format_feedback(new_score_result))
             if join_feedback:
@@ -597,6 +604,104 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         html = system.render_template('open_ended.html', context)
         return html
 
+    def render_rubric(self, rubric_xml):
+        rubric_categories = OpenEndedModule.extract_rubric_categories(rubric_xml)
+        html = render_to_string('open_ended_rubric.html', rubric_categories)
+        return html
+
+    @staticmethod
+    def extract_rubric_categories(element):
+        '''
+        Contstruct a list of categories such that the structure looks like:
+        [ { category: "Category 1 Name",
+            options: [{text: "Option 1 Name", points: 0}, {text:"Option 2 Name", points: 5}]
+            },
+           { category: "Category 2 Name",
+             options: [{text: "Option 1 Name", points: 0},
+                         {text: "Option 2 Name", points: 1},
+                         {text: "Option 3 Name", points: 2]}]
+
+        '''
+        element = etree.fromstring(element)
+        categories = []
+        for category in element:
+            if category.tag != 'category':
+                raise Exception("[capa.inputtypes.extract_categories] Expected a <category> tag: got {0} instead".format(category.tag))
+            else:
+                categories.append(OpenEndedModule.extract_category(category))
+        return categories
+
+    @staticmethod
+    def extract_category(category):
+        '''
+        construct an individual category
+        {category: "Category 1 Name",
+         options: [{text: "Option 1 text", points: 1},
+                   {text: "Option 2 text", points: 2}]}
+
+        all sorting and auto-point generation occurs in this function
+        '''
+        descriptionxml = category[0]
+        scorexml = category[1]
+        optionsxml = category[2:]
+
+        # parse description
+        if descriptionxml.tag != 'description':
+            raise Exception("[extract_category]: expected description tag, got {0} instead".format(descriptionxml.tag))
+
+        if scorexml.tag != 'score':
+            raise Exception("[extract_category]: expected score tag, got {0} instead".format(descriptionxml.tag))
+
+        description = descriptionxml.text
+        score = int(scorexml.text)
+
+        cur_points = 0
+        options = []
+        autonumbering = True
+        # parse options
+        for option in optionsxml:
+            if option.tag != 'option':
+                raise Exception("[extract_category]: expected option tag, got {0} instead".format(option.tag))
+            else:
+                pointstr = option.get("points")
+                if pointstr:
+                    autonumbering = False
+                    # try to parse this into an int
+                    try:
+                        points = int(pointstr)
+                    except ValueError:
+                        raise Exception("[extract_category]: expected points to have int, got {0} instead".format(pointstr))
+                elif autonumbering:
+                    # use the generated one if we're in the right mode
+                    points = cur_points
+                    cur_points = cur_points + 1
+                else:
+                    raise Exception("[extract_category]: missing points attribute. Cannot continue to auto-create points values after a points value is explicitly dfined.")
+                optiontext = option.text
+                options.append({'text': option.text, 'points': points})
+
+        # sort and check for duplicates
+        options = sorted(options, key=lambda option: option['points'])
+        OpenEndedModule.validate_options(options)
+
+        return {'description': description, 'options': options, 'score' : score}
+
+    @staticmethod
+    def validate_options(options):
+        '''
+        Validates a set of options. This can and should be extended to filter out other bad edge cases
+        '''
+        if len(options) == 0:
+            raise Exception("[extract_category]: no options associated with this category")
+        if len(options) == 1:
+            return
+        prev = options[0]['points']
+        for option in options[1:]:
+            if prev == option['points']:
+                raise Exception("[extract_category]: found duplicate point values between two different options")
+            else:
+                prev = option['points']
+
 
 class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
     """
diff --git a/lms/templates/open_ended_feedback.html b/lms/templates/open_ended_feedback.html
index cb90006456..d8aa3d1a9e 100644
--- a/lms/templates/open_ended_feedback.html
+++ b/lms/templates/open_ended_feedback.html
@@ -12,5 +12,6 @@
         <div class="result-output">
             ${ feedback | n}
         </div>
+        ${rubric_feedback | n}
     </div>
 </section>
\ No newline at end of file
diff --git a/lms/templates/open_ended_rubric.html b/lms/templates/open_ended_rubric.html
new file mode 100644
index 0000000000..f89cecee80
--- /dev/null
+++ b/lms/templates/open_ended_rubric.html
@@ -0,0 +1,17 @@
+<table class="rubric">
+    % for i in range(len(categories)):
+    <% category = categories[i] %>
+    <tr>
+        <th>${category['description']}</th>
+        % for j in range(len(category['options'])):
+        <% option = category['options'][j] %>
+        <td>
+            <div class="view-only">
+                ${option['text']}
+                <div class="grade">[${option['points']} points]</div>
+            </div>
+        </td>
+        % endfor
+    </tr>
+    % endfor
+</table>
\ No newline at end of file

From 9a752f51c74e93533f3a4e16c182443242f8d75c Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 11 Jan 2013 12:48:15 -0500
Subject: [PATCH 209/541] Fix rubric return, add in score field

---
 common/lib/xmodule/xmodule/open_ended_module.py | 2 +-
 lms/templates/open_ended_rubric.html            | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index e4f74a9124..caa4701f14 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -606,7 +606,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
     def render_rubric(self, rubric_xml):
         rubric_categories = OpenEndedModule.extract_rubric_categories(rubric_xml)
-        html = render_to_string('open_ended_rubric.html', rubric_categories)
+        html = render_to_string('open_ended_rubric.html', {'rubric_categories'  : rubric_categories})
         return html
 
     @staticmethod
diff --git a/lms/templates/open_ended_rubric.html b/lms/templates/open_ended_rubric.html
index f89cecee80..36de4fff2e 100644
--- a/lms/templates/open_ended_rubric.html
+++ b/lms/templates/open_ended_rubric.html
@@ -1,8 +1,9 @@
 <table class="rubric">
-    % for i in range(len(categories)):
-    <% category = categories[i] %>
+    % for i in range(len(rubric_categories)):
+    <% category = rubric_categories[i] %>
     <tr>
         <th>${category['description']}</th>
+        <td>${category['score']}</td>
         % for j in range(len(category['options'])):
         <% option = category['options'][j] %>
         <td>

From 682ac3455b21387befc718212747cba1bb2fd342 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 11 Jan 2013 15:51:37 -0500
Subject: [PATCH 210/541] Address some comments from code review, fix rubric
 display

---
 .../xmodule/combined_open_ended_module.py     | 28 ++++++++++++++-----
 .../lib/xmodule/xmodule/open_ended_module.py  |  8 +++---
 common/lib/xmodule/xmodule/openendedchild.py  |  4 +--
 lms/templates/open_ended_rubric.html          |  2 +-
 4 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 17355e9ce2..15bc72abb4 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -52,6 +52,11 @@ class CombinedOpenEndedModule(XModule):
         'reset' -- resets the whole combined open ended module and returns to the first child module
         'next_problem' -- moves to the next child module
         'get_results' -- gets results from a given child module
+
+    Types of children. Task is synonymous with child module, so each combined open ended module
+    incorporates multiple children (tasks):
+        openendedmodule
+        selfassessmentmodule
     """
     STATE_VERSION = 1
 
@@ -60,7 +65,6 @@ class CombinedOpenEndedModule(XModule):
     ASSESSING = 'assessing'
     INTERMEDIATE_DONE = 'intermediate_done'
     DONE = 'done'
-    TASK_TYPES = ["self", "ml", "instructor", "peer"]
 
     js = {'coffee': [resource_string(__name__, 'js/src/combinedopenended/display.coffee'),
                      resource_string(__name__, 'js/src/collapsible.coffee'),
@@ -216,23 +220,33 @@ class CombinedOpenEndedModule(XModule):
         current_task_type = self.get_tag_name(self.current_task_xml)
 
         children = self.child_modules()
+        child_task_module = children['modules'][current_task_type]
 
         self.current_task_descriptor = children['descriptors'][current_task_type](self.system)
+
+        #This is the xml object created from the xml definition of the current task
         etree_xml = etree.fromstring(self.current_task_xml)
 
+        #This sends the etree_xml object through the descriptor module of the current task, and
+        #returns the xml parsed by the descriptor
         self.current_task_parsed_xml = self.current_task_descriptor.definition_from_xml(etree_xml, self.system)
         if current_task_state is None and self.current_task_number == 0:
-            self.current_task = children['modules'][current_task_type](self.system, self.location,
+            self.current_task = child_task_module(self.system, self.location,
                 self.current_task_parsed_xml, self.current_task_descriptor, self.static_data)
             self.task_states.append(self.current_task.get_instance_state())
             self.state = self.ASSESSING
         elif current_task_state is None and self.current_task_number > 0:
             last_response_data = self.get_last_response(self.current_task_number - 1)
             last_response = last_response_data['response']
-            current_task_state = (
-            '{"state": "' + str(self.ASSESSING) + '", "version": 1, "max_score": ' + str(self._max_score) + ', ' +
-            '"attempts": 0, "created": "True", "history": [{"answer": "' + str(last_response) + '"}]}')
-            self.current_task = children['modules'][current_task_type](self.system, self.location,
+            current_task_state=json.dumps({
+                'state' : self.assessing,
+                'version' : self.STATE_VERSION,
+                'max_score' : self._max_score,
+                'attempts' : 0,
+                'created' : True,
+                'history' : [{'answer' : str(last_response)}],
+            })
+            self.current_task = child_task_module(self.system, self.location,
                 self.current_task_parsed_xml, self.current_task_descriptor, self.static_data,
                 instance_state=current_task_state)
             self.task_states.append(self.current_task.get_instance_state())
@@ -240,7 +254,7 @@ class CombinedOpenEndedModule(XModule):
         else:
             if self.current_task_number > 0 and not reset:
                 current_task_state = self.overwrite_state(current_task_state)
-            self.current_task = children['modules'][current_task_type](self.system, self.location,
+            self.current_task = child_task_module(self.system, self.location,
                 self.current_task_parsed_xml, self.current_task_descriptor, self.static_data,
                 instance_state=current_task_state)
 
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index caa4701f14..e6acb6409c 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -78,10 +78,10 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         self._parse(oeparam, self.prompt, self.rubric, system)
 
-        if self.created == "True" and self.state == self.ASSESSING:
-            self.created = "False"
+        if self.created == True and self.state == self.ASSESSING:
+            self.created = False
             self.send_to_grader(self.latest_answer(), system)
-            self.created = "False"
+            self.created = False
 
     def _parse(self, oeparam, prompt, rubric, system):
         '''
@@ -379,7 +379,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         log.debug(response_items)
         rubric_feedback=""
         feedback = self._convert_longform_feedback_to_html(response_items)
-        if response_items['rubric_scores_complete']:
+        if response_items['rubric_scores_complete']==True:
             rubric_feedback = self.render_rubric(response_items['rubric_xml'])
 
         if not response_items['success']:
diff --git a/common/lib/xmodule/xmodule/openendedchild.py b/common/lib/xmodule/xmodule/openendedchild.py
index aa83a35c9d..2ba9528237 100644
--- a/common/lib/xmodule/xmodule/openendedchild.py
+++ b/common/lib/xmodule/xmodule/openendedchild.py
@@ -86,7 +86,7 @@ class OpenEndedChild():
 
         self.state = instance_state.get('state', self.INITIAL)
 
-        self.created = instance_state.get('created', "False")
+        self.created = instance_state.get('created', False)
 
         self.attempts = instance_state.get('attempts', 0)
         self.max_attempts = static_data['max_attempts']
@@ -171,7 +171,7 @@ class OpenEndedChild():
             'state': self.state,
             'max_score': self._max_score,
             'attempts': self.attempts,
-            'created': "False",
+            'created': False,
         }
         return json.dumps(state)
 
diff --git a/lms/templates/open_ended_rubric.html b/lms/templates/open_ended_rubric.html
index 36de4fff2e..c6310dea4d 100644
--- a/lms/templates/open_ended_rubric.html
+++ b/lms/templates/open_ended_rubric.html
@@ -3,7 +3,7 @@
     <% category = rubric_categories[i] %>
     <tr>
         <th>${category['description']}</th>
-        <td>${category['score']}</td>
+        <td>Your Score: ${category['score']}  </td>
         % for j in range(len(category['options'])):
         <% option = category['options'][j] %>
         <td>

From 7d0bb7b3fe120a6a7e75cba4f40c4bc46d938aeb Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 11 Jan 2013 16:02:09 -0500
Subject: [PATCH 211/541] Minor string to boolean fix

---
 common/lib/xmodule/xmodule/combined_open_ended_module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 15bc72abb4..cd0be0aa6e 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -173,7 +173,7 @@ class CombinedOpenEndedModule(XModule):
         loaded_task_state = json.loads(current_task_state)
         if loaded_task_state['state'] == self.INITIAL:
             loaded_task_state['state'] = self.ASSESSING
-            loaded_task_state['created'] = "True"
+            loaded_task_state['created'] = True
             loaded_task_state['history'].append({'answer': last_response})
             current_task_state = json.dumps(loaded_task_state)
         return current_task_state

From 3d0384692caf087834d026e3761b8937d90ce848 Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Fri, 11 Jan 2013 17:50:02 -0500
Subject: [PATCH 212/541] add pearson_make_tc_registration command

---
 .../management/commands/pearson_export_ead.py |   2 +
 .../commands/pearson_make_tc_registration.py  | 182 ++++++++++++++++++
 .../commands/pearson_make_tc_user.py          |   3 +
 common/djangoapps/student/models.py           |  30 ++-
 common/djangoapps/student/views.py            |   1 -
 5 files changed, 208 insertions(+), 10 deletions(-)
 create mode 100644 common/djangoapps/student/management/commands/pearson_make_tc_registration.py

diff --git a/common/djangoapps/student/management/commands/pearson_export_ead.py b/common/djangoapps/student/management/commands/pearson_export_ead.py
index 3a3aa25ea8..0e5ffb0243 100644
--- a/common/djangoapps/student/management/commands/pearson_export_ead.py
+++ b/common/djangoapps/student/management/commands/pearson_export_ead.py
@@ -80,6 +80,8 @@ class Command(BaseCommand):
                                   for csv_field, model_field
                                   in Command.CSV_TO_MODEL_FIELDS.items())
                     record["LastUpdate"] = record["LastUpdate"].strftime("%Y/%m/%d %H:%M:%S")
+                    record["EligibilityApptDateFirst"] = record["EligibilityApptDateFirst"].strftime("%Y/%m/%d")
+                    record["EligibilityApptDateLast"] = record["EligibilityApptDateLast"].strftime("%Y/%m/%d")
                     if kwargs['force_add']:
                         record['AuthorizationTransactionType'] = 'Add'
 
diff --git a/common/djangoapps/student/management/commands/pearson_make_tc_registration.py b/common/djangoapps/student/management/commands/pearson_make_tc_registration.py
new file mode 100644
index 0000000000..21a2da442a
--- /dev/null
+++ b/common/djangoapps/student/management/commands/pearson_make_tc_registration.py
@@ -0,0 +1,182 @@
+from optparse import make_option
+
+from django.contrib.auth.models import User
+from django.core.management.base import BaseCommand, CommandError
+
+from student.models import TestCenterUser, TestCenterRegistration, TestCenterRegistrationForm, get_testcenter_registration
+from student.views import course_from_id
+from xmodule.course_module import CourseDescriptor
+
+class Command(BaseCommand):
+    option_list = BaseCommand.option_list + (
+        # registration info:
+        make_option(
+            '--accommodation_request',
+            action='store',
+            dest='accommodation_request',
+        ),        
+        make_option(
+            '--accommodation_code',
+            action='store',
+            dest='accommodation_code',
+        ),        
+        make_option(
+            '--client_authorization_id',
+            action='store',
+            dest='client_authorization_id',
+        ),        
+        # exam info:     
+        make_option(
+            '--exam_series_code',
+            action='store',
+            dest='exam_series_code',
+        ),        
+        make_option(
+            '--eligibility_appointment_date_first',
+            action='store',
+            dest='eligibility_appointment_date_first',
+        ),        
+        make_option(
+            '--eligibility_appointment_date_last',
+            action='store',
+            dest='eligibility_appointment_date_last',
+        ),
+        # internal values:
+        make_option(
+            '--authorization_id',
+            action='store',
+            dest='authorization_id',
+            help='ID we receive from Pearson for a particular authorization'
+        ),   
+        make_option(
+            '--upload_status',
+            action='store',
+            dest='upload_status',
+            help='status value assigned by Pearson'
+        ),   
+        make_option(
+            '--upload_error_message',
+            action='store',
+            dest='upload_error_message',
+            help='error message provided by Pearson on a failure.'
+        ),   
+        # control values:
+        make_option(
+            '--ignore_registration_dates',
+            action='store_true',
+            dest='ignore_registration_dates',
+            help='find exam info for course based on exam_series_code, even if it is not active.'
+        ),   
+    )
+    args = "<student_username course_id>"
+    help = "Create a TestCenterRegistration entry for a given Student"
+
+    @staticmethod
+    def is_valid_option(option_name):
+        base_options = set(option.dest for option in BaseCommand.option_list)
+        return option_name not in base_options
+
+
+    def handle(self, *args, **options):
+        username = args[0]
+        course_id = args[1]
+        print username, course_id
+
+        our_options = dict((k, v) for k, v in options.items()
+                           if Command.is_valid_option(k) and v is not None)
+        student = User.objects.get(username=username)
+        try:
+            testcenter_user = TestCenterUser.objects.get(user=student)
+        except TestCenterUser.DoesNotExist:
+            raise CommandError("User {%s} does not exist".format(student))
+            
+        # check to see if a course_id was specified, and use information from that:
+        course = course_from_id(course_id)
+        if course is not None:
+            if 'ignore_registration_dates' in our_options:
+                examlist = [exam for exam in course.test_center_exams if exam.exam_series_code == our_options.get('exam_series_code')]
+                exam = examlist[0] if len(examlist) > 0 else None
+            else:
+                exam = course.current_test_center_exam
+        else: 
+            # otherwise use explicit values (so we don't have to define a course):    
+            exam_name = "Dummy Placeholder Name"
+            exam_info = { 'Exam_Series_Code': our_options['exam_series_code'],
+                          'First_Eligible_Appointment_Date' : our_options['eligibility_appointment_date_first'],
+                          'Last_Eligible_Appointment_Date' : our_options['eligibility_appointment_date_last'],
+                          }
+            exam = CourseDescriptor.TestCenterExam(course_id, exam_name, exam_info)
+
+        if exam is None:
+            raise CommandError("Exam for course_id {%s} does not exist".format(course_id))
+
+        exam_code = exam.exam_series_code
+            
+        UPDATE_FIELDS = ( 'accommodation_request',
+                          'accommodation_code',
+                          'client_authorization_id',
+                          'exam_series_code',
+                          'eligibility_appointment_date_first',
+                          'eligibility_appointment_date_last',
+                          )
+        
+        # create and save the registration:
+        needs_updating = False
+        registrations = get_testcenter_registration(student, course_id, exam_code)
+        if len(registrations) > 0:
+            registration = registrations[0]
+            for fieldname in UPDATE_FIELDS:
+                if fieldname in our_options and registration.__getattribute__(fieldname) != our_options[fieldname]:
+                    needs_updating = True;
+        else:
+            accommodation_request = our_options.get('accommodation_request','')
+            registration = TestCenterRegistration.create(testcenter_user, exam, accommodation_request)
+            needs_updating = True
+
+            
+        if needs_updating:
+            # first update the record with the new values, if any:
+            for fieldname in UPDATE_FIELDS:
+                if fieldname in our_options and fieldname not in TestCenterRegistrationForm.Meta.fields: 
+                    registration.__setattr__(fieldname, our_options[fieldname])
+            
+            # the registration form normally populates the data dict with 
+            # the accommodation request (if any).  But here we want to
+            # specify only those values that might change, so update the dict with existing
+            # values.
+            form_options = dict(our_options)
+            for propname in TestCenterRegistrationForm.Meta.fields:
+                if propname not in form_options: 
+                    form_options[propname] = registration.__getattribute__(propname)
+            form = TestCenterRegistrationForm(instance=registration, data=form_options)
+            if form.is_valid():
+                form.update_and_save()
+                print "Updated registration information for user's registration: username \"{}\" course \"{}\", examcode \"{}\"".format(student.username, course_id, exam_code) 
+            else:
+                if (len(form.errors) > 0):
+                    print "Field Form errors encountered:"
+                for fielderror in form.errors:
+                    print "Field Form Error:  %s" % fielderror
+                    if (len(form.non_field_errors()) > 0):
+                        print "Non-field Form errors encountered:"
+                        for nonfielderror in form.non_field_errors:
+                            print "Non-field Form Error:  %s" % nonfielderror
+                    
+        else:
+            print "No changes necessary to make to existing user's registration."
+            
+        # override internal values:
+        change_internal = False
+        registration = get_testcenter_registration(student, course_id, exam_code)[0]
+        for internal_field in [ 'upload_error_message', 'upload_status', 'authorization_id']:
+            if internal_field in our_options:
+                registration.__setattr__(internal_field, our_options[internal_field])
+                change_internal = True
+                
+        if change_internal:
+            print "Updated  confirmation information in existing user's registration."
+            registration.save()
+        else:
+            print "No changes necessary to make to confirmation information in existing user's registration."
+        
+            
diff --git a/common/djangoapps/student/management/commands/pearson_make_tc_user.py b/common/djangoapps/student/management/commands/pearson_make_tc_user.py
index f4eca62e28..2426b7f2ce 100644
--- a/common/djangoapps/student/management/commands/pearson_make_tc_user.py
+++ b/common/djangoapps/student/management/commands/pearson_make_tc_user.py
@@ -136,4 +136,7 @@ class Command(BaseCommand):
                 
         if change_internal:
             testcenter_user.save()
+            print "Updated  confirmation information in existing user's demographics."
+        else:
+            print "No changes necessary to make to confirmation information in existing user's demographics."
             
diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index c916b31ba6..da6f260a7d 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -230,11 +230,15 @@ class TestCenterUser(models.Model):
                 return True
             
         return False    
-                              
+                       
+    @staticmethod
+    def _generate_edx_id():
+        NUM_DIGITS = 12
+        return u"edX{:012}".format(randint(1, 10**NUM_DIGITS-1))
+    
     @staticmethod
     def _generate_candidate_id():
-        NUM_DIGITS = 12
-        return u"edX%0d" % randint(1, 10**NUM_DIGITS-1)
+        return TestCenterUser._generate_edx_id()
         
     @staticmethod
     def create(user):
@@ -408,9 +412,19 @@ class TestCenterRegistration(models.Model):
 
     @property
     def authorization_transaction_type(self):
-        if self.uploaded_at is None:
+        if self.authorization_id is not None:
+            return 'Update'
+        elif self.uploaded_at is None:
             return 'Add'
         else:
+            # TODO: decide what to send when we have uploaded an initial version,
+            # but have not received confirmation back from that upload.  If the 
+            # registration here has been changed, then we don't know if this changed
+            # registration should be submitted as an 'add' or an 'update'. 
+            #
+            # If the first registration were lost or in error (e.g. bad code), 
+            # the second should be an "Add".  If the first were processed successfully,
+            # then the second should be an "Update".  We just don't know....
             return 'Update'
         
     @property
@@ -432,10 +446,8 @@ class TestCenterRegistration(models.Model):
 
     @staticmethod
     def _generate_authorization_id():
-        NUM_DIGITS = 12
-        return u"edX%0d" % randint(1, 10**NUM_DIGITS-1) # binascii.hexlify(os.urandom(8))
-    
-    
+        return TestCenterUser._generate_edx_id()
+        
     @staticmethod
     def _create_client_authorization_id():
         """
@@ -515,7 +527,7 @@ class TestCenterRegistration(models.Model):
 class TestCenterRegistrationForm(ModelForm):
     class Meta:
         model = TestCenterRegistration
-        fields = ( 'accommodation_request', )
+        fields = ( 'accommodation_request', 'accommodation_code' )
         
     def update_and_save(self):
         registration = self.save(commit=False)
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index f23ccd4668..72c7798eb2 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -46,7 +46,6 @@ from courseware.courses import get_courses_by_university
 from courseware.access import has_access
 
 from statsd import statsd
-from django.contrib.localflavor.ie.ie_counties import IE_COUNTY_CHOICES
 
 log = logging.getLogger("mitx.student")
 Article = namedtuple('Article', 'title url author image deck publication publish_date')

From 8e059ff93497cb670d6d5869b06a4f072c003791 Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Sat, 12 Jan 2013 00:58:04 -0500
Subject: [PATCH 213/541] fix placeholders for phone_country_code values, and
 subject line of exam_help email.

---
 lms/templates/test_center_register.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index 6e042d5dc2..a0bba90445 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -103,7 +103,9 @@
   
   % if registration:
   
-   <% exam_help_href = "mailto:exam-help@edx.org?subject=Pearson VUE Exam - %s %s".format(get_course_about_section(course, 'university'), course.number) %>
+   <% 
+     exam_help_href = "mailto:exam-help@edx.org?subject=Pearson VUE Exam - " + get_course_about_section(course, 'university') + " - " + course.number 
+   %>
 
    % if  registration.is_rejected:      
   <section class="status message message-flash registration-rejected message-action">
@@ -234,7 +236,7 @@
               </div>
               <div class="field required" id="field-phone_country_code">
                 <label for="phone_country_code">Phone Country Code</label>
-                <input id="phone_country_code" class="short" type="text" name="phone_country_code" value="${testcenteruser.phone_country_code}" placeholder="e.g. USA" />
+                <input id="phone_country_code" class="short" type="text" name="phone_country_code" value="${testcenteruser.phone_country_code}" placeholder="e.g. 1, 44, 976" />
               </div>
             </li>
             <li class="field-group faxinfo">
@@ -244,7 +246,7 @@
               </div>
               <div class="field" id="field-fax_country_code">
                 <label for="fax_country_code">Fax Country Code</label>
-                <input id="fax_country_code" class="short" type="text" name="fax_country_code" value="${testcenteruser.fax_country_code}" placeholder="e.g. USA" />
+                <input id="fax_country_code" class="short" type="text" name="fax_country_code" value="${testcenteruser.fax_country_code}" placeholder="e.g. 1, 44, 976" />
               </div>
             </li>
             <li class="field" id="field-company_name">

From c7339ee6644e49121637ba7c888f64906f11056b Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 14 Jan 2013 10:16:57 -0500
Subject: [PATCH 214/541] Minor bug fix

---
 common/lib/xmodule/xmodule/combined_open_ended_module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index cd0be0aa6e..a88acc6ffd 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -239,7 +239,7 @@ class CombinedOpenEndedModule(XModule):
             last_response_data = self.get_last_response(self.current_task_number - 1)
             last_response = last_response_data['response']
             current_task_state=json.dumps({
-                'state' : self.assessing,
+                'state' : self.ASSESSING,
                 'version' : self.STATE_VERSION,
                 'max_score' : self._max_score,
                 'attempts' : 0,

From 0567e8f0aaad9b8a61dcb9e4bfb05ec6dff46adf Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 14 Jan 2013 10:35:53 -0500
Subject: [PATCH 215/541] Factor out rubric rendering

---
 .../xmodule/combined_open_ended_rubric.py     | 116 ++++++++++++++++++
 .../lib/xmodule/xmodule/open_ended_module.py  | 102 +--------------
 lms/templates/open_ended_rubric.html          |   4 +-
 3 files changed, 122 insertions(+), 100 deletions(-)
 create mode 100644 common/lib/xmodule/xmodule/combined_open_ended_rubric.py

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_rubric.py b/common/lib/xmodule/xmodule/combined_open_ended_rubric.py
new file mode 100644
index 0000000000..445d066416
--- /dev/null
+++ b/common/lib/xmodule/xmodule/combined_open_ended_rubric.py
@@ -0,0 +1,116 @@
+from mitxmako.shortcuts import render_to_string
+
+class CombinedOpenEndedRubric:
+
+    def render_rubric(self, rubric_xml):
+        rubric_categories = CombinedOpenEndedRubric.extract_rubric_categories(rubric_xml)
+        html = render_to_string('open_ended_rubric.html', {'rubric_categories'  : rubric_categories})
+        return html
+
+    @staticmethod
+    def extract_rubric_categories(element):
+        '''
+        Contstruct a list of categories such that the structure looks like:
+        [ { category: "Category 1 Name",
+            options: [{text: "Option 1 Name", points: 0}, {text:"Option 2 Name", points: 5}]
+            },
+           { category: "Category 2 Name",
+             options: [{text: "Option 1 Name", points: 0},
+                         {text: "Option 2 Name", points: 1},
+                         {text: "Option 3 Name", points: 2]}]
+
+        '''
+        element = etree.fromstring(element)
+        categories = []
+        for category in element:
+            if category.tag != 'category':
+                raise Exception("[capa.inputtypes.extract_categories] Expected a <category> tag: got {0} instead".format(category.tag))
+            else:
+                categories.append(CombinedOpenEndedRubric.extract_category(category))
+        return categories
+
+    @staticmethod
+    def extract_category(category):
+        '''
+        construct an individual category
+        {category: "Category 1 Name",
+         options: [{text: "Option 1 text", points: 1},
+                   {text: "Option 2 text", points: 2}]}
+
+        all sorting and auto-point generation occurs in this function
+        '''
+
+        has_score=False
+        descriptionxml = category[0]
+        scorexml = category[1]
+        if score_xml.tag == "option":
+            optionsxml = category[1:]
+        else:
+            optionsxml = category[2:]
+            has_score=True
+
+        # parse description
+        if descriptionxml.tag != 'description':
+            raise Exception("[extract_category]: expected description tag, got {0} instead".format(descriptionxml.tag))
+
+        if has_score:
+            if scorexml.tag != 'score':
+                raise Exception("[extract_category]: expected score tag, got {0} instead".format(scorexml.tag))
+
+        for option in optionsxml:
+            if option.tag != "option":
+                raise Exception("[extract_category]: expected option tag, got {0} instead".format(option.tag))
+
+        description = descriptionxml.text
+
+        if has_score:
+            score = int(scorexml.text)
+        else:
+            score = 0
+
+        cur_points = 0
+        options = []
+        autonumbering = True
+        # parse options
+        for option in optionsxml:
+            if option.tag != 'option':
+                raise Exception("[extract_category]: expected option tag, got {0} instead".format(option.tag))
+            else:
+                pointstr = option.get("points")
+                if pointstr:
+                    autonumbering = False
+                    # try to parse this into an int
+                    try:
+                        points = int(pointstr)
+                    except ValueError:
+                        raise Exception("[extract_category]: expected points to have int, got {0} instead".format(pointstr))
+                elif autonumbering:
+                    # use the generated one if we're in the right mode
+                    points = cur_points
+                    cur_points = cur_points + 1
+                else:
+                    raise Exception("[extract_category]: missing points attribute. Cannot continue to auto-create points values after a points value is explicitly dfined.")
+                optiontext = option.text
+                options.append({'text': option.text, 'points': points})
+
+        # sort and check for duplicates
+        options = sorted(options, key=lambda option: option['points'])
+        CombinedOpenEndedRubric.validate_options(options)
+
+        return {'description': description, 'options': options, 'score' : score, 'has_score' : has_score}
+
+    @staticmethod
+    def validate_options(options):
+        '''
+        Validates a set of options. This can and should be extended to filter out other bad edge cases
+        '''
+        if len(options) == 0:
+            raise Exception("[extract_category]: no options associated with this category")
+        if len(options) == 1:
+            return
+        prev = options[0]['points']
+        for option in options[1:]:
+            if prev == option['points']:
+                raise Exception("[extract_category]: found duplicate point values between two different options")
+            else:
+                prev = option['points']
\ No newline at end of file
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index e6acb6409c..11f96c9848 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -35,6 +35,8 @@ from numpy import median
 
 from datetime import datetime
 
+from combined_open_ended_rubric import CombinedOpenEndedRubric
+
 log = logging.getLogger("mitx.courseware")
 
 class OpenEndedModule(openendedchild.OpenEndedChild):
@@ -380,7 +382,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         rubric_feedback=""
         feedback = self._convert_longform_feedback_to_html(response_items)
         if response_items['rubric_scores_complete']==True:
-            rubric_feedback = self.render_rubric(response_items['rubric_xml'])
+            rubric_feedback = CombinedOpenEndedRubric.render_rubric(response_items['rubric_xml'])
 
         if not response_items['success']:
             return system.render_template("open_ended_error.html",
@@ -604,104 +606,6 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         html = system.render_template('open_ended.html', context)
         return html
 
-    def render_rubric(self, rubric_xml):
-        rubric_categories = OpenEndedModule.extract_rubric_categories(rubric_xml)
-        html = render_to_string('open_ended_rubric.html', {'rubric_categories'  : rubric_categories})
-        return html
-
-    @staticmethod
-    def extract_rubric_categories(element):
-        '''
-        Contstruct a list of categories such that the structure looks like:
-        [ { category: "Category 1 Name",
-            options: [{text: "Option 1 Name", points: 0}, {text:"Option 2 Name", points: 5}]
-            },
-           { category: "Category 2 Name",
-             options: [{text: "Option 1 Name", points: 0},
-                         {text: "Option 2 Name", points: 1},
-                         {text: "Option 3 Name", points: 2]}]
-
-        '''
-        element = etree.fromstring(element)
-        categories = []
-        for category in element:
-            if category.tag != 'category':
-                raise Exception("[capa.inputtypes.extract_categories] Expected a <category> tag: got {0} instead".format(category.tag))
-            else:
-                categories.append(OpenEndedModule.extract_category(category))
-        return categories
-
-    @staticmethod
-    def extract_category(category):
-        '''
-        construct an individual category
-        {category: "Category 1 Name",
-         options: [{text: "Option 1 text", points: 1},
-                   {text: "Option 2 text", points: 2}]}
-
-        all sorting and auto-point generation occurs in this function
-        '''
-        descriptionxml = category[0]
-        scorexml = category[1]
-        optionsxml = category[2:]
-
-        # parse description
-        if descriptionxml.tag != 'description':
-            raise Exception("[extract_category]: expected description tag, got {0} instead".format(descriptionxml.tag))
-
-        if scorexml.tag != 'score':
-            raise Exception("[extract_category]: expected score tag, got {0} instead".format(descriptionxml.tag))
-
-        description = descriptionxml.text
-        score = int(scorexml.text)
-
-        cur_points = 0
-        options = []
-        autonumbering = True
-        # parse options
-        for option in optionsxml:
-            if option.tag != 'option':
-                raise Exception("[extract_category]: expected option tag, got {0} instead".format(option.tag))
-            else:
-                pointstr = option.get("points")
-                if pointstr:
-                    autonumbering = False
-                    # try to parse this into an int
-                    try:
-                        points = int(pointstr)
-                    except ValueError:
-                        raise Exception("[extract_category]: expected points to have int, got {0} instead".format(pointstr))
-                elif autonumbering:
-                    # use the generated one if we're in the right mode
-                    points = cur_points
-                    cur_points = cur_points + 1
-                else:
-                    raise Exception("[extract_category]: missing points attribute. Cannot continue to auto-create points values after a points value is explicitly dfined.")
-                optiontext = option.text
-                options.append({'text': option.text, 'points': points})
-
-        # sort and check for duplicates
-        options = sorted(options, key=lambda option: option['points'])
-        OpenEndedModule.validate_options(options)
-
-        return {'description': description, 'options': options, 'score' : score}
-
-    @staticmethod
-    def validate_options(options):
-        '''
-        Validates a set of options. This can and should be extended to filter out other bad edge cases
-        '''
-        if len(options) == 0:
-            raise Exception("[extract_category]: no options associated with this category")
-        if len(options) == 1:
-            return
-        prev = options[0]['points']
-        for option in options[1:]:
-            if prev == option['points']:
-                raise Exception("[extract_category]: found duplicate point values between two different options")
-            else:
-                prev = option['points']
-
 
 class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
     """
diff --git a/lms/templates/open_ended_rubric.html b/lms/templates/open_ended_rubric.html
index c6310dea4d..3eee9600e2 100644
--- a/lms/templates/open_ended_rubric.html
+++ b/lms/templates/open_ended_rubric.html
@@ -3,7 +3,9 @@
     <% category = rubric_categories[i] %>
     <tr>
         <th>${category['description']}</th>
-        <td>Your Score: ${category['score']}  </td>
+        % if category['has_score'] == True:
+            <td>Your Score: ${category['score']}  </td>
+        % endif
         % for j in range(len(category['options'])):
         <% option = category['options'][j] %>
         <td>

From 2b4929562a046d4d7a1fa2954309fd4397c797a2 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 14 Jan 2013 10:39:58 -0500
Subject: [PATCH 216/541] Fix up rubric rendering

---
 .../lib/xmodule/xmodule/combined_open_ended_rubric.py  | 10 +++++++---
 common/lib/xmodule/xmodule/self_assessment_module.py   |  6 +++++-
 lms/templates/self_assessment_rubric.html              |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_rubric.py b/common/lib/xmodule/xmodule/combined_open_ended_rubric.py
index 445d066416..2dd3eb587b 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_rubric.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_rubric.py
@@ -2,9 +2,13 @@ from mitxmako.shortcuts import render_to_string
 
 class CombinedOpenEndedRubric:
 
-    def render_rubric(self, rubric_xml):
-        rubric_categories = CombinedOpenEndedRubric.extract_rubric_categories(rubric_xml)
-        html = render_to_string('open_ended_rubric.html', {'rubric_categories'  : rubric_categories})
+    @staticmethod
+    def render_rubric(rubric_xml):
+        try:
+            rubric_categories = CombinedOpenEndedRubric.extract_rubric_categories(rubric_xml)
+            html = render_to_string('open_ended_rubric.html', {'rubric_categories'  : rubric_categories})
+        except:
+            html = rubric_xml
         return html
 
     @staticmethod
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index 870f3ea169..940b61c557 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -21,6 +21,8 @@ from .xml_module import XmlDescriptor
 from xmodule.modulestore import Location
 import openendedchild
 
+from combined_open_ended_rubric import CombinedOpenEndedRubric
+
 log = logging.getLogger("mitx.courseware")
 
 class SelfAssessmentModule(openendedchild.OpenEndedChild):
@@ -120,8 +122,10 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         if self.state == self.INITIAL:
             return ''
 
+        rubric_html  = CombinedOpenEndedRubric.render_rubric(self.rubric)
+
         # we'll render it
-        context = {'rubric': self.rubric,
+        context = {'rubric': rubric_html,
                    'max_score': self._max_score,
         }
 
diff --git a/lms/templates/self_assessment_rubric.html b/lms/templates/self_assessment_rubric.html
index 5bcb3bba93..2d32ffe8d3 100644
--- a/lms/templates/self_assessment_rubric.html
+++ b/lms/templates/self_assessment_rubric.html
@@ -1,7 +1,7 @@
 <div class="assessment">
     <div class="rubric">
     <h3>Self-assess your answer with this rubric:</h3>
-    ${rubric}
+    ${rubric | n }
     </div>
 
     % if not read_only:

From 59e5b494a9e3ad8b89bab40f6ffb4766f149b625 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 14 Jan 2013 10:51:17 -0500
Subject: [PATCH 217/541] Proper rubric rendering for self assessment

---
 common/lib/xmodule/xmodule/combined_open_ended_rubric.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_rubric.py b/common/lib/xmodule/xmodule/combined_open_ended_rubric.py
index 2dd3eb587b..a0ce900756 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_rubric.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_rubric.py
@@ -1,4 +1,8 @@
 from mitxmako.shortcuts import render_to_string
+import logging
+from lxml import etree
+
+log=logging.getLogger(__name__)
 
 class CombinedOpenEndedRubric:
 
@@ -8,6 +12,7 @@ class CombinedOpenEndedRubric:
             rubric_categories = CombinedOpenEndedRubric.extract_rubric_categories(rubric_xml)
             html = render_to_string('open_ended_rubric.html', {'rubric_categories'  : rubric_categories})
         except:
+            log.exception("Could not parse the rubric.")
             html = rubric_xml
         return html
 
@@ -47,7 +52,7 @@ class CombinedOpenEndedRubric:
         has_score=False
         descriptionxml = category[0]
         scorexml = category[1]
-        if score_xml.tag == "option":
+        if scorexml.tag == "option":
             optionsxml = category[1:]
         else:
             optionsxml = category[2:]

From 3e0cf9d234a0df720b6cc2e4a4ad4c50538d1655 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 14 Jan 2013 11:53:23 -0500
Subject: [PATCH 218/541] Make rubric render more nicely

---
 .../xmodule/combined_open_ended_rubric.py     |  6 +-
 .../css/combinedopenended/display.scss        | 92 ++++++++++---------
 lms/templates/open_ended_rubric.html          | 12 ++-
 3 files changed, 63 insertions(+), 47 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_rubric.py b/common/lib/xmodule/xmodule/combined_open_ended_rubric.py
index a0ce900756..0b2ca1ca2c 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_rubric.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_rubric.py
@@ -100,7 +100,11 @@ class CombinedOpenEndedRubric:
                 else:
                     raise Exception("[extract_category]: missing points attribute. Cannot continue to auto-create points values after a points value is explicitly dfined.")
                 optiontext = option.text
-                options.append({'text': option.text, 'points': points})
+                selected = False
+                if has_score:
+                    if points == score:
+                        selected = True
+                options.append({'text': option.text, 'points': points, 'selected' : selected})
 
         # sort and check for duplicates
         options = sorted(options, key=lambda option: option['points'])
diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
index 75e87e1f07..a58e30f1e2 100644
--- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -219,6 +219,53 @@ div.result-container {
       }
 }
 
+div.result-container, section.open-ended-child {
+    .rubric {
+            tr {
+                margin:10px 0px;
+                height: 100%;
+            }
+            td {
+                padding: 20px 0px;
+                margin: 10px 0px;
+                height: 100%;
+            }
+            th {
+                padding: 5px;
+                margin: 5px;
+            }
+            label,
+            .view-only {
+                margin:10px;
+                position: relative;
+                padding: 15px;
+                width: 200px;
+                height:100%;
+                display: inline-block;
+                min-height: 50px;
+                min-width: 50px;
+                background-color: #CCC;
+                font-size: 1em;
+            }
+            .grade {
+              position: absolute;
+              bottom:0px;
+              right:0px;
+              margin:10px;
+            }
+            .selected-grade {
+              background: #666;
+              color: white;
+            }
+            input[type=radio]:checked + label {
+              background: #666;
+              color: white; }
+            input[class='score-selection'] {
+              display: none;
+            }
+        }
+}
+
 section.open-ended-child {
   @media print {
     display: block;
@@ -576,49 +623,4 @@ section.open-ended-child {
     font-size: 0.9em;
   }
 
-  .rubric {
-        tr {
-            margin:10px 0px;
-            height: 100%;
-        }
-        td {
-            padding: 20px 0px;
-            margin: 10px 0px;
-            height: 100%;
-        }
-        th {
-            padding: 5px;
-            margin: 5px;
-        }
-        label,
-        .view-only {
-            margin:10px;
-            position: relative;
-            padding: 15px;
-            width: 200px;
-            height:100%;
-            display: inline-block;
-            min-height: 50px;
-            min-width: 50px;
-            background-color: #CCC;
-            font-size: 1em;
-        }
-        .grade {
-          position: absolute;
-          bottom:0px;
-          right:0px;
-          margin:10px;
-        }
-        .selected-grade {
-          background: #666;
-          color: white;
-        }
-        input[type=radio]:checked + label {
-          background: #666;
-          color: white; }
-        input[class='score-selection'] {
-          display: none;
-        }
-    }
-
 }
diff --git a/lms/templates/open_ended_rubric.html b/lms/templates/open_ended_rubric.html
index 3eee9600e2..889e771263 100644
--- a/lms/templates/open_ended_rubric.html
+++ b/lms/templates/open_ended_rubric.html
@@ -4,14 +4,24 @@
     <tr>
         <th>${category['description']}</th>
         % if category['has_score'] == True:
+        <div class="view-only">
             <td>Your Score: ${category['score']}  </td>
+        </div>
         % endif
         % for j in range(len(category['options'])):
         <% option = category['options'][j] %>
         <td>
             <div class="view-only">
                 ${option['text']}
-                <div class="grade">[${option['points']} points]</div>
+                % if option.has_key('selected'):
+                    % if option['selected'] == True:
+                        <div class="selected-grade">[${option['points']} points]</div>
+                    %else:
+                        <div class="grade">[${option['points']} points]</div>
+                    % endif
+                % else:
+                    <div class="grade">[${option['points']} points]</div>
+                %endif
             </div>
         </td>
         % endfor

From 16f06ae7b79a0feecf7e3610b587fe90d67bb542 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 14 Jan 2013 11:57:09 -0500
Subject: [PATCH 219/541] Fix some minor html

---
 lms/templates/open_ended_rubric.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lms/templates/open_ended_rubric.html b/lms/templates/open_ended_rubric.html
index 889e771263..0048ff578d 100644
--- a/lms/templates/open_ended_rubric.html
+++ b/lms/templates/open_ended_rubric.html
@@ -4,9 +4,9 @@
     <tr>
         <th>${category['description']}</th>
         % if category['has_score'] == True:
-        <div class="view-only">
-            <td>Your Score: ${category['score']}  </td>
-        </div>
+            <td>
+                  Your Score: ${category['score']}
+            </td>
         % endif
         % for j in range(len(category['options'])):
         <% option = category['options'][j] %>

From a64806656a4634fc17c17426dce0381361f97909 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 14 Jan 2013 12:20:27 -0500
Subject: [PATCH 220/541] Integrate rubric into self assessment

---
 lms/templates/open_ended_rubric.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lms/templates/open_ended_rubric.html b/lms/templates/open_ended_rubric.html
index 0048ff578d..9f8a2ece4e 100644
--- a/lms/templates/open_ended_rubric.html
+++ b/lms/templates/open_ended_rubric.html
@@ -2,12 +2,12 @@
     % for i in range(len(rubric_categories)):
     <% category = rubric_categories[i] %>
     <tr>
-        <th>${category['description']}</th>
-        % if category['has_score'] == True:
-            <td>
-                  Your Score: ${category['score']}
-            </td>
-        % endif
+        <th>
+            ${category['description']}
+            % if category['has_score'] == True:
+                (Your score: ${category['score']})
+            % endif
+        </th>
         % for j in range(len(category['options'])):
         <% option = category['options'][j] %>
         <td>

From ad1e73fa861e3cae07ad2cf4c350f400896ed6ab Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 14 Jan 2013 13:12:38 -0500
Subject: [PATCH 221/541] Clean up capa by removing message post actions that
 aren't needed

---
 common/lib/capa/capa/capa_problem.py      | 18 ------------------
 common/lib/xmodule/xmodule/capa_module.py | 15 ---------------
 2 files changed, 33 deletions(-)

diff --git a/common/lib/capa/capa/capa_problem.py b/common/lib/capa/capa/capa_problem.py
index efc96fc717..2eaa0e4286 100644
--- a/common/lib/capa/capa/capa_problem.py
+++ b/common/lib/capa/capa/capa_problem.py
@@ -186,24 +186,6 @@ class LoncapaProblem(object):
             maxscore += responder.get_max_score()
         return maxscore
 
-    def message_post(self,event_info):
-        """
-        Handle an ajax post that contains feedback on feedback
-        Returns a boolean success variable
-        Note:  This only allows for feedback to be posted back to the grading controller for the first
-        open ended response problem on each page.  Multiple problems will cause some sync issues.
-        TODO: Handle multiple problems on one page sync issues.
-        """
-        success=False
-        message = "Could not find a valid responder."
-        log.debug("in lcp")
-        for responder in self.responders.values():
-            if hasattr(responder, 'handle_message_post'):
-                success, message = responder.handle_message_post(event_info)
-                if success:
-                    break
-        return success, message
-
     def get_score(self):
         """
         Compute score for this problem.  The score is the number of points awarded.
diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py
index 08f503f127..1da271072a 100644
--- a/common/lib/xmodule/xmodule/capa_module.py
+++ b/common/lib/xmodule/xmodule/capa_module.py
@@ -380,7 +380,6 @@ class CapaModule(XModule):
             'problem_save': self.save_problem,
             'problem_show': self.get_answer,
             'score_update': self.update_score,
-            'message_post' : self.message_post,
             }
 
         if dispatch not in handlers:
@@ -395,20 +394,6 @@ class CapaModule(XModule):
             })
         return json.dumps(d, cls=ComplexEncoder)
 
-    def message_post(self, get):
-        """
-        Posts a message from a form to an appropriate location
-        """
-        event_info = dict()
-        event_info['state'] = self.lcp.get_state()
-        event_info['problem_id'] = self.location.url()
-        event_info['student_id'] = self.system.anonymous_student_id
-        event_info['survey_responses']= get
-
-        success, message = self.lcp.message_post(event_info)
-
-        return {'success' : success, 'message' : message}
-
     def closed(self):
         ''' Is the student still allowed to submit answers? '''
         if self.attempts == self.max_attempts:

From 2f99d38e906ad6de4bc8488e04f1d2afac13e8c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s=20Rocha?= <rocha@edx.org>
Date: Mon, 14 Jan 2013 13:22:46 -0500
Subject: [PATCH 222/541] Update FAQ page: new content and styling

---
 lms/static/images/bullet-closed.png           | Bin 0 -> 230 bytes
 lms/static/images/bullet-open.png             | Bin 0 -> 219 bytes
 lms/static/js/faq.js                          |  10 +
 lms/static/sass/multicourse/_about_pages.scss |  18 ++
 lms/templates/static_templates/faq.html       | 300 +++++++++++++++---
 5 files changed, 289 insertions(+), 39 deletions(-)
 create mode 100644 lms/static/images/bullet-closed.png
 create mode 100644 lms/static/images/bullet-open.png
 create mode 100644 lms/static/js/faq.js

diff --git a/lms/static/images/bullet-closed.png b/lms/static/images/bullet-closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..897d9f6223e184ea8c6bcbac9b752a8c86704dd7
GIT binary patch
literal 230
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1G9iA?ZAr-fhe*FJ$&uk<%vwrJ*Ms|ji#!Vb43cDUic_c6k
zsPFT<@~>fCBWHUeqr)EgjM)skSoC-m5*UtrZ=A)`ag~9IDPT4ekiNV{Zds=Uufhff
z2?ptos~0#z=5RdT@F0+b>yp!gN318BbSgxwnMC6i)FK?acs6Rb9hZx`ByeE52?G-k
Z!vP`p^-dZU?}2V&@O1TaS?83{1OUUbOP~M%

literal 0
HcmV?d00001

diff --git a/lms/static/images/bullet-open.png b/lms/static/images/bullet-open.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c09bd429bdf7956a84e016a8f417095e59e8d8e
GIT binary patch
literal 219
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1GwVp1HAr-fh{`~)M&#c+d+34c1iB0Sx>-BTYnaoO8#hY>p
zSRS#vXvBR`3#?{R?oc)QuXUpBuY*p5^GDVNNzOau8|H93XbDVDTA>|a%X_7S!9#VC
z=064@=2Nu|oCb@e*-P%#C`@H|D&>@WoWEh#HReJlGfTHw$4wj>7#UoZRo=Z3%H{<+
Ogu&C*&t;ucLK6U|r$?Ot

literal 0
HcmV?d00001

diff --git a/lms/static/js/faq.js b/lms/static/js/faq.js
new file mode 100644
index 0000000000..ce0ac7e875
--- /dev/null
+++ b/lms/static/js/faq.js
@@ -0,0 +1,10 @@
+$(document).ready(function() {
+    var open_question = "";
+    var question_id;
+
+    $('.response').click(function(){
+        $(this).toggleClass('opened');
+	answer = $(this).find(".answer");
+        answer.slideToggle('fast');
+    });
+});
diff --git a/lms/static/sass/multicourse/_about_pages.scss b/lms/static/sass/multicourse/_about_pages.scss
index a72a77c89f..4e38faec6b 100644
--- a/lms/static/sass/multicourse/_about_pages.scss
+++ b/lms/static/sass/multicourse/_about_pages.scss
@@ -194,10 +194,28 @@
         margin-bottom: 40px;
 
         h3 {
+          background: url('/static/images/bullet-closed.png') no-repeat left 0.25em;
           font-family: $sans-serif;
           font-weight: 700;
           margin-bottom: 15px;
+          padding-left: 16px;
+          cursor: pointer;
         }
+
+        .answer {
+          display: none;
+          color: #3c3c3c;
+          padding-left: 16px;
+          font-family: $serif;
+          li {
+            line-height: 1.6em;
+          }
+
+        }
+      }
+
+      .opened h3 {
+        background: url('/static/images/bullet-open.png') no-repeat left 0.25em;
       }
     }
   }
diff --git a/lms/templates/static_templates/faq.html b/lms/templates/static_templates/faq.html
index b0543df264..e91f3d0519 100644
--- a/lms/templates/static_templates/faq.html
+++ b/lms/templates/static_templates/faq.html
@@ -5,6 +5,10 @@
 
 <%block name="title"><title>FAQ</title></%block>
 
+<%block name="js_extra">
+<script src="${static.url('js/faq.js')}"></script>
+</%block>
+
 <section class="container about">
   <nav>
     <a href="${reverse('about_edx')}">Vision</a>
@@ -13,80 +17,298 @@
     <a href="${reverse('contact')}">Contact</a>
   </nav>
 
-
   <section class="faq">
     <section class="responses">
-      <section id="the-organization" class="category">
-        <h2>Organization</h2>
-        <article class="response">
-          <h3>What is edX?</h3>
-          <p>edX is a not-for-profit enterprise of its founding partners, the Massachusetts Institute of Technology (MIT) and Harvard University that offers online learning to on-campus students and to millions of people around the world. To do so, edX is building an open-source online learning platform and hosts an online web portal at <a href="http://www.edx.org">www.edx.org</a> for online education.</p>
-          <p>EdX currently offers HarvardX, <em>MITx</em> and BerkeleyX classes online for free. Beginning in fall 2013, edX will offer WellesleyX and GeorgetownX classes online for free. The University of Texas System includes nine universities and six health institutions. The edX institutions aim to extend their collective reach to build a global community of online students. Along with offering online courses, the three universities undertake research on how students learn and how technology can transform learning both on-campus and online throughout the world.</p>
-        </article>
 
+      <section id="edx_basics_faq" class="category">
+        <h2>edX Basics</h2>
         <article class="response">
-          <h3>Will edX be adding additional X Universities?</h3>
-          <p>More than 200 institutions from around the world have expressed interest in collaborating with edX since Harvard and MIT announced its creation in May. EdX is focused above all on quality and developing the best not-for-profit model for online education. In addition to providing online courses on the edX platform, the "X University" Consortium will be a forum in which members can share experiences around online learning. Harvard, MIT, UC Berkeley, the University of Texas system and the other consortium members will work collaboratively to establish the "X University" Consortium, whose membership will expand to include additional "X Universities". Each member of the consortium will offer courses on the edX platform as an "X University." The gathering of many universities' educational content together on one site will enable learners worldwide to access the offered course content of any participating university from a single website, and to use a set of online educational tools shared by all participating universities.</p>
-          <p>edX will actively explore the addition of other institutions from around the world to the edX platform, and looks forward to adding more "X Universities."</p>
+          <h3 class="question">How do I sign up to take a class?</h3>
+          <div class ="answer" id="edx_basics_faq_answer_0">
+            <p>Simply create an edX account (it's free) and then register for the course of your choice (also free). Follow the prompts on the edX website.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">What does it cost to take a class? Is this really free?</h3>
+          <div class ="answer" id="edx_basics_faq_answer_1">
+            <p>EdX courses are free for everyone. All you need is an Internet connection.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">What happens after I sign up for a course?</h3>
+          <div class ="answer" id="edx_basics_faq_answer_2">
+            <p>You will receive an activation email. Follow the prompts in that email to activate your account. You will need to log in each time you access your course(s). Once the course begins, it’s time to hit the virtual books. You can access the lectures, homework, tutorials, etc., for each week, one week at a time.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">Who can take an edX course?</h3>
+          <div class ="answer" id="edx_basics_faq_answer_3">
+            <p>You, your mom, your little brother, your grandfather -- anyone with Internet access can take an edX course. Free.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">Are the courses only offered in English?</h3>
+          <div class ="answer" id="edx_basics_faq_answer_4">
+            <p>Some edX courses include a translation of the lecture in the text bar to the right of the video. Some have the specific option of requesting a course in other languages. Please check your course to determine foreign language options.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">When will there be more courses on other subjects?</h3>
+          <div class ="answer" id="edx_basics_faq_answer_5">
+            <p>We are continually reviewing and creating courses to add to the edX platform. Please check the website for future course announcements. You can also "friend" edX on Facebook – you’ll receive updates and announcements.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">How can I help edX?</h3>
+          <div class ="answer" id="edx_basics_faq_answer_6">
+            <p>You may not realize it, but just by taking a course you are helping edX. That’s because the edX platform has been specifically designed to not only teach, but also gather data about learning. EdX will utilize this data to find out how to improve education online and on-campus.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">When does my course start and/or finish?</h3>
+          <div class ="answer" id="edx_basics_faq_answer_7">
+            <p>You can find the start and stop dates for each course on each course description page.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">Is there a walk-through of a sample course session?</h3>
+          <div class ="answer" id="edx_basics_faq_answer_8">
+            <p> There are video introductions for every course that will give you a good sense of how the course works and what to expect.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">I don't have the prerequisites for a course that I am interested in. Can I still take the course?</h3>
+          <div class ="answer" id="edx_basics_faq_answer_9">
+            <p>We do not check students for prerequisites, so you are allowed to attempt the course. However, if you do not know prerequisite subjects before taking a class, you will have to learn the prerequisite material on your own over the semester, which can be an extremely difficult task.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">What happens if I have to quit a course, are there any penalties, will I be able to take another course in the future?</h3>
+          <div class ="answer" id="edx_basics_faq_answer_10">
+            <p>You may unregister from an edX course at anytime, there are absolutely no penalties associated with incomplete edX studies, and you may register for the same course (provided we are still offering it) at a later time.</p>
+          </div>
         </article>
       </section>
 
-      <section id="students" class="category">
-        <h2>Students</h2>
+      <section id="classes_faq" class="category">
+        <h2>The Classes</h2>
         <article class="response">
-          <h3>Who can take edX courses? Will there be an admissions process?</h3>
-          <p>EdX will be available to anyone in the world with an internet connection, and in general, there will not be an admissions process.</p>
+          <h3 class="question">How much work will I have to do to pass my course?</h3>
+          <div class ="answer" id="classes_faq_answer_0">
+            <p>The projected hours of study required for each course are described on the specific course description page.</p>
+          </div>
         </article>
         <article class="response">
-          <h3>Will certificates be awarded?</h3>
-          <p>Yes. Online learners who demonstrate mastery of subjects can earn a certificate of completion. Certificates will be issued by edX under the name of the underlying "X University" from where the course originated, i.e. HarvardX, <em>MITx</em> or BerkeleyX.  For the courses in Fall 2012, those certificates will be free.  There is a plan to charge a modest fee for certificates in the future.</p>
+          <h3 class="question">What should I do before I take a course (prerequisites)?</h3>
+          <div class ="answer" id="classes_faq_answer_1">
+            <p>Each course is different – some have prerequisites, and some don’t. Take a look at your specific course’s recommended prerequisites. If you do not have a particular prerequisite, you may still take the course.</p>
+          </div>
         </article>
         <article class="response">
-          <h3>What will the scope of the online courses be? How many? Which faculty?</h3>
-          <p>Our goal is to offer a wide variety of courses across disciplines. There are currently <a href="/courses">nine courses</a> offered for Fall 2012.</p>
+          <h3 class="question">What books should I read? (I am interested in reading materials before the class starts).</h3>
+          <div class ="answer" id="classes_faq_answer_2">
+            <p>Take a look at the specific course prerequisites. All required academic materials will be provided during the course, within the browser. Some of the course descriptions may list additional resources. For supplemental reading material before or during the course, you can post a question on the course’s Discussion Forum to ask your online coursemates for suggestions.</p>
+          </div>
         </article>
         <article class="response">
-          <h3>Who is the learner? Domestic or international? Age range?</h3>
-          <p>Improving teaching and learning for students on our campuses is one of our primary goals. Beyond that, we don't have a target group of potential learners, as the goal is to make these courses available to anyone in the world - from any demographic - who has interest in advancing their own knowledge. The only requirement is to have a computer with an internet connection. More than 150,000 students from over 160 countries registered for MITx's first course, 6.002x: Circuits and Electronics. The age range of students certified in this course was from 14 to 74 years-old.</p>
+          <h3 class="question"> Can I download the book for my course?</h3>
+          <div class ="answer" id="classes_faq_answer_3">
+            <p>EdX book content may only be viewed within the browser, and downloading it violates copyright laws. If you need or want a hard copy of the book, we recommend that you purchase a copy.</p>
+          </div>
         </article>
         <article class="response">
-          <h3>Will participating universities' standards apply to all courses offered on the edX platform?</h3>
-          <p>Yes: the reach changes exponentially, but the rigor remains the same.</p>
+          <h3 class="question">Can I take more than one course at a time?</h3>
+          <div class ="answer" id="classes_faq_answer_4">
+            <p>You may take multiple edX courses, however we recommend checking the requirements on each course description page to determine your available study hours and the demands of the intended courses.</p>
+          </div>
         </article>
         <article class="response">
-          <h3>How do you intend to test whether this approach is improving learning?</h3>
-          <p>Edx institutions have assembled faculty members who will collect and analyze data to assess results and the impact edX is having on learning.</p>
+          <h3 class="question">How do I log in to take an edX class?</h3>
+          <div class ="answer" id="classes_faq_answer_5">
+            <p>Once you sign up for a course and activate your account, click on the "Log In" button on the edx.org home page. You will need to type in your email address and edX password each time you log in.</p>
+          </div>
         </article>
         <article class="response">
-          <h3>How may I apply to study with edX?</h3>
-          <p>Simply complete the online <a href="#signup-modal" rel="leanModal">signup form</a>.  Enrolling will create your unique student record in the edX database, allow you to register for classes, and to receive a certificate on successful completion.</p>
+          <h3 class="question">What time is the class?</h3>
+          <div class ="answer" id="classes_faq_answer_6">
+            <p>EdX classes take place at your convenience. Prefer to sleep in and study late? No worries. Videos and problem sets are available 24 hours a day, which means you can watch video and complete work whenever you have spare time. You simply log in to your course via the Internet and work through the course material, one week at a time.</p>
+          </div>
         </article>
         <article class="response">
-          <h3>How may another university participate in edX? </h3>
-          <p>If you are from a university interested in discussing edX, please email <a href="mailto:university@edx.org">university@edx.org</a></p>
+          <h3 class="question">If I miss a week, how does this affect my grade?</h3>
+          <div class ="answer" id="classes_faq_answer_7">
+            <p>It is certainly possible to pass an edX course if you miss a week; however, coursework is progressive, so you should review and study what you may have missed. You can check your progress dashboard in the course to see your course average along the way if you have any concerns.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">How can I meet/find other students?</h3>
+          <div class ="answer" id="classes_faq_answer_8">
+            <p>All edX courses have Discussion Forums where you can chat with and help each other within the framework of the Honor Code.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">How can I talk to professors, fellows and teaching assistants?</h3>
+          <div class ="answer" id="classes_faq_answer_9">
+            <p>The Discussion Forums are the best place to reach out to the edX teaching team for your class, and you don’t have to wait in line or rearrange your schedule to fit your professor’s – just post your questions. The response isn’t always immediate, but it’s usually pretty darned quick.</p>
+          </div>
         </article>
       </section>
 
-      <section id="technology-platform" class="category">
-        <h2>Technology Platform</h2>
+      <section id="getting_help_faq" class="category">
+        <h2>Getting Help</h2>
         <article class="response">
-          <h3>What technology will edX use?</h3>
-          <p>The edX open-source online learning platform will feature interactive learning designed specifically for the web. Features will include: self-paced learning, online discussion groups, wiki-based collaborative learning, assessment of learning as a student progresses through a course, and online laboratories and other interactive learning tools. The platform will also serve as a laboratory from which data will be gathered to better understand how students learn. Because it is open source, the platform will be continuously improved by a worldwide community of collaborators, with new features added as needs arise.</p>
-          <p>The first version of the technology was used in the first <em>MITx</em> course, 6.002x Circuits and Electronics, which launched in Spring, 2012.</p>
+          <h3 class="question">Can I re-take a course?</h3>
+          <div class ="answer" id="getting_help_faq_answer_0">
+            <p>Good news: there are unlimited "mulligans" in edX. You may re-take edX courses as often as you wish. Your performance in any particular offering of a course will not effect your standing in future offerings of any edX course, including future offerings of the same course.</p>
+          </div>
         </article>
         <article class="response">
-          <h3>How is this different from what other universities are doing online?</h3>
-          <p>EdX is a not-for-profit enterprise built upon the shared educational missions of its founding partners, Harvard University and MIT. The edX platform will be available as open source. Also, a primary goal of edX is to improve teaching and learning on campus by experimenting with blended models of learning and by supporting faculty in conducting significant research on how students learn.</p>
+          <h3 class="question">Enrollment for a course that I am interested in is open, but the course has already started. Can I still enroll?</h3>
+          <div class ="answer" id="getting_help_faq_answer_1">
+            <p>Yes, but you will not be able to turn in any assignments or exams that have already been due. If it is early in the course, you might still be able to earn enough points for a certificate, but you will have to check with the course in question in order to find out more.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">Is there an exam at the end?</h3>
+          <div class ="answer" id="getting_help_faq_answer_2">
+            <p>Different courses have slightly different structures. Please check the course material description to see if there is a final exam or final project.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">Will the same courses be offered again in the future?</h3>
+          <div class ="answer" id="getting_help_faq_answer_3">
+            <p>Existing edX courses will be re-offered, and more courses added.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">Will I get a certificate for taking an edX course?</h3>
+          <div class ="answer" id="getting_help_faq_answer_4">
+            <p>Online learners who receive a passing grade for a course will receive a certificate of mastery from edX and the underlying X University that offered the course. For example, a certificate of mastery for MITx’s 6.002x Circuits & Electronics will come from edX and MITx.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">How are edX certificates delivered?</h3>
+          <div class ="answer" id="getting_help_faq_answer_5">
+            <p>EdX certificates are delivered online through edx.org. So be sure to check your email in the weeks following the final grading – you will be able to download and print your certificate.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">What is the difference between a proctored certificate and an honor code certificate?</h3>
+          <div class ="answer" id="getting_help_faq_answer_6">
+            <p>A proctored certificate is given to students who take and pass an exam under proctored conditions. An honor-code certificate is given to students who have completed all of the necessary online coursework associated with a course and have signed <link> the edX honor code </link>.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">Yes. The requirements for both certificates can be independently satisfied.</h3>
+          <div class ="answer" id="getting_help_faq_answer_7">
+            <p>It is certainly possible to pass an edX course if you miss a week; however, coursework is progressive, so you should review and study what you may have missed. You can check your progress dashboard in the course to see your course average along the way if you have any concerns.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">Will my grade be shown on my certificate?</h3>
+          <div class ="answer" id="getting_help_faq_answer_8">
+            <p>No. Grades are not displayed on either honor code or proctored certificates.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">How can I talk to professors, fellows and teaching assistants?</h3>
+          <div class ="answer" id="getting_help_faq_answer_9">
+            <p>The Discussion Forums are the best place to reach out to the edX teaching team for your class, and you don’t have to wait in line or rearrange your schedule to fit your professor’s – just post your questions. The response isn’t always immediate, but it’s usually pretty darned quick.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">The only certificates distributed with grades by edX were for the initial prototype course.</h3>
+          <div class ="answer" id="getting_help_faq_answer_10">
+            <p>You may unregister from an edX course at anytime, there are absolutely no penalties associated with incomplete edX studies, and you may register for the same course (provided we are still offering it) at a later time.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">Will my university accept my edX coursework for credit?</h3>
+          <div class ="answer" id="getting_help_faq_answer_11">
+            <p>Each educational institution makes its own decision regarding whether to accept edX coursework for credit. Check with your university for its policy.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">I lost my edX certificate – can you resend it to me?</h3>
+          <div class ="answer" id="getting_help_faq_answer_12">
+            <p>Please log back in to your account to find certificates from the same profile page where they were originally posted. You will be able to re-print your certificate from there.</p>
+          </div>
+        </article>
+      </section>
+
+      <section id="open_source_faq" class="category">
+        <h2>edX & Open Source</h2>
+        <article class="response">
+          <h3 class="question">What’s open source?</h3>
+          <div class ="answer" id="open_source_faq_answer_0">
+            <p>Open source is a philosophy that generally refers to making software freely available for use or modification as users see fit. In exchange for use of the software, users generally add their contributions to the software, making it a public collaboration. The edX platform will be made available as open source code in order to allow world talent to improve and share it on an ongoing basis.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">When/how can I get the open-source platform technology?</h3>
+          <div class ="answer" id="open_source_faq_answer_1">
+            <p>We are still building the edX technology platform and will be making announcements in the future about its availability.</p>
+          </div>
+        </article>
+      </section>
+
+      <section id="other_help_faq" class="category">
+        <h2>Other Help Questions - Account Questions</h2>
+        <article class="response">
+          <h3 class="question">My username is taken.</h3>
+          <div class ="answer" id="other_help_faq_answer_0">
+            <p>Now’s your chance to be creative: please try a different, more unique username – for example, try adding a random number to the end.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">Why does my password show on my course login page?</h3>
+          <div class ="answer" id="other_help_faq_answer_1">
+            <p>Oops! This may be because of the way you created your account. For example, you may have mistakenly typed your password into the login box.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">I am having login problems (password/email unrecognized).</h3>
+          <div class ="answer" id="other_help_faq_answer_2">
+            <p>Please check your browser’s settings to make sure that you have the current version of Firefox or Chrome, and then try logging in again. If you find access impossible, you may simply create a new account using an alternate email address – the old, unused account will disappear later.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">I did not receive an activation email.</h3>
+          <div class ="answer" id="other_help_faq_answer_3">
+            <p>If you did not receive an activation email it may be because:</p>
+            <ul>
+              <li>There was a typo in your email address.</li>
+              <li>Your spam filter may have caught the activation email. Please check your spam folder. </li>
+              <li>You may be using an older browser. We recommend downloading the current version of Firefox or Chrome. </li>
+              <li>JavaScript is disabled in your browser. Please check your browser settings and confirm that JavaScript is enabled. </li>
+            </ul>
+            <p>If you continue to have problems activating your account, we recommend that you try creating a new account. There is no need to do anything about the old account. If it is not activated through the link in the email, it will disappear later.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">Can I delete my account?</h3>
+          <div class ="answer" id="other_help_faq_answer_4">
+            <p>There’s no need to delete you account. An old, unused edX account with no course completions associated with it will disappear.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">I am experiencing problems with the display. E.g., There are tools missing from the course display, or I am unable to view video.</h3>
+          <div class ="answer" id="other_help_faq_answer_5">
+            <p>Please check your browser and settings. We recommend downloading the current version of Firefox or Chrome. Alternatively, you may re-register with a different email account. There is no need to delete the old account, as it will disappear if unused.</p>
+          </div>
         </article>
       </section>
 
     </section>
 
     <nav class="categories">
-      <a href="#organization">Organization</a>
-      <a href="#students">Students</a>
-      <a href="#technology-platform">Technology Platform</a>
+      <a href="#edx_basics_faq">edX Basics</a>
+      <a href="#classes_faq">The Classes</a>
+      <a href="#getting_help_faq">Getting Help</a>
+      <a href="#open_source_faq">edX & Open source</a>
+      <a href="#other_help_faq">Other Help Questions - Account Questions</a>
     </nav>
+
   </section>
 </section>
 

From 4ffa00b4009d9014a94a92bff58b16a5f56704ad Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 14 Jan 2013 15:00:13 -0500
Subject: [PATCH 223/541] Add in notifications, peer grading tab, tab image

---
 lms/djangoapps/courseware/tabs.py             | 34 ++++++++++++++++++-
 .../peer_grading_service.py                   |  6 ++++
 .../courseware/course_navigation.html         |  7 +++-
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/lms/djangoapps/courseware/tabs.py b/lms/djangoapps/courseware/tabs.py
index 45b4e1821c..1f13db0064 100644
--- a/lms/djangoapps/courseware/tabs.py
+++ b/lms/djangoapps/courseware/tabs.py
@@ -11,6 +11,7 @@ actually generates the CourseTab.
 
 from collections import namedtuple
 import logging
+import json
 
 from django.conf import settings
 from django.core.urlresolvers import reverse
@@ -20,6 +21,9 @@ from fs.errors import ResourceNotFoundError
 from courseware.access import has_access
 from static_replace import replace_urls
 
+from open_ended_grading.peer_grading_service import PeerGradingService
+from student.models import unique_id_for_user
+
 log = logging.getLogger(__name__)
 
 class InvalidTabsException(Exception):
@@ -28,7 +32,10 @@ class InvalidTabsException(Exception):
     """
     pass
 
-CourseTab = namedtuple('CourseTab', 'name link is_active')
+CourseTabBase = namedtuple('CourseTab', 'name link is_active has_img img')
+
+def CourseTab(name, link, is_active, has_img=False, img=""):
+    return CourseTabBase(name, link, is_active, has_img, img)
 
 # encapsulate implementation for a tab:
 #  - a validation function: takes the config dict and raises
@@ -104,6 +111,30 @@ def _staff_grading(tab, user, course, active_page):
         return [CourseTab('Staff grading', link, active_page == "staff_grading")]
     return []
 
+def _peer_grading(tab, user, course, active_page):
+    link = reverse('peer_grading', args=[course.id])
+    peer_gs = PeerGradingService(settings.PEER_GRADING_INTERFACE)
+    pending_grading=False
+    try:
+        notifications = json.loads(peer_gs.get_notifications(course.id,unique_id_for_user(user)))
+        log.debug(notifications)
+
+        if notifications['success']:
+            if notifications['student_needs_to_peer_grade']:
+                pending_grading=True
+    except:
+        #Non catastrophic error, so no real action
+        log.info("Problem with getting notifications from peer grading service.")
+
+    if pending_grading:
+        tab_name = "Peer grading (Pending)"
+        img_path = "/static/images/unanswered-icon.png"
+    else:
+        tab_name = "Peer Grading"
+        img_path= ""
+
+    tab = [CourseTab(tab_name, link, active_page == "peer_grading", True, img_path)]
+    return tab
 
 #### Validators
 
@@ -141,6 +172,7 @@ VALID_TAB_TYPES = {
     'progress': TabImpl(need_name, _progress),
     'static_tab': TabImpl(key_checker(['name', 'url_slug']), _static_tab),
     'staff_grading': TabImpl(null_validator, _staff_grading),
+    'peer_grading': TabImpl(null_validator, _peer_grading),
     }
 
 
diff --git a/lms/djangoapps/open_ended_grading/peer_grading_service.py b/lms/djangoapps/open_ended_grading/peer_grading_service.py
index 9ef0383fb5..8e0f8cbbaa 100644
--- a/lms/djangoapps/open_ended_grading/peer_grading_service.py
+++ b/lms/djangoapps/open_ended_grading/peer_grading_service.py
@@ -79,6 +79,7 @@ class PeerGradingService(GradingService):
         self.show_calibration_essay_url = self.url + '/show_calibration_essay/'
         self.save_calibration_essay_url = self.url + '/save_calibration_essay/'
         self.get_problem_list_url = self.url + '/get_problem_list/'
+        self.get_notifications_url = self.url + '/get_notifications/'
 
     def get_next_submission(self, problem_location, grader_id):
         response = self.get(self.get_next_submission_url,
@@ -116,6 +117,11 @@ class PeerGradingService(GradingService):
         response = self.get(self.get_problem_list_url, params)
         return response
 
+    def get_notifications(self, course_id, grader_id):
+        params = {'course_id': course_id, 'student_id': grader_id}
+        response = self.get(self.get_notifications_url, params)
+        return response
+
 
 _service = None
 def peer_grading_service():
diff --git a/lms/templates/courseware/course_navigation.html b/lms/templates/courseware/course_navigation.html
index 5ae69908fb..ec9004c0e8 100644
--- a/lms/templates/courseware/course_navigation.html
+++ b/lms/templates/courseware/course_navigation.html
@@ -18,7 +18,12 @@ def url_class(is_active):
     <ol class="course-tabs">
       % for tab in get_course_tabs(user, course, active_page):
           <li>
-             <a href="${tab.link | h}" class="${url_class(tab.is_active)}">${tab.name | h}</a>
+             <a href="${tab.link | h}" class="${url_class(tab.is_active)}">
+                 ${tab.name | h}
+                 % if tab.has_img == True:
+                    <img src="${tab.img}"/>
+                 %endif
+             </a>
           </li>
       % endfor
     <%block name="extratabs" />

From cc56e4763383fdfd1a1590335a074ab43656ec1d Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 14 Jan 2013 15:12:54 -0500
Subject: [PATCH 224/541] Fix active page issue

---
 lms/djangoapps/courseware/tabs.py            | 8 ++++----
 lms/templates/peer_grading/peer_grading.html | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lms/djangoapps/courseware/tabs.py b/lms/djangoapps/courseware/tabs.py
index 1f13db0064..139a527a42 100644
--- a/lms/djangoapps/courseware/tabs.py
+++ b/lms/djangoapps/courseware/tabs.py
@@ -127,10 +127,10 @@ def _peer_grading(tab, user, course, active_page):
         log.info("Problem with getting notifications from peer grading service.")
 
     if pending_grading:
-        tab_name = "Peer grading (Pending)"
-        img_path = "/static/images/unanswered-icon.png"
+        tab_name = "Peer grading"
+        img_path = "/static/images/slider-handle.png"
     else:
-        tab_name = "Peer Grading"
+        tab_name = "Peer grading"
         img_path= ""
 
     tab = [CourseTab(tab_name, link, active_page == "peer_grading", True, img_path)]
@@ -171,8 +171,8 @@ VALID_TAB_TYPES = {
     'textbooks': TabImpl(null_validator, _textbooks),
     'progress': TabImpl(need_name, _progress),
     'static_tab': TabImpl(key_checker(['name', 'url_slug']), _static_tab),
-    'staff_grading': TabImpl(null_validator, _staff_grading),
     'peer_grading': TabImpl(null_validator, _peer_grading),
+    'staff_grading': TabImpl(null_validator, _staff_grading),
     }
 
 
diff --git a/lms/templates/peer_grading/peer_grading.html b/lms/templates/peer_grading/peer_grading.html
index 484bb94182..2eb33cae05 100644
--- a/lms/templates/peer_grading/peer_grading.html
+++ b/lms/templates/peer_grading/peer_grading.html
@@ -8,7 +8,7 @@
 
 <%block name="title"><title>${course.number} Peer Grading</title></%block>
 
-<%include file="/courseware/course_navigation.html" args="active_page='staff_grading'" />
+<%include file="/courseware/course_navigation.html" args="active_page='peer_grading'" />
 
 <%block name="js_extra">
   <%static:js group='peer_grading'/>

From 4353c4ab056680067809b96804e6b052bfe7dbba Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Mon, 14 Jan 2013 15:16:06 -0500
Subject: [PATCH 225/541] Clean up some logic

---
 lms/djangoapps/courseware/tabs.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lms/djangoapps/courseware/tabs.py b/lms/djangoapps/courseware/tabs.py
index 139a527a42..18d6612cc6 100644
--- a/lms/djangoapps/courseware/tabs.py
+++ b/lms/djangoapps/courseware/tabs.py
@@ -115,6 +115,8 @@ def _peer_grading(tab, user, course, active_page):
     link = reverse('peer_grading', args=[course.id])
     peer_gs = PeerGradingService(settings.PEER_GRADING_INTERFACE)
     pending_grading=False
+    tab_name = "Peer grading"
+    img_path= ""
     try:
         notifications = json.loads(peer_gs.get_notifications(course.id,unique_id_for_user(user)))
         log.debug(notifications)
@@ -127,11 +129,7 @@ def _peer_grading(tab, user, course, active_page):
         log.info("Problem with getting notifications from peer grading service.")
 
     if pending_grading:
-        tab_name = "Peer grading"
         img_path = "/static/images/slider-handle.png"
-    else:
-        tab_name = "Peer grading"
-        img_path= ""
 
     tab = [CourseTab(tab_name, link, active_page == "peer_grading", True, img_path)]
     return tab

From 96da4ac55ede671a4f6147b60598f463cb35b943 Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Mon, 14 Jan 2013 16:27:28 -0500
Subject: [PATCH 226/541] Add some log statements. Add missing fields to
 _make_tc_user, and make _make_tc_registration independent of course
 configuration (for testing)

---
 .../commands/pearson_make_tc_registration.py  | 14 ++++--
 .../commands/pearson_make_tc_user.py          | 47 ++++++++++++++++++
 common/djangoapps/student/models.py           |  4 +-
 common/djangoapps/student/views.py            | 49 ++++++++++---------
 4 files changed, 85 insertions(+), 29 deletions(-)

diff --git a/common/djangoapps/student/management/commands/pearson_make_tc_registration.py b/common/djangoapps/student/management/commands/pearson_make_tc_registration.py
index 21a2da442a..5536844cab 100644
--- a/common/djangoapps/student/management/commands/pearson_make_tc_registration.py
+++ b/common/djangoapps/student/management/commands/pearson_make_tc_registration.py
@@ -1,4 +1,5 @@
 from optparse import make_option
+from time import strftime
 
 from django.contrib.auth.models import User
 from django.core.management.base import BaseCommand, CommandError
@@ -6,6 +7,7 @@ from django.core.management.base import BaseCommand, CommandError
 from student.models import TestCenterUser, TestCenterRegistration, TestCenterRegistrationForm, get_testcenter_registration
 from student.views import course_from_id
 from xmodule.course_module import CourseDescriptor
+from xmodule.modulestore.exceptions import ItemNotFoundError
 
 class Command(BaseCommand):
     option_list = BaseCommand.option_list + (
@@ -91,14 +93,14 @@ class Command(BaseCommand):
             raise CommandError("User {%s} does not exist".format(student))
             
         # check to see if a course_id was specified, and use information from that:
-        course = course_from_id(course_id)
-        if course is not None:
+        try:
+            course = course_from_id(course_id)
             if 'ignore_registration_dates' in our_options:
                 examlist = [exam for exam in course.test_center_exams if exam.exam_series_code == our_options.get('exam_series_code')]
                 exam = examlist[0] if len(examlist) > 0 else None
             else:
                 exam = course.current_test_center_exam
-        else: 
+        except ItemNotFoundError: 
             # otherwise use explicit values (so we don't have to define a course):    
             exam_name = "Dummy Placeholder Name"
             exam_info = { 'Exam_Series_Code': our_options['exam_series_code'],
@@ -106,6 +108,10 @@ class Command(BaseCommand):
                           'Last_Eligible_Appointment_Date' : our_options['eligibility_appointment_date_last'],
                           }
             exam = CourseDescriptor.TestCenterExam(course_id, exam_name, exam_info)
+            # update option values for date_first and date_last to use YYYY-MM-DD format
+            # instead of YYYY-MM-DDTHH:MM
+            our_options['eligibility_appointment_date_first'] = strftime("%Y-%m-%d", exam.first_eligible_appointment_date)
+            our_options['eligibility_appointment_date_last'] = strftime("%Y-%m-%d", exam.last_eligible_appointment_date)
 
         if exam is None:
             raise CommandError("Exam for course_id {%s} does not exist".format(course_id))
@@ -167,6 +173,8 @@ class Command(BaseCommand):
             
         # override internal values:
         change_internal = False
+        if 'exam_series_code' in our_options:
+            exam_code = our_options['exam_series_code']
         registration = get_testcenter_registration(student, course_id, exam_code)[0]
         for internal_field in [ 'upload_error_message', 'upload_status', 'authorization_id']:
             if internal_field in our_options:
diff --git a/common/djangoapps/student/management/commands/pearson_make_tc_user.py b/common/djangoapps/student/management/commands/pearson_make_tc_user.py
index 2426b7f2ce..57ee78e391 100644
--- a/common/djangoapps/student/management/commands/pearson_make_tc_user.py
+++ b/common/djangoapps/student/management/commands/pearson_make_tc_user.py
@@ -13,16 +13,41 @@ class Command(BaseCommand):
             action='store',
             dest='first_name',
         ),        
+        make_option(
+            '--middle_name',
+            action='store',
+            dest='middle_name',
+        ),        
         make_option(
             '--last_name',
             action='store',
             dest='last_name',
         ),        
+        make_option(
+            '--suffix',
+            action='store',
+            dest='suffix',
+        ),        
+        make_option(
+            '--salutation',
+            action='store',
+            dest='salutation',
+        ),        
         make_option(
             '--address_1',
             action='store',
             dest='address_1',
         ),        
+        make_option(
+            '--address_2',
+            action='store',
+            dest='address_2',
+        ),        
+        make_option(
+            '--address_3',
+            action='store',
+            dest='address_3',
+        ),        
         make_option(
             '--city',
             action='store',
@@ -51,12 +76,34 @@ class Command(BaseCommand):
             dest='phone',
             help='Pretty free-form (parens, spaces, dashes), but no country code'
         ),        
+        make_option(
+            '--extension',
+            action='store',
+            dest='extension',
+        ),        
         make_option(
             '--phone_country_code',
             action='store',
             dest='phone_country_code',
             help='Phone country code, just "1" for the USA'
         ),
+        make_option(
+            '--fax',
+            action='store',
+            dest='fax',
+            help='Pretty free-form (parens, spaces, dashes), but no country code'
+        ),        
+        make_option(
+            '--fax_country_code',
+            action='store',
+            dest='fax_country_code',
+            help='Fax country code, just "1" for the USA'
+        ),
+        make_option(
+            '--company_name',
+            action='store',
+            dest='company_name',
+        ),        
         # internal values:
         make_option(
             '--client_candidate_id',
diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index da6f260a7d..d15afc5d83 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -223,8 +223,6 @@ class TestCenterUser(models.Model):
         return self.user.email
     
     def needs_update(self, dict):
-#        needs_updating = any([__getattribute__(fieldname) != dict[fieldname]
-#                              for fieldname in TestCenterUser.user_provided_fields()])
         for fieldname in TestCenterUser.user_provided_fields():
             if fieldname in dict and self.__getattribute__(fieldname) != dict[fieldname]:
                 return True
@@ -275,6 +273,7 @@ class TestCenterUserForm(ModelForm):
         # create additional values here:
         new_user.user_updated_at = datetime.utcnow()
         new_user.save()
+        log.info("Updated demographic information for user's test center exam registration: username \"{}\" ".format(new_user.username)) 
         
     # add validation:
     
@@ -534,6 +533,7 @@ class TestCenterRegistrationForm(ModelForm):
         # create additional values here:
         registration.user_updated_at = datetime.utcnow()
         registration.save()
+        log.info("Updated registration information for user's test center exam registration: username \"{}\" course \"{}\", examcode \"{}\"".format(registration.testcenter_user.username, registration.course_id, registration.exam_series_code)) 
 
     # TODO: add validation code for values added to accommodation_code field.
     
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 72c7798eb2..b41de103ca 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -694,10 +694,13 @@ def create_test_registration(request, post_override=None):
     registrations = get_testcenter_registration(user, course_id, exam_code)
     if len(registrations) > 0:
         registration = registrations[0]
-        # TODO: check to see if registration changed.  Should check appointment dates too...
-        # And later should check changes in accommodation_code.
-        # But at the moment, we don't expect anything to cause this to change
-        # because of the registration form.
+        # NOTE: we do not bother to check here to see if the registration has changed,
+        # because at the moment there is no way for a user to change anything about their
+        # registration.  They only provide an optional accommodation request once, and 
+        # cannot make changes to it thereafter.
+        # It is possible that the exam_info content has been changed, such as the
+        # scheduled exam dates, but those kinds of changes should not be handled through
+        # this registration screen.   
         
     else:
         accommodation_request = post_vars.get('accommodation_request','')
@@ -720,27 +723,25 @@ def create_test_registration(request, post_override=None):
     # only do the following if there is accommodation text to send,
     # and a destination to which to send it.
     # TODO: still need to create the accommodation email templates
-    if 'accommodation_request' in post_vars and settings.MITX_FEATURES.get('ACCOMMODATION_EMAIL'):
-        d = {'accommodation_request': post_vars['accommodation_request'] }
-        
-        # composes accommodation email
-        subject = render_to_string('emails/accommodation_email_subject.txt', d)
-        # Email subject *must not* contain newlines
-        subject = ''.join(subject.splitlines())
-        message = render_to_string('emails/accommodation_email.txt', d)
+#    if 'accommodation_request' in post_vars and 'TESTCENTER_ACCOMMODATION_REQUEST_EMAIL' in settings:
+#        d = {'accommodation_request': post_vars['accommodation_request'] }
+#        
+#        # composes accommodation email
+#        subject = render_to_string('emails/accommodation_email_subject.txt', d)
+#        # Email subject *must not* contain newlines
+#        subject = ''.join(subject.splitlines())
+#        message = render_to_string('emails/accommodation_email.txt', d)
+#
+#        try:
+#            dest_addr = settings['TESTCENTER_ACCOMMODATION_REQUEST_EMAIL']
+#            from_addr = user.email
+#            send_mail(subject, message, from_addr, [dest_addr], fail_silently=False)
+#        except:
+#            log.exception(sys.exc_info())
+#            response_data = {'success': False}
+#            response_data['non_field_errors'] =  [ 'Could not send accommodation e-mail.', ]
+#            return HttpResponse(json.dumps(response_data), mimetype="application/json")
 
-        # skip if destination email address is not specified
-        try:
-            dest_addr = settings.MITX_FEATURES['ACCOMMODATION_EMAIL']
-            send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [dest_addr], fail_silently=False)
-        except:
-            log.exception(sys.exc_info())
-            response_data = {'success': False}
-            response_data['non_field_errors'] =  [ 'Could not send accommodation e-mail.', ]
-            return HttpResponse(json.dumps(response_data), mimetype="application/json")
-
-    # TODO: enable appropriate stat
-    # statsd.increment("common.student.account_created")
 
     js = {'success': True}
     return HttpResponse(json.dumps(js), mimetype="application/json")

From 4e83f748b745e03ed11de37ce33a279669ddf89d Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Mon, 14 Jan 2013 17:31:05 -0500
Subject: [PATCH 227/541] pearson registration - revised contact calls to
 action and order in status section, edited flash message copy/styling, added
 in strawman state for disabled form/closed registration state of form, added
 in strawman state for demographics rejected flash message, revised
 accomodations text labe and isntructions

---
 .../multicourse/_testcenter-register.scss     | 59 ++++++++++++--
 lms/static/sass/shared/_forms.scss            |  3 +-
 lms/templates/test_center_register.html       | 77 ++++++++++++-------
 3 files changed, 103 insertions(+), 36 deletions(-)

diff --git a/lms/static/sass/multicourse/_testcenter-register.scss b/lms/static/sass/multicourse/_testcenter-register.scss
index 974c108e0b..e5e168f6b7 100644
--- a/lms/static/sass/multicourse/_testcenter-register.scss
+++ b/lms/static/sass/multicourse/_testcenter-register.scss
@@ -10,6 +10,11 @@ $red: rgb(178, 6, 16);
 	@include clearfix;
 	padding: 60px 0px 120px;
 
+	// reset - horrible, but necessary
+	p, a, h1, h2, h3, h4, h5, h6 {
+		font-family: $sans-serif !important;
+	}
+
 	// basic layout
 	.introduction {
 		width: flex-grid(12);
@@ -74,7 +79,6 @@ $red: rgb(178, 6, 16);
 		.instructions, .note {
 			margin: 0;
 			padding: ($baseline*1.5) ($baseline*1.5) 0 ($baseline*1.5);
-			font-family: $sans-serif;
 			font-size: 14px;
 			color: tint($base-font-color, 20%);
 
@@ -106,6 +110,11 @@ $red: rgb(178, 6, 16);
 				letter-spacing: 0;
 				padding: ($baseline*0.75) $baseline;
 				text-align: center;
+
+
+				&:disabled {
+					opacity: 0.3;
+				}
 			}
 
 			.action-primary {
@@ -181,7 +190,6 @@ $red: rgb(178, 6, 16);
 						border: 1px solid #C8C8C8;
 						padding: $baseline ($baseline*0.75);
 						background: #FAFAFA;
-						font-family: $sans-serif;
 					}
 				}
 
@@ -278,6 +286,25 @@ $red: rgb(178, 6, 16);
 				}
 			}
 		}
+
+		&.disabled {
+
+			> .instructions {
+				display: none;
+			}
+
+			.field {
+				opacity: 0.5;
+
+				.label {
+					cursor: default;
+				}
+			}
+
+			.form-actions {
+				display: none;
+			}
+		}
 	}
 
 	// form - specifics
@@ -287,13 +314,19 @@ $red: rgb(178, 6, 16);
 		&.is-shown {
 			display: block;
 		}
+
+		&.disabled {
+
+			fieldset {
+				opacity: 0.5;
+			}
+		}
 	}
 
 	.form-fields-secondary-visibility {
 		display: block;
 		margin: 0;
 		padding: $baseline ($baseline*1.5) 0 ($baseline*1.5);
-		font-family: $sans-serif;
 		font-size: 13px;
 
 		&.is-hidden {
@@ -321,7 +354,6 @@ $red: rgb(178, 6, 16);
 				margin: 0 0 ($baseline/4) 0;
 				padding: 0;
 				font-size: 13px;
-				font-family: $sans-serif;
 			}
 
 			.label, .value {
@@ -407,6 +439,12 @@ $red: rgb(178, 6, 16);
 							color: green;
 							content: "processed";
 						}
+
+						&.status-registration {
+							.exam-link {
+								font-weight: 600 !important;
+							}
+						}
 					}
 
 					&.status-pending {
@@ -473,6 +511,10 @@ $red: rgb(178, 6, 16);
 			}
 
 			// actions
+			.contact-link {
+				font-weight: 600;
+			}
+
 			.actions {
 				@include box-shadow(inset 0 1px 1px 0px rgba(0,0,0,0.2));
 				border-top: 1px solid tint(rgb(0,0,0), 90%);
@@ -565,6 +607,7 @@ $red: rgb(178, 6, 16);
 
 			.value {
 				color: rgb(0,0,0);
+				font-weight: 600;
 			}
 		}
 
@@ -598,7 +641,6 @@ $red: rgb(178, 6, 16);
 		}
 
 		.message-copy {
-			font-family: $sans-serif;
 			font-size: 14px;
 		}
 
@@ -614,15 +656,18 @@ $red: rgb(178, 6, 16);
 			font-size: 14px;
 
 			.message-title, .message-copy {
-				font-family: $sans-serif;
-				font-size: 14px;
 			}
 
 			.message-title {
 				font-weight: bold;
+				font-size: 16px;
 				margin: 0 0 ($baseline/4) 0;
 			}
 
+			.message-copy {
+				font-size: 14px;
+			}
+
 			.contact-button {
 				@include button(simple, $blue);
 			}
diff --git a/lms/static/sass/shared/_forms.scss b/lms/static/sass/shared/_forms.scss
index d6a5f482e3..79d476f420 100644
--- a/lms/static/sass/shared/_forms.scss
+++ b/lms/static/sass/shared/_forms.scss
@@ -13,7 +13,8 @@ label {
 textarea,
 input[type="text"],
 input[type="email"],
-input[type="password"] {
+input[type="password"],
+input[type="tel"] {
   background: rgb(250,250,250);
   border: 1px solid rgb(200,200,200);
   @include border-radius(3px);
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index a0bba90445..00f0c6b17a 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -14,12 +14,15 @@
   <script type="text/javascript">
   (function() {
 
-    $(".form-fields-secondary-visibility").click(function(e){
-      console.log("clicked");
+    // if form is disabled or registration is closed
+    $('#testcenter_register_form.disabled').find('input, textarea, button').attr('disabled','disabled');
+
+    // toggling accommodations elements
+    $('.form-fields-secondary-visibility').click(function(e){
       e.preventDefault();
       $(this).addClass("is-hidden");
 
-      $(".form-fields-secondary").addClass("is-shown");
+      $('.form-fields-secondary').addClass("is-shown");
     });
 
 
@@ -101,18 +104,16 @@
     </header>
   </section>
   
+  <% 
+    exam_help_href = "mailto:exam-help@edx.org?subject=Pearson VUE Exam - " + get_course_about_section(course, 'university') + " - " + course.number 
+  %>
+
   % if registration:
   
-   <% 
-     exam_help_href = "mailto:exam-help@edx.org?subject=Pearson VUE Exam - " + get_course_about_section(course, 'university') + " - " + course.number 
-   %>
-
    % if  registration.is_rejected:      
   <section class="status message message-flash registration-rejected message-action">
     <h3 class="message-title">Your registration for the Pearson exam has been rejected</h3>
-    <p class="message-copy">Please check the information you provided, and try to correct any demographic errors.  Otherwise contact edX at exam-help@edx.org.</p>
-    <a href="${exam_help_href}" class="button contact-button">Contact exam-help@edx.org</a>
-  </section>
+    <p class="message-copy">Please see your registration status details for more information.</p>
    % endif
 
    % if  registration.is_accepted:
@@ -129,6 +130,18 @@
     <p class="message-copy">Once your information is processed, it will be forwarded to Pearson and you will be able to schedule an exam.</p>
   </section>
    % endif
+   
+   <!-- TODO: add logic for demographic error/rejected state (add this message to the page) -->
+   <section class="status message message-flash demographics-rejected message-action">
+     <h3 class="message-title">Your demographic information contained an error and was rejected</h3>
+     <p class="message-copy">Please check the information you provided, and correct the errors noted below.
+   </section>
+   
+   <!-- TODO: add logic for registration closed state (add this message to the page) -->
+   <section class="status message message-flash registration-closed">
+     <h3 class="message-title">Registration for this Pearson exam is closed</h3>
+     <p class="message-copy">Your registration status and previous information is available below, however you may not edit any of the information.
+   </section>
 
   % endif
   
@@ -137,6 +150,9 @@
       <h3 class="is-hidden">Registration Form</h3>
     </header>      
     <form id="testcenter_register_form" method="post" data-remote="true" action="/create_test_registration">
+    
+    <!-- TODO: add logic for registration closed state (add class of disabled to <form>) -->
+    <!-- <form id="testcenter_register_form" method="post" data-remote="true" action="/create_test_registration" class="disabled"> -->
       
       % if registration:
       <p class="instructions">
@@ -228,11 +244,11 @@
             <li class="field-group phoneinfo">
               <div class="field required" id="field-phone">
                 <label for="phone">Phone Number</label>
-                <input id="phone" type="text" name="phone" value="${testcenteruser.phone}" placeholder="e.g. 1-55-555-5555" />              
+                <input id="phone" type="tel" name="phone" value="${testcenteruser.phone}" placeholder="e.g. 1-55-555-5555" />              
               </div>
               <div class="field" id="field-extension">
                 <label for="extension">Extension</label>
-                <input id="extension" class="short" type="text" name="extension" value="${testcenteruser.extension}" placeholder="e.g. 555" />
+                <input id="extension" class="short" type="tel" name="extension" value="${testcenteruser.extension}" placeholder="e.g. 555" />
               </div>
               <div class="field required" id="field-phone_country_code">
                 <label for="phone_country_code">Phone Country Code</label>
@@ -242,7 +258,7 @@
             <li class="field-group faxinfo">
               <div class="field" id="field-fax">
                 <label for="fax">Fax Number</label>
-                <input id="fax" type="text" class="short" name="fax" value="${testcenteruser.fax}" placeholder="e.g. 1-55-555-5555" />
+                <input id="fax" type="tel" class="short" name="fax" value="${testcenteruser.fax}" placeholder="e.g. 1-55-555-5555" />
               </div>
               <div class="field" id="field-fax_country_code">
                 <label for="fax_country_code">Fax Country Code</label>
@@ -259,7 +275,7 @@
       
       % if registration:
         % if registration.accommodation_request and len(registration.accommodation_request) > 0:
-      <div class="form-fields-secondary is-shown" id="form-fields-secondary">
+      <div class="form-fields-secondary is-shown disabled" id="form-fields-secondary">
         % endif
       % else: 
       <div class="form-fields-secondary" id="form-fields-secondary">
@@ -267,10 +283,10 @@
 
         % if registration:
           % if registration.accommodation_request and len(registration.accommodation_request) > 0:
-        <p class="note"><span class="title">Note</span>: Accomodation requests, which need to be reviewed in detail, <strong>will add significant delay to the registration process</strong>.</p>
+        <p class="note"><span class="title">Note</span>: Your previously accomodation requests below need to be reviewed in detail <strong>and will add asignificant delay to your registration process</strong>.</p>
           % endif
         % else: 
-        <p class="note"><span class="title">Note</span>: Accommodation requests are not part of your demographic information, <strong>and cannot be changed once submitted</strong>. Accomodation requests, which need to be reviewed in detail, <strong>will add significant delay to the registration process</strong>.</p>
+        <p class="note"><span class="title">Note</span>: Accommodation requests are not part of your demographic information, <strong>and cannot be changed once submitted</strong>. Accomodation requests, which are reviewed on a case-by-case basis, <strong>will add significant delay to the registration process</strong>.</p>
         % endif
                   
         <fieldset class="group group-form group-form-optional">
@@ -312,10 +328,10 @@
 
     % if registration:
       % if registration.accommodation_request and len(registration.accommodation_request) > 0:
-    <a class="actions form-fields-secondary-visibility is-hidden" href="#form-fields-secondary">Looking for Optional Accomodations?</a>
+    <a class="actions form-fields-secondary-visibility is-hidden" href="#form-fields-secondary">Special (<abbr title="Americans with Disabilities Act">ADA</abbr>) Accommdations</a>
       % endif
     % else: 
-    <a class="actions form-fields-secondary-visibility" href="#form-fields-secondary">Looking for Optional Accomodations?</a>
+    <a class="actions form-fields-secondary-visibility" href="#form-fields-secondary">Special (<abbr title="Americans with Disabilities Act">ADA</abbr>) Accommdations</a>
     % endif
   </section>
     
@@ -357,7 +373,7 @@
             <li class="item">${registration.testcenter_user.upload_error_message}.</li>
           </ul>
           
-          <p class="instructions">If the error is not correctable by revising demographic information and resubmitting, please contact edX at <a class="contact-link" href="${exam_help_href}">exam-help@edx.org</a>.</p>
+          <p class="action">If the error is not correctable by revising your demographic information, please <a class="contact-link" href="${exam_help_href}">contact edX at exam-help@edx.org</a>.</p>
         </li>
         % endif     
 
@@ -377,13 +393,15 @@
             % for accommodation_name in registration.get_accommodation_names():
             <li class="item">${accommodation_name}</li>
             % endfor
-          </ul>  
+          </ul> 
         </li>
         % endif     
         % if registration.accommodation_is_rejected:     
         <li class="item status status-processed status-accommodations">
           <h4 class="title">Accommodations Request</h4>
           <p class="details">Your requested accommodations have been reviewed and processed. You are allowed no accommodations.</p>
+          
+          <p class="action">Please <a class="contact-link" href="${exam_help_href}">contact edX at exam-help@edx.org</a> if you have any questions.</p>
         </li>
         % endif     
 
@@ -397,21 +415,21 @@
         % if registration.registration_is_accepted:     
         <li class="item status status-processed status-registration">
           <h4 class="title">Registration Request</h4>
-          <p class="details">Your exam registration has been processed and has been forwarded to Pearson. You are now able to schedule an exam.</p>
+          <p class="details">Your exam registration has been processed and has been forwarded to Pearson. <strong>You are now able to <a href="${registration.registration_signup_url}" class="exam-link">schedule a Pearson exam</a></strong>.</p>
         </li>
         % endif     
         % if registration.registration_is_rejected:     
         <li class="item status status-rejected status-registration">
           <h4 class="title">Registration Request</h4>
-          <p class="details">Your exam registration has been rejected by Pearson. <strong>You currently cannot schedule an exam</strong>.
-          Please contact edX at <a class="contact-link" href="${exam_help_href}">exam-help@edx.org</a>.  The errors found include:</p>
+          <p class="details">Your exam registration has been rejected by Pearson. <strong>You currently cannot schedule an exam</strong>. The errors found include:</p>
           
           <ul class="error-list">
-            <li class="item">${registration.upload_error_message}.</li>
+            <li class="item">${registration.upload_error_message}</li>
           </ul>
+          
+          <p class="action">Please <a class="contact-link" href="${exam_help_href}">contact edX at exam-help@edx.org</a>.</p>
         </li>
-        % endif     
-
+        % endif
       </ol>
    
    </div>
@@ -420,7 +438,6 @@
    % endif
     
     <div class="details details-course">
-      <!-- NOTE: showing course details -->
       <h4>About ${get_course_about_section(course, 'university')} ${course.number}</h4>
       <p>
       % if course.has_ended():
@@ -434,7 +451,6 @@
     </div>
     
     <div class="details details-registration">
-      <!-- NOTE: showing test details -->
       <h4>Pearson VUE Test Details</h4>
       % if exam_info is not None:
         <ul>
@@ -453,5 +469,10 @@
         </ul>
       % endif
     </div>
+    
+    <div class="details details-contact">
+      <h4>Questions</h4>
+      <p>If you have a specific question pertaining to your registration, you may contact <a class="contact-link" href="${exam_help_href}">exam-help@edx.org</a>.</p>
+    </div>
   </aside>
 </section>

From 833b0c34abc4a93c25abcb0cd29e4734c2e42fc1 Mon Sep 17 00:00:00 2001
From: Jennifer Akana <jaakana@gmail.com>
Date: Mon, 14 Jan 2013 19:20:49 -0500
Subject: [PATCH 228/541] added problem weight description

---
 doc/course_grading.md | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/doc/course_grading.md b/doc/course_grading.md
index 6dce2fa70e..5c668df5d9 100644
--- a/doc/course_grading.md
+++ b/doc/course_grading.md
@@ -35,6 +35,43 @@ weights of 30, 10, 10, and 10 to the 4 problems, respectively.
 Note that the default weight of a problem **is not 1.** The default weight of a
 problem is the module's max_grade.
 
+If weighting is set, each problem is worth the number of points assigned, regardless of the number of responses it contains.
+
+Consider a Homework section that contains two problems.
+
+    <problem display_name=”Problem 1”>
+      <numericalresponse> ... </numericalreponse>
+    </problem>
+
+and
+
+    <problem display_name=”Problem 2”>
+      <numericalresponse> ... </numericalreponse>
+      <numericalresponse> ... </numericalreponse>
+      <numericalresponse> ... </numericalreponse>
+    </problem>
+
+
+
+
+
+Without weighting, Problem 1 is worth 25% of the assignment, and Problem 2 is worth 75% of the assignment.
+
+Weighting for the problems can be set in the policy.json file.
+
+    "problem/problem1": {
+       "weight": 2
+       },
+    "problem/problem2": {
+       "weight": 2
+        },
+
+With the above weighting, Problems 1 and 2 are each worth 50% of the assignment.
+
+Please note: When problems have weight, the point value is automatically included in the display name *except* when “weight”: 1.When “weight”: 1, no visual change occurs in the display name, leaving the point value open to interpretation to the student.
+
+
+
 ## Section Weighting
 
 Once each section has a percentage score, we must total those sections into a

From 9e157b91f0a0ae432cf072db6bf93cbfd1abacdc Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Tue, 15 Jan 2013 00:59:34 -0500
Subject: [PATCH 229/541] change urls from xxx_test_registration to
 xxx_exam_registration.

---
 common/djangoapps/student/views.py      | 11 ++++++-----
 lms/templates/dashboard.html            |  2 +-
 lms/templates/test_center_register.html |  2 +-
 lms/urls.py                             |  4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index b41de103ca..12c869cae6 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -610,7 +610,7 @@ def exam_registration_info(user, course):
     
 @login_required
 @ensure_csrf_cookie
-def begin_test_registration(request, course_id):
+def begin_exam_registration(request, course_id):
     """ Handles request to register the user for the current
     test center exam of the specified course.  Called by form
     in dashboard.html.
@@ -649,7 +649,7 @@ def begin_test_registration(request, course_id):
     return render_to_response('test_center_register.html', context)
 
 @ensure_csrf_cookie
-def create_test_registration(request, post_override=None):
+def create_exam_registration(request, post_override=None):
     '''
     JSON call to create a test center exam registration.
     Called by form in test_center_register.html
@@ -662,19 +662,19 @@ def create_test_registration(request, post_override=None):
     user = User.objects.get(username=username)
     course_id = post_vars['course_id']
     course = (course_from_id(course_id))  # assume it will be found....
-    log.info("User {0} enrolled in course {1} clicked on enter/update demographic info for test registration".format(user.username, course_id))
         
     try:
         testcenter_user = TestCenterUser.objects.get(user=user)
-        needs_updating = testcenter_user.needs_update(post_vars)    
+        needs_updating = testcenter_user.needs_update(post_vars) 
+        log.info("User {0} enrolled in course {1} {2}updating demographic info for exam registration".format(user.username, course_id, "" if needs_updating else "not "))
     except TestCenterUser.DoesNotExist:
         # do additional initialization here:
         testcenter_user = TestCenterUser.create(user)
         needs_updating = True
+        log.info("User {0} enrolled in course {1} creating demographic info for exam registration".format(user.username, course_id))
 
     # perform validation:
     if needs_updating:
-        log.info("User {0} enrolled in course {1} updating demographic info for test registration".format(user.username, course_id))
         # first perform validation on the user information 
         # using a Django Form.
         form = TestCenterUserForm(instance=testcenter_user, data=post_vars)
@@ -706,6 +706,7 @@ def create_test_registration(request, post_override=None):
         accommodation_request = post_vars.get('accommodation_request','')
         registration = TestCenterRegistration.create(testcenter_user, exam, accommodation_request)
         needs_saving = True
+        log.info("User {0} enrolled in course {1} creating new exam registration".format(user.username, course_id))
 
     if needs_saving:
         # do validation of registration.  (Mainly whether an accommodation request is too long.)        
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index 73c7da23f9..34c8d0ecc3 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -222,7 +222,7 @@
             <%
                 testcenter_exam_info = course.current_test_center_exam
                 registration = exam_registrations.get(course.id)
-                testcenter_register_target = reverse('begin_test_registration', args=[course.id])
+                testcenter_register_target = reverse('begin_exam_registration', args=[course.id])
             %>
             % if testcenter_exam_info is not None:
 
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index a0bba90445..679eacf3f4 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -136,7 +136,7 @@
     <header>
       <h3 class="is-hidden">Registration Form</h3>
     </header>      
-    <form id="testcenter_register_form" method="post" data-remote="true" action="/create_test_registration">
+    <form id="testcenter_register_form" method="post" data-remote="true" action="/create_exam_registration">
       
       % if registration:
       <p class="instructions">
diff --git a/lms/urls.py b/lms/urls.py
index e81e25e86a..3b476f4821 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -43,8 +43,8 @@ urlpatterns = ('',
     url(r'^create_account$', 'student.views.create_account'),
     url(r'^activate/(?P<key>[^/]*)$', 'student.views.activate_account', name="activate"),
 
-    url(r'^begin_test_registration/(?P<course_id>[^/]+/[^/]+/[^/]+)$', 'student.views.begin_test_registration', name="begin_test_registration"),
-    url(r'^create_test_registration$', 'student.views.create_test_registration'),
+    url(r'^begin_exam_registration/(?P<course_id>[^/]+/[^/]+/[^/]+)$', 'student.views.begin_exam_registration', name="begin_exam_registration"),
+    url(r'^create_exam_registration$', 'student.views.create_exam_registration'),
 
     url(r'^password_reset/$', 'student.views.password_reset', name='password_reset'),
     ## Obsolete Django views for password resets

From c5107d42de7d3cafef4c7f0fec8f7785aa7f50fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80?=
 <kryklia@gmail.com>
Date: Mon, 26 Nov 2012 17:38:59 +0200
Subject: [PATCH 230/541] bug

---
 common/lib/xmodule/setup.py              |   1 +
 common/lib/xmodule/xmodule/gst_module.py | 141 +++++++++++++++++++++++
 2 files changed, 142 insertions(+)
 create mode 100644 common/lib/xmodule/xmodule/gst_module.py

diff --git a/common/lib/xmodule/setup.py b/common/lib/xmodule/setup.py
index c867fca228..8deb2a7ce5 100644
--- a/common/lib/xmodule/setup.py
+++ b/common/lib/xmodule/setup.py
@@ -36,6 +36,7 @@ setup(
             "videodev = xmodule.backcompat_module:TranslateCustomTagDescriptor",
             "videosequence = xmodule.seq_module:SequenceDescriptor",
             "discussion = xmodule.discussion_module:DiscussionDescriptor",
+            "gst = xmodule.gst_module:GSTDescriptor",
         ]
     }
 )
diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
new file mode 100644
index 0000000000..8847a5224c
--- /dev/null
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -0,0 +1,141 @@
+"""
+GST (Graphical-Slider-Tool) module is ungraded xmodule used by students to
+understand functional dependencies
+"""
+
+# import json
+import logging
+
+from lxml import etree
+
+from xmodule.mako_module import MakoModuleDescriptor
+from xmodule.xml_module import XmlDescriptor
+from xmodule.x_module import XModule
+from xmodule.progress import Progress
+from xmodule.exceptions import NotFoundError
+from pkg_resources import resource_string
+from xmodule.raw_module import RawDescriptor
+
+# log = logging.getLogger("mitx.common.lib.seq_module")
+
+
+class GSTModule(XModule):
+    ''' Graphical-Slider-Tool Module
+    '''
+    # js = {'js': [resource_string(__name__, 'js/src/gst/gst.js')]}
+    # #css = {'scss': [resource_string(__name__, 'css/capa/display.scss')]}
+    # js_module_name = "GST"
+
+    def __init__(self, system, location, definition, descriptor, instance_state=None,
+                 shared_state=None, **kwargs):
+        """
+        pass
+    #     Definition  should have....
+    #     sliders, text, module
+
+    #     Sample file:
+
+    #     <gst>
+    #         <h2> Plot... </h2>
+    #         <slider name="1" var="a"/>
+    #         <number name="1" var="a"/>
+    #         <plot/>
+    #         <sliders_info>
+    #         <sliders/>
+    #         <numbers_info>
+    #         </numbers_info
+    #         <plot_info>
+    #         </plot_info>
+    #     </gst>
+    #     """
+    #     XModule.__init__(self, system, location, definition, descriptor,
+    #                      instance_state, shared_state, **kwargs)
+    #     import ipdb; ipdb.set_trace()
+    #     self.rendered = False
+
+    # def get_html(self):
+    #     self.render()
+    #     return self.content
+
+    # def render(self):
+    #     import ipdb; ipdb.set_trace()
+    #     if self.rendered:
+    #         return
+    #     ## Returns a set of all types of all sub-children
+    #     contents = []
+    #     # import ipdb; ipdb.set_trace()
+    #     for child in self.get_display_items():
+    #         progress = child.get_progress()
+    #         childinfo = {
+    #             'gst': child.get_html(),
+    #             'plot': "\n".join(
+    #                 grand_child.display_name.strip()
+    #                 for grand_child in child.get_children()
+    #                 if 'display_name' in grand_child.metadata
+    #             ),
+    #             # 'progress_status': Progress.to_js_status_str(progress),
+    #             'progress_detail': Progress.to_js_detail_str(progress),
+    #             'type': child.get_icon_class(),
+    #         }
+    #         # if childinfo['title']=='':
+    #             # childinfo['title'] = child.metadata.get('display_name','')
+    #         contents.append(childinfo)
+
+    #     params = {'items': contents,
+    #               'element_id': self.location.html_id(),
+    #               'item_id': self.id,
+    #               'position': self.position,
+    #               'tag': self.location.category
+    #               }
+
+    #     self.content = self.system.render_template('seq_module.html', params)
+    #     self.rendered = True
+
+
+class GSTDescriptor(RawDescriptor):
+    mako_template = "widgets/html-edit.html"
+    module_class = GSTModule
+    template_dir_name = 'gst'
+
+    # @classmethod
+    # def definition_from_xml(cls, xml_object, system):
+    #     """
+    #     Pull out the data into dictionary.
+
+    #     Returns:
+    #     {
+    #     'def1': 'def1-some-html',
+    #     'def2': 'def2-some-html'
+    #     }
+    #     """
+    #     import ipdb; ipdb.set_trace()
+    #     children = []
+    #     for child in xml_object:
+    #         try:
+    #             children.append(system.process_xml(etree.tostring(child)).location.url())
+    #         except:
+    #             log.exception("Unable to load child when parsing GST. Continuing...")
+    #             continue
+    #     return {'children': children}
+
+    # def definition_to_xml(self, resource_fs):
+    #     '''Return an xml element representing this definition.'''
+    #     import ipdb; ipdb.set_trace()
+    #     xml_object = etree.Element('gst')
+
+    #     def add_child(k):
+    #         # child_str = '<{tag}>{body}</{tag}>'.format(tag=k, body=self.definition[k])
+    #         child_str = child.export_to_xml(resource_fs)
+    #         child_node = etree.fromstring(child_str)
+    #         xml_object.append(child_node)
+
+    #     for child in self.get_children():
+    #         add_child(child)
+
+    #     return xml_object
+
+
+    # def __init__(self, system, definition, **kwargs):
+    #     '''Render and save the template for this descriptor instance'''
+    #     super(CustomTagDescriptor, self).__init__(system, definition, **kwargs)
+    #     self.rendered_html = self.render_template(system, definition['data'])
\ No newline at end of file

From d0fcaf0ac4f2de72ce696e125905184eab934ca8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80?=
 <kryklia@gmail.com>
Date: Mon, 26 Nov 2012 18:11:01 +0200
Subject: [PATCH 231/541] next step

---
 common/lib/xmodule/xmodule/gst_module.py | 71 ++++++++++++------------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index 8847a5224c..285eeb8fce 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -97,45 +97,46 @@ class GSTDescriptor(RawDescriptor):
     module_class = GSTModule
     template_dir_name = 'gst'
 
-    # @classmethod
-    # def definition_from_xml(cls, xml_object, system):
-    #     """
-    #     Pull out the data into dictionary.
+    @classmethod
+    def definition_from_xml(cls, xml_object, system):
+        """
+        Pull out the data into dictionary.
 
-    #     Returns:
-    #     {
-    #     'def1': 'def1-some-html',
-    #     'def2': 'def2-some-html'
-    #     }
-    #     """
-    #     import ipdb; ipdb.set_trace()
-    #     children = []
-    #     for child in xml_object:
-    #         try:
-    #             children.append(system.process_xml(etree.tostring(child)).location.url())
-    #         except:
-    #             log.exception("Unable to load child when parsing GST. Continuing...")
-    #             continue
-    #     return {'children': children}
+        Returns:
+        {
+        'def1': 'def1-some-html',
+        'def2': 'def2-some-html'
+        }
+        """
+        import ipdb; ipdb.set_trace()
+        children = []
+        for child in xml_object:
+            try:
+                children.append(system.process_xml(etree.tostring(child)).location.url())
+            except:
+                log.exception("Unable to load child when parsing GST. Continuing...")
+                continue
+        return {'children': children}
 
-    # def definition_to_xml(self, resource_fs):
-    #     '''Return an xml element representing this definition.'''
-    #     import ipdb; ipdb.set_trace()
-    #     xml_object = etree.Element('gst')
+    def definition_to_xml(self, resource_fs):
+        '''Return an xml element representing this definition.'''
+        import ipdb; ipdb.set_trace()
+        xml_object = etree.Element('gst')
 
-    #     def add_child(k):
-    #         # child_str = '<{tag}>{body}</{tag}>'.format(tag=k, body=self.definition[k])
-    #         child_str = child.export_to_xml(resource_fs)
-    #         child_node = etree.fromstring(child_str)
-    #         xml_object.append(child_node)
+        def add_child(k):
+            # child_str = '<{tag}>{body}</{tag}>'.format(tag=k, body=self.definition[k])
+            child_str = child.export_to_xml(resource_fs)
+            child_node = etree.fromstring(child_str)
+            xml_object.append(child_node)
 
-    #     for child in self.get_children():
-    #         add_child(child)
+        for child in self.get_children():
+            add_child(child)
 
-    #     return xml_object
+        return xml_object
 
 
-    # def __init__(self, system, definition, **kwargs):
-    #     '''Render and save the template for this descriptor instance'''
-    #     super(CustomTagDescriptor, self).__init__(system, definition, **kwargs)
-    #     self.rendered_html = self.render_template(system, definition['data'])
\ No newline at end of file
+    def __init__(self, system, definition, **kwargs):
+        '''Render and save the template for this descriptor instance'''
+        import ipdb; ipdb.set_trace()
+        super(CustomTagDescriptor, self).__init__(system, definition, **kwargs)
+        self.rendered_html = self.render_template(system, definition['data'])
\ No newline at end of file

From 884db888f953d651d18a1f4cf5445da436451bdd Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 28 Nov 2012 16:48:07 +0200
Subject: [PATCH 232/541] teting gst

---
 common/lib/xmodule/xmodule/gst_module.py | 128 +++++++++++------------
 1 file changed, 64 insertions(+), 64 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index 285eeb8fce..f5b2095d95 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -29,70 +29,70 @@ class GSTModule(XModule):
     def __init__(self, system, location, definition, descriptor, instance_state=None,
                  shared_state=None, **kwargs):
         """
-        pass
-    #     Definition  should have....
-    #     sliders, text, module
+        Definition  should have....
+        sliders, text, module
 
-    #     Sample file:
+        Sample file:
 
-    #     <gst>
-    #         <h2> Plot... </h2>
-    #         <slider name="1" var="a"/>
-    #         <number name="1" var="a"/>
-    #         <plot/>
-    #         <sliders_info>
-    #         <sliders/>
-    #         <numbers_info>
-    #         </numbers_info
-    #         <plot_info>
-    #         </plot_info>
-    #     </gst>
-    #     """
-    #     XModule.__init__(self, system, location, definition, descriptor,
-    #                      instance_state, shared_state, **kwargs)
-    #     import ipdb; ipdb.set_trace()
-    #     self.rendered = False
+        <gst>
+            <h2> Plot... </h2>
+            <slider name="1" var="a"/>
+            <number name="1" var="a"/>
+            <plot/>
+            <sliders_info>
+            <sliders/>
+            <numbers_info>
+            </numbers_info
+            <plot_info>
+            </plot_info>
+        </gst>
+        """
+        XModule.__init__(self, system, location, definition, descriptor,
+                         instance_state, shared_state, **kwargs)
+        # import ipdb; ipdb.set_trace()
+        # self.rendered = False
 
-    # def get_html(self):
-    #     self.render()
-    #     return self.content
+    def get_html(self):
+        self.render()
+        return self.content
 
-    # def render(self):
-    #     import ipdb; ipdb.set_trace()
-    #     if self.rendered:
-    #         return
-    #     ## Returns a set of all types of all sub-children
-    #     contents = []
-    #     # import ipdb; ipdb.set_trace()
-    #     for child in self.get_display_items():
-    #         progress = child.get_progress()
-    #         childinfo = {
-    #             'gst': child.get_html(),
-    #             'plot': "\n".join(
-    #                 grand_child.display_name.strip()
-    #                 for grand_child in child.get_children()
-    #                 if 'display_name' in grand_child.metadata
-    #             ),
-    #             # 'progress_status': Progress.to_js_status_str(progress),
-    #             'progress_detail': Progress.to_js_detail_str(progress),
-    #             'type': child.get_icon_class(),
-    #         }
-    #         # if childinfo['title']=='':
-    #             # childinfo['title'] = child.metadata.get('display_name','')
-    #         contents.append(childinfo)
+    def render(self):
+        # import ipdb; ipdb.set_trace()
+        # if self.rendered:
+            return
+        ## Returns a set of all types of all sub-children
+        # contents = []
+        # # import ipdb; ipdb.set_trace()
+        # for child in self.get_display_items():
+        #     progress = child.get_progress()
+        #     childinfo = {
+        #         'gst': child.get_html(),
+        #         'plot': "\n".join(
+        #             grand_child.display_name.strip()
+        #             for grand_child in child.get_children()
+        #             if 'display_name' in grand_child.metadata
+        #         ),
+        #         # 'progress_status': Progress.to_js_status_str(progress),
+        #         'progress_detail': Progress.to_js_detail_str(progress),
+        #         'type': child.get_icon_class(),
+        #     }
+        #     # if childinfo['title']=='':
+        #         # childinfo['title'] = child.metadata.get('display_name','')
+        #     contents.append(childinfo)
 
-    #     params = {'items': contents,
-    #               'element_id': self.location.html_id(),
-    #               'item_id': self.id,
-    #               'position': self.position,
-    #               'tag': self.location.category
-    #               }
-
-    #     self.content = self.system.render_template('seq_module.html', params)
-    #     self.rendered = True
+        # params = {'items': contents,
+        #           'element_id': self.location.html_id(),
+        #           'item_id': self.id,
+        #           'position': self.position,
+        #           'tag': self.location.category
+                  # }
+        params= {}
+        self.content = self.system.render_template('gst_module.html', params)
+        # self.rendered = True
 
 
-class GSTDescriptor(RawDescriptor):
+# class GSTDescriptor(RawDescriptor):
+class GSTDescriptor(MakoModuleDescriptor, XmlDescriptor):
     mako_template = "widgets/html-edit.html"
     module_class = GSTModule
     template_dir_name = 'gst'
@@ -108,7 +108,7 @@ class GSTDescriptor(RawDescriptor):
         'def2': 'def2-some-html'
         }
         """
-        import ipdb; ipdb.set_trace()
+        # import ipdb; ipdb.set_trace()
         children = []
         for child in xml_object:
             try:
@@ -120,7 +120,7 @@ class GSTDescriptor(RawDescriptor):
 
     def definition_to_xml(self, resource_fs):
         '''Return an xml element representing this definition.'''
-        import ipdb; ipdb.set_trace()
+        # import ipdb; ipdb.set_trace()
         xml_object = etree.Element('gst')
 
         def add_child(k):
@@ -135,8 +135,8 @@ class GSTDescriptor(RawDescriptor):
         return xml_object
 
 
-    def __init__(self, system, definition, **kwargs):
-        '''Render and save the template for this descriptor instance'''
-        import ipdb; ipdb.set_trace()
-        super(CustomTagDescriptor, self).__init__(system, definition, **kwargs)
-        self.rendered_html = self.render_template(system, definition['data'])
\ No newline at end of file
+    # def __init__(self, system, definition, **kwargs):
+    #     '''Render and save the template for this descriptor instance'''
+    #     # import ipdb; ipdb.set_trace()
+    #     super(GSTDescriptor, self).__init__(system, definition, **kwargs)
+    #     self.rendered_html = self.render_template(system, definition['data'])
\ No newline at end of file

From 07cb76a7d99e822b4dbc9c140c6ad929c2bbbbc9 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 29 Nov 2012 16:43:33 +0200
Subject: [PATCH 233/541] first working version of gst module

---
 common/lib/xmodule/setup.py              |   2 +-
 common/lib/xmodule/xmodule/gst_module.py | 150 +++++++++++------------
 2 files changed, 73 insertions(+), 79 deletions(-)

diff --git a/common/lib/xmodule/setup.py b/common/lib/xmodule/setup.py
index 8deb2a7ce5..86636ef05a 100644
--- a/common/lib/xmodule/setup.py
+++ b/common/lib/xmodule/setup.py
@@ -36,7 +36,7 @@ setup(
             "videodev = xmodule.backcompat_module:TranslateCustomTagDescriptor",
             "videosequence = xmodule.seq_module:SequenceDescriptor",
             "discussion = xmodule.discussion_module:DiscussionDescriptor",
-            "gst = xmodule.gst_module:GSTDescriptor",
+            "graphical_slider_tool = xmodule.gst_module:GraphicalSliderToolDescriptor",
         ]
     }
 )
diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index f5b2095d95..d90bc46e6e 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -1,6 +1,6 @@
 """
-GST (Graphical-Slider-Tool) module is ungraded xmodule used by students to
-understand functional dependencies
+Graphical slider tool module is ungraded xmodule used by students to
+understand functional dependencies.
 """
 
 # import json
@@ -15,11 +15,12 @@ from xmodule.progress import Progress
 from xmodule.exceptions import NotFoundError
 from pkg_resources import resource_string
 from xmodule.raw_module import RawDescriptor
+from xmodule.stringify import stringify_children
 
 # log = logging.getLogger("mitx.common.lib.seq_module")
 
 
-class GSTModule(XModule):
+class GraphicalSliderToolModule(XModule):
     ''' Graphical-Slider-Tool Module
     '''
     # js = {'js': [resource_string(__name__, 'js/src/gst/gst.js')]}
@@ -34,92 +35,92 @@ class GSTModule(XModule):
 
         Sample file:
 
-        <gst>
-            <h2> Plot... </h2>
-            <slider name="1" var="a"/>
-            <number name="1" var="a"/>
-            <plot/>
-            <sliders_info>
-            <sliders/>
-            <numbers_info>
-            </numbers_info
-            <plot_info>
-            </plot_info>
-        </gst>
+        <sequential>
+          <vertical>
+            <graphical_slider_tool>
+              <render>
+                Graphic slider tool html. Can include
+                'number', 'slider' and plot tags. They will be replaced
+                by proper number, slider and plot widgets.
+              </render>
+              <configuration>
+                <sliders>
+                  <slider name="1" var="a" range="-100, 1, 100" />
+                </sliders>
+                <numbers>
+                  <number name="1" var="a"/>
+                </numbers>
+                <plot>
+                  <function name="1" y="x^2 + a"/>
+                  <function name="2" y="3*x + b"/>
+                  <!-- xrange and yrange are optional -->
+                  <xrange>-10, 1, 10</xrange>
+                  <!-- xticks and yticks are optional -->
+                  <xticks>1</xticks>
+                  <yticks>1</yticks>
+                </plot>
+                <!-- if some parameter in function is not related to any slider or
+                number, then only error message is displayed.
+                Sliders and numbers are optional. Plot is required.-->
+              </configuration>
+            </graphical_slider_tool>
+          </vertical>
+        </sequential>
         """
         XModule.__init__(self, system, location, definition, descriptor,
                          instance_state, shared_state, **kwargs)
-        # import ipdb; ipdb.set_trace()
-        # self.rendered = False
 
     def get_html(self):
-        self.render()
+        params = {
+                  'main_html': self.definition['render'].strip(),
+                  'element_id': self.location.html_id(),
+                  'element_class': self.location.category
+                  }
+        self.content = (self.system.render_template(
+                        'graphical_slider_tool.html', params))
         return self.content
 
-    def render(self):
-        # import ipdb; ipdb.set_trace()
-        # if self.rendered:
-            return
-        ## Returns a set of all types of all sub-children
-        # contents = []
-        # # import ipdb; ipdb.set_trace()
-        # for child in self.get_display_items():
-        #     progress = child.get_progress()
-        #     childinfo = {
-        #         'gst': child.get_html(),
-        #         'plot': "\n".join(
-        #             grand_child.display_name.strip()
-        #             for grand_child in child.get_children()
-        #             if 'display_name' in grand_child.metadata
-        #         ),
-        #         # 'progress_status': Progress.to_js_status_str(progress),
-        #         'progress_detail': Progress.to_js_detail_str(progress),
-        #         'type': child.get_icon_class(),
-        #     }
-        #     # if childinfo['title']=='':
-        #         # childinfo['title'] = child.metadata.get('display_name','')
-        #     contents.append(childinfo)
 
-        # params = {'items': contents,
-        #           'element_id': self.location.html_id(),
-        #           'item_id': self.id,
-        #           'position': self.position,
-        #           'tag': self.location.category
-                  # }
-        params= {}
-        self.content = self.system.render_template('gst_module.html', params)
-        # self.rendered = True
-
-
-# class GSTDescriptor(RawDescriptor):
-class GSTDescriptor(MakoModuleDescriptor, XmlDescriptor):
-    mako_template = "widgets/html-edit.html"
-    module_class = GSTModule
-    template_dir_name = 'gst'
+class GraphicalSliderToolDescriptor(MakoModuleDescriptor, XmlDescriptor):
+    module_class = GraphicalSliderToolModule
+    template_dir_name = 'graphical_slider_tool'
 
     @classmethod
     def definition_from_xml(cls, xml_object, system):
         """
         Pull out the data into dictionary.
 
+        Args:
+            xml_object: xml from file.
+
         Returns:
-        {
-        'def1': 'def1-some-html',
-        'def2': 'def2-some-html'
-        }
+            dict
         """
-        # import ipdb; ipdb.set_trace()
-        children = []
-        for child in xml_object:
-            try:
-                children.append(system.process_xml(etree.tostring(child)).location.url())
-            except:
-                log.exception("Unable to load child when parsing GST. Continuing...")
-                continue
-        return {'children': children}
+        # check for presense of required tags in xml
+        expected_children_level_0 = ['render', 'configuration']
+        for child in expected_children_level_0:
+            if len(xml_object.xpath(child)) != 1:
+                raise ValueError("Self a\ssessment definition must include \
+                    exactly one '{0}' tag".format(child))
+        expected_children_level_1 = ['plot']
+        for child in expected_children_level_1:
+            if len(xml_object.xpath('configuration')[0].xpath(child)) != 1:
+                raise ValueError("Self a\ssessment definition must include \
+                    exactly one '{0}' tag".format(child))
+        # finished
+
+        def parse(k):
+            """Assumes that xml_object has child k"""
+            return stringify_children(xml_object.xpath(k)[0])
+
+        return {
+                    'render': parse('render'),
+                    'configuration': xml_object.xpath('configuration')[0],
+                }
 
     def definition_to_xml(self, resource_fs):
-        '''Return an xml element representing this definition.'''
+        '''Return an xml element representing this definition.
+        Not implemented'''
         # import ipdb; ipdb.set_trace()
         xml_object = etree.Element('gst')
 
@@ -133,10 +134,3 @@ class GSTDescriptor(MakoModuleDescriptor, XmlDescriptor):
             add_child(child)
 
         return xml_object
-
-
-    # def __init__(self, system, definition, **kwargs):
-    #     '''Render and save the template for this descriptor instance'''
-    #     # import ipdb; ipdb.set_trace()
-    #     super(GSTDescriptor, self).__init__(system, definition, **kwargs)
-    #     self.rendered_html = self.render_template(system, definition['data'])
\ No newline at end of file

From 54c222a0153073126a74cec3acb050a3e578e24e Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 29 Nov 2012 16:44:10 +0200
Subject: [PATCH 234/541] template for gst

---
 lms/templates/graphical_slider_tool.html | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 lms/templates/graphical_slider_tool.html

diff --git a/lms/templates/graphical_slider_tool.html b/lms/templates/graphical_slider_tool.html
new file mode 100644
index 0000000000..cb484d9e6c
--- /dev/null
+++ b/lms/templates/graphical_slider_tool.html
@@ -0,0 +1,3 @@
+<div align="center" id="element_id" class="element_class">
+${main_html}
+</div>

From 169d4b123ca9f803ab7b5381a4c4450ece1719a8 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 30 Nov 2012 14:55:00 +0200
Subject: [PATCH 235/541] updates

---
 common/lib/xmodule/xmodule/gst_module.py | 50 +++++++++++++++++++-----
 lms/templates/graphical_slider_tool.html | 14 ++++++-
 2 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index d90bc46e6e..e98b7b6c90 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -3,21 +3,19 @@ Graphical slider tool module is ungraded xmodule used by students to
 understand functional dependencies.
 """
 
-# import json
+import json
 import logging
-
 from lxml import etree
+import xmltodict
+import re
 
 from xmodule.mako_module import MakoModuleDescriptor
 from xmodule.xml_module import XmlDescriptor
 from xmodule.x_module import XModule
-from xmodule.progress import Progress
-from xmodule.exceptions import NotFoundError
-from pkg_resources import resource_string
-from xmodule.raw_module import RawDescriptor
 from xmodule.stringify import stringify_children
 
-# log = logging.getLogger("mitx.common.lib.seq_module")
+
+log = logging.getLogger("mitx.common.lib.gst_module")
 
 
 class GraphicalSliderToolModule(XModule):
@@ -71,15 +69,49 @@ class GraphicalSliderToolModule(XModule):
                          instance_state, shared_state, **kwargs)
 
     def get_html(self):
+        self.get_configuration()
+        gst_html = self.substitute_controls(self.definition['render'].strip())
+
         params = {
-                  'main_html': self.definition['render'].strip(),
+                  'gst_html': gst_html,
                   'element_id': self.location.html_id(),
-                  'element_class': self.location.category
+                  'element_class': self.location.category,
+                  'configuration_json': self.configuration_json
                   }
         self.content = (self.system.render_template(
                         'graphical_slider_tool.html', params))
+        # import ipdb; ipdb.set_trace()
         return self.content
 
+    def substitute_controls(self, html_string):
+        """ Substitue control element via their divs.
+        Simple variant: slider and plot controls are not inside any tag.
+        """
+        plot_div = '<div class="${element_class}_plot" id="${element_id}_plot" \
+        style="width: 600px; height: 600px; padding: 0px; position: relative;"> \
+        This is plot</div>'
+        html_string.replace('$plot$', plot_div)
+        vars = [x['@var'] for x in json.loads(self.configuration_json)['root']['sliders']['slider']]
+        for var in vars:
+            m = re.match('$slider\[([0-9]+),([0-9]+)]', self.value.strip().replace(' ', ''))
+        if m:
+            # Note: we subtract 15 to compensate for the size of the dot on the screen.
+            # (is a 30x30 image--lms/static/green-pointer.png).
+            (self.gx, self.gy) = [int(x) - 15 for x in m.groups()]
+        html.replace('$slider' + ' ' + x['@var'])
+        return html_string
+
+    def get_configuration(self):
+        """Parse self.definition['configuration'] and transfer it to javascript
+        via json.
+        """
+        # root added for interface compatibility with xmltodict.parse
+        self.configuration_json = json.dumps(
+                xmltodict.parse('<root>' +
+                stringify_children(self.definition['configuration'])
+                             + '</root>'))
+        return self.configuration_json
+
 
 class GraphicalSliderToolDescriptor(MakoModuleDescriptor, XmlDescriptor):
     module_class = GraphicalSliderToolModule
diff --git a/lms/templates/graphical_slider_tool.html b/lms/templates/graphical_slider_tool.html
index cb484d9e6c..7d6cc292c5 100644
--- a/lms/templates/graphical_slider_tool.html
+++ b/lms/templates/graphical_slider_tool.html
@@ -1,3 +1,13 @@
-<div align="center" id="element_id" class="element_class">
-${main_html}
+<div align="center" id="${element_id}" class="${element_class}">
+<!-- xidden field to read configuration json from -->
+<div class="${element_class}" id="${element_id}_json" style="hidden"
+data-json="${configuration_json}">
+
+<!-- main xml with marked places for sliders, number and plots -->
+${gst_html}
+
+
+{# widgests  <div class="slider" id="${element_class}_1" data-var="a"></div> #}
+
+
 </div>

From 69d0156c36c9316b365aa6128d09c737f3b78177 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 30 Nov 2012 17:17:32 +0200
Subject: [PATCH 236/541] slider, plot and input contrlos are transferred from
 xml to html substituted to proper div elements

---
 common/lib/xmodule/xmodule/gst_module.py | 50 ++++++++++++++++++------
 lms/templates/graphical_slider_tool.html |  7 +---
 2 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index e98b7b6c90..2d65b768ec 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -70,12 +70,14 @@ class GraphicalSliderToolModule(XModule):
 
     def get_html(self):
         self.get_configuration()
+        self.html_id = self.location.html_id()
+        self.html_class = self.location.category
         gst_html = self.substitute_controls(self.definition['render'].strip())
-
+        
         params = {
                   'gst_html': gst_html,
-                  'element_id': self.location.html_id(),
-                  'element_class': self.location.category,
+                  'element_id': self.html_id,
+                  'element_class': self.html_class,
                   'configuration_json': self.configuration_json
                   }
         self.content = (self.system.render_template(
@@ -87,18 +89,44 @@ class GraphicalSliderToolModule(XModule):
         """ Substitue control element via their divs.
         Simple variant: slider and plot controls are not inside any tag.
         """
+        #substitute plot
         plot_div = '<div class="${element_class}_plot" id="${element_id}_plot" \
         style="width: 600px; height: 600px; padding: 0px; position: relative;"> \
         This is plot</div>'
-        html_string.replace('$plot$', plot_div)
-        vars = [x['@var'] for x in json.loads(self.configuration_json)['root']['sliders']['slider']]
+        html_string = html_string.replace('$plot$', plot_div)
+
+        # substitute sliders
+        sliders = json.loads(self.configuration_json)['root']['sliders']['slider']
+        if type(sliders) == dict:
+            sliders = [sliders]
+        vars = [x['@var'] for x in sliders]
+
+        slider_div = '<div class="{element_class}_slider" id="{element_id}_{var}" \
+        data-var="{var}">This is slider</div>'
+
         for var in vars:
-            m = re.match('$slider\[([0-9]+),([0-9]+)]', self.value.strip().replace(' ', ''))
-        if m:
-            # Note: we subtract 15 to compensate for the size of the dot on the screen.
-            # (is a 30x30 image--lms/static/green-pointer.png).
-            (self.gx, self.gy) = [int(x) - 15 for x in m.groups()]
-        html.replace('$slider' + ' ' + x['@var'])
+            html_string = re.sub(r'\$slider\s+' + var + r'\$',
+                                slider_div.format(element_class=self.html_class,
+                                                  element_id=self.html_id,
+                                                  var=var),
+                                html_string, flags=re.IGNORECASE | re.UNICODE)
+
+        # substitute numbers
+        inputs = json.loads(self.configuration_json)['root']['inputs']['input']
+        if type(inputs) == dict:
+            inputs = [inputs]
+        vars = [x['@var'] for x in inputs]
+
+        input_div = '<div class="{element_class}_input" id="{element_id}_{var}" \
+        data-var="{var}">This is input</div>'
+
+        for var in vars:
+            html_string = re.sub(r'\$input\s+' + var + r'\$',
+                                input_div.format(element_class=self.html_class,
+                                                 element_id=self.html_id,
+                                                 var=var),
+                                html_string, flags=re.IGNORECASE | re.UNICODE)
+        # import ipdb; ipdb.set_trace()
         return html_string
 
     def get_configuration(self):
diff --git a/lms/templates/graphical_slider_tool.html b/lms/templates/graphical_slider_tool.html
index 7d6cc292c5..920e53cab3 100644
--- a/lms/templates/graphical_slider_tool.html
+++ b/lms/templates/graphical_slider_tool.html
@@ -1,13 +1,10 @@
 <div align="center" id="${element_id}" class="${element_class}">
+
 <!-- xidden field to read configuration json from -->
 <div class="${element_class}" id="${element_id}_json" style="hidden"
-data-json="${configuration_json}">
+data-json="${configuration_json}"></div>
 
 <!-- main xml with marked places for sliders, number and plots -->
 ${gst_html}
 
-
-{# widgests  <div class="slider" id="${element_class}_1" data-var="a"></div> #}
-
-
 </div>

From 30df77b9b24131c9e5960a81838379844c11727e Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 30 Nov 2012 17:21:30 +0200
Subject: [PATCH 237/541] added xmltodict to dependencies

---
 requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements.txt b/requirements.txt
index a3e1e3e6e5..08cfe57e2e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -56,3 +56,4 @@ dogstatsd-python==0.2.1
 sphinx==1.1.3
 Shapely==1.2.16
 ipython==0.13.1
+xmltodict==0.4.1

From da4a676513e201290ce02bdd36b90725163068f6 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Mon, 3 Dec 2012 15:08:37 +0200
Subject: [PATCH 238/541] working xmodule - GsT

---
 common/lib/xmodule/xmodule/gst_module.py      | 68 +++++++++++++------
 .../js/src/graphical_slider_tool/gst.js       | 17 +++++
 lms/templates/graphical_slider_tool.html      | 12 ++++
 3 files changed, 77 insertions(+), 20 deletions(-)
 create mode 100644 common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst.js

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index 2d65b768ec..60c03dec10 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -13,6 +13,7 @@ from xmodule.mako_module import MakoModuleDescriptor
 from xmodule.xml_module import XmlDescriptor
 from xmodule.x_module import XModule
 from xmodule.stringify import stringify_children
+from pkg_resources import resource_string
 
 
 log = logging.getLogger("mitx.common.lib.gst_module")
@@ -21,9 +22,8 @@ log = logging.getLogger("mitx.common.lib.gst_module")
 class GraphicalSliderToolModule(XModule):
     ''' Graphical-Slider-Tool Module
     '''
-    # js = {'js': [resource_string(__name__, 'js/src/gst/gst.js')]}
-    # #css = {'scss': [resource_string(__name__, 'css/capa/display.scss')]}
-    # js_module_name = "GST"
+    js = {'js': [resource_string(__name__, 'js/src/graphical_slider_tool/gst.js')]}
+    js_module_name = "GraphicalSliderTool"
 
     def __init__(self, system, location, definition, descriptor, instance_state=None,
                  shared_state=None, **kwargs):
@@ -37,30 +37,55 @@ class GraphicalSliderToolModule(XModule):
           <vertical>
             <graphical_slider_tool>
               <render>
-                Graphic slider tool html. Can include
-                'number', 'slider' and plot tags. They will be replaced
-                by proper number, slider and plot widgets.
+                <p>Graphic slider tool html.</p>
+                <p>Can include 'input', 'slider' and 'plot' tags.
+                They will be replaced by proper number, slider and plot
+                widgets. </p>
+                For example: $slider a$, second $slider b$,
+                  number $input a$, and, plot:
+                  $plot$
+
+                  <!-- Sliders, and plot cannot be inside <p> -->
               </render>
               <configuration>
                 <sliders>
-                  <slider name="1" var="a" range="-100, 1, 100" />
+                  <!-- optional: width=100 (in pixels), default is 400,
+                  show_value=[editable, not-editable], default is disabled.-->
+                  <slider var="a" range="-100, 1, 100" />
+                  <slider var="b" range="-1000, 100, 1000" witdh="300"/>
                 </sliders>
-                <numbers>
-                  <number name="1" var="a"/>
-                </numbers>
+                <inputs>
+                  <!-- optional: width=100 (in pixels), readonly=[true|false] -->
+                  <input var="a" initial="1"/>
+                </inputs>
                 <plot>
-                  <function name="1" y="x^2 + a"/>
-                  <function name="2" y="3*x + b"/>
-                  <!-- xrange and yrange are optional -->
-                  <xrange>-10, 1, 10</xrange>
-                  <!-- xticks and yticks are optional -->
-                  <xticks>1</xticks>
-                  <yticks>1</yticks>
+                  <!-- optional: color=[standard web]; line=[true|false], default true;
+                  dot=[true|false], default false; label="string",
+                  style of line =[normal, dashed], default normal,
+                  point size-->
+                  <function y="x^2 + a" />
+                  <function y="3*x + b" color="red"/>
+                  <!-- asymtotes are functions,
+                  optional: name="string" -->
+                  <function y="b" color="red" style="dashed" name="b"/>
+                  <function y="b/2" color="red" style="dashed" name="b/2"/>
+                  <!-- xrange: min, max, yrange is calculated automatically -->
+                  <xrange>-10, 10</xrange>
+                  <!-- optional number of points, default is 300 -->
+                  <numpoints>60</numpoints>
+                  <!-- xticks and yticks are optional: min, step, max -->
+                  <xticks>-9, 1, 9</xticks>
+                  <yticks>-9, 1, 9</yticks>
+                  <!-- xaxis and xaxis are optional -->
+                  <xaxis unit="cm"/>
+                  <yaxis unit="s"/>
                 </plot>
                 <!-- if some parameter in function is not related to any slider or
                 number, then only error message is displayed.
                 Sliders and numbers are optional. Plot is required.-->
               </configuration>
+              <plot_code>
+              </plot_code>
             </graphical_slider_tool>
           </vertical>
         </sequential>
@@ -73,12 +98,13 @@ class GraphicalSliderToolModule(XModule):
         self.html_id = self.location.html_id()
         self.html_class = self.location.category
         gst_html = self.substitute_controls(self.definition['render'].strip())
-        
+        # import ipdb; ipdb.set_trace()
         params = {
                   'gst_html': gst_html,
                   'element_id': self.html_id,
                   'element_class': self.html_class,
-                  'configuration_json': self.configuration_json
+                  'configuration_json': self.configuration_json,
+                  'plot_code': self.definition['plot_code']
                   }
         self.content = (self.system.render_template(
                         'graphical_slider_tool.html', params))
@@ -157,11 +183,12 @@ class GraphicalSliderToolDescriptor(MakoModuleDescriptor, XmlDescriptor):
             dict
         """
         # check for presense of required tags in xml
-        expected_children_level_0 = ['render', 'configuration']
+        expected_children_level_0 = ['render', 'configuration', 'plot_code']
         for child in expected_children_level_0:
             if len(xml_object.xpath(child)) != 1:
                 raise ValueError("Self a\ssessment definition must include \
                     exactly one '{0}' tag".format(child))
+
         expected_children_level_1 = ['plot']
         for child in expected_children_level_1:
             if len(xml_object.xpath('configuration')[0].xpath(child)) != 1:
@@ -176,6 +203,7 @@ class GraphicalSliderToolDescriptor(MakoModuleDescriptor, XmlDescriptor):
         return {
                     'render': parse('render'),
                     'configuration': xml_object.xpath('configuration')[0],
+                    'plot_code': parse('plot_code'),
                 }
 
     def definition_to_xml(self, resource_fs):
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst.js
new file mode 100644
index 0000000000..03778ea437
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst.js
@@ -0,0 +1,17 @@
+//  Graphical Slider Tool module
+
+(function() {
+    this.GraphicalSliderTool = (function() {
+        function GST(el) {
+            console.log(el);
+        // element is :
+        //<section class="xmodule_display
+        // xmodule_GraphicalSliderToolModule" data-type="GST">
+        }
+        // console.log('in GST');
+        return GST;
+
+    })();
+}).call(this);
+// this=window, after call
+// window['Graphical_Slider_Tool'] is available.
\ No newline at end of file
diff --git a/lms/templates/graphical_slider_tool.html b/lms/templates/graphical_slider_tool.html
index 920e53cab3..fc5052893a 100644
--- a/lms/templates/graphical_slider_tool.html
+++ b/lms/templates/graphical_slider_tool.html
@@ -4,7 +4,19 @@
 <div class="${element_class}" id="${element_id}_json" style="hidden"
 data-json="${configuration_json}"></div>
 
+<!-- xidden field to read configuration json from -->
+<div class="${element_class}" id="${element_id}_plot_code" style="hidden"
+data-plot="${plot_code}"></div>
+
 <!-- main xml with marked places for sliders, number and plots -->
 ${gst_html}
 
 </div>
+
+
+<script type="text/javascript">
+//  wil be invoked for every GST section
+  $(document).ready(function() {
+    console.log('Another GST applet is loaded')
+  });
+</script>

From 643ac69a57af84733318fd06675a3f1126661ff2 Mon Sep 17 00:00:00 2001
From: valera-rozuvan <valera.rozuvan@gmail.com>
Date: Wed, 5 Dec 2012 16:56:31 +0200
Subject: [PATCH 239/541] Separating JS from the html for GST.

---
 common/static/js/graphical_slider_tool/main.js |  1 +
 lms/templates/graphical_slider_tool.html       | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 common/static/js/graphical_slider_tool/main.js

diff --git a/common/static/js/graphical_slider_tool/main.js b/common/static/js/graphical_slider_tool/main.js
new file mode 100644
index 0000000000..bb624d5888
--- /dev/null
+++ b/common/static/js/graphical_slider_tool/main.js
@@ -0,0 +1 @@
+alert('Hello, world!');
diff --git a/lms/templates/graphical_slider_tool.html b/lms/templates/graphical_slider_tool.html
index fc5052893a..97fca83ff4 100644
--- a/lms/templates/graphical_slider_tool.html
+++ b/lms/templates/graphical_slider_tool.html
@@ -14,9 +14,9 @@ ${gst_html}
 </div>
 
 
-<script type="text/javascript">
-//  wil be invoked for every GST section
-  $(document).ready(function() {
-    console.log('Another GST applet is loaded')
-  });
+<script type="text/javascript" src="/static/js/graphical_slider_tool/main.js">
+    // wil be invoked for every GST section
+    // $(document).ready(function() {
+    //     console.log('Another GST applet is loaded')
+    // });
 </script>

From 0913e9ef69c6f12f5d87195c54d683de040bc82c Mon Sep 17 00:00:00 2001
From: valera-rozuvan <valera.rozuvan@gmail.com>
Date: Wed, 5 Dec 2012 17:16:57 +0200
Subject: [PATCH 240/541] Work on GST.

---
 .../js/src/graphical_slider_tool/module.js    | 15 ++++
 .../js/graphical_slider_tool/gst_module.js    | 15 ++++
 .../static/js/graphical_slider_tool/main.js   | 76 ++++++++++++++++++-
 lms/envs/common.py                            |  1 +
 lms/templates/graphical_slider_tool.html      | 26 ++-----
 5 files changed, 114 insertions(+), 19 deletions(-)
 create mode 100644 common/lib/xmodule/xmodule/js/src/graphical_slider_tool/module.js
 create mode 100644 common/static/js/graphical_slider_tool/gst_module.js

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/module.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/module.js
new file mode 100644
index 0000000000..c4661b5e44
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/module.js
@@ -0,0 +1,15 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+(function (requirejs, require, define) {
+
+define([], function () {
+    return {
+        'module_status': 'OK'
+    };
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/static/js/graphical_slider_tool/gst_module.js b/common/static/js/graphical_slider_tool/gst_module.js
new file mode 100644
index 0000000000..c4661b5e44
--- /dev/null
+++ b/common/static/js/graphical_slider_tool/gst_module.js
@@ -0,0 +1,15 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+(function (requirejs, require, define) {
+
+define([], function () {
+    return {
+        'module_status': 'OK'
+    };
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/static/js/graphical_slider_tool/main.js b/common/static/js/graphical_slider_tool/main.js
index bb624d5888..da36d9c9d6 100644
--- a/common/static/js/graphical_slider_tool/main.js
+++ b/common/static/js/graphical_slider_tool/main.js
@@ -1 +1,75 @@
-alert('Hello, world!');
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+(function (requirejs, require, define) {
+
+// For documentation please check:
+//     http://requirejs.org/docs/api.html
+requirejs.config({
+    // Because require.js is included as a simple <script> tag (and is
+    // forcefully namespaced) it does not get it's configuration from a
+    // predefined 'data-main' attribute. Therefore, from the start, it assumes
+    // that the 'baseUrl' is the same directory that require.js itself is
+    // contained in - i.e. in '/static/js/vendor'. So, we must specify a
+    // correct 'baseUrl'.
+    //
+    // Require JS initially searches this directory for all of the specified
+    // dependencies. If the dependency is
+    //
+    //     'sylvester'
+    //
+    // then it will try to get it from
+    //
+    //     baseUrl + '/' + 'sylvester' + '.js'
+    //
+    // If the dependency is
+    //
+    //     'vendor_libs/sylvester'
+    //
+    // then it will try to get it from
+    //
+    //     baseUrl + '/' + 'vendor_libs/sylvester' + '.js'
+    //
+    // This means two things. One - you can use sub-folders to separate your
+    // code. Two - don't include the '.js' suffix when specifying a dependency.
+    //
+    // For documentation please check:
+    //     http://requirejs.org/docs/api.html#config-baseUrl
+    'baseUrl': '/static/js/graphical_slider_tool',
+
+    // If you need to load from another path, you can specify it here on a
+    // per-module basis. For example you can specify CDN sources here, or
+    // absolute paths that lie outside of the 'baseUrl' directory.
+    //
+    // For documentation please check:
+    //     http://requirejs.org/docs/api.html#config-paths
+    'paths': {
+
+    },
+
+    // Since all of the modules that we require are not aware of our custom
+    // RequireJS solution, that means all of them will be working in the
+    // "old mode". I.e. they will populate the global namespace with their
+    // module object.
+    //
+    // For each module that we will use, we will specify what is exports into
+    // the global namespace, and, if necessary, other modules that it depends.
+    // on. Module dependencies  (downloading them, inserting into the document,
+    // etc.) are handled by RequireJS.
+    //
+    // For documentation please check:
+    //     http://requirejs.org/docs/api.html#config-shim
+    'shim': {
+
+    }
+}); // End-of: requirejs.config({
+
+// Start the main app logic.
+requirejs(['gst_module'], function (GstModule) {
+    console.log(GstModule);
+}); // End-of: requirejs(['gst_module'], function (GstModule)
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 0364a8b6f8..6790e5b714 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -430,6 +430,7 @@ courseware_only_js += [
 main_vendor_js = [
   'js/vendor/RequireJS.js',
   'js/vendor/json2.js',
+  'js/vendor/RequireJS.js',
   'js/vendor/jquery.min.js',
   'js/vendor/jquery-ui.min.js',
   'js/vendor/jquery.cookie.js',
diff --git a/lms/templates/graphical_slider_tool.html b/lms/templates/graphical_slider_tool.html
index 97fca83ff4..d6cffc67e2 100644
--- a/lms/templates/graphical_slider_tool.html
+++ b/lms/templates/graphical_slider_tool.html
@@ -1,22 +1,12 @@
 <div align="center" id="${element_id}" class="${element_class}">
+    <!-- xidden field to read configuration json from -->
+    <div class="${element_class}" id="${element_id}_json" style="hidden"
+    data-json="${configuration_json}"></div>
 
-<!-- xidden field to read configuration json from -->
-<div class="${element_class}" id="${element_id}_json" style="hidden"
-data-json="${configuration_json}"></div>
-
-<!-- xidden field to read configuration json from -->
-<div class="${element_class}" id="${element_id}_plot_code" style="hidden"
-data-plot="${plot_code}"></div>
-
-<!-- main xml with marked places for sliders, number and plots -->
-${gst_html}
+    <!-- xidden field to read configuration json from -->
+    <div class="${element_class}" id="${element_id}_plot_code" style="hidden"
+    data-plot="${plot_code}"></div>
 
+    <!-- main xml with marked places for sliders, number and plots -->
+    ${gst_html}
 </div>
-
-
-<script type="text/javascript" src="/static/js/graphical_slider_tool/main.js">
-    // wil be invoked for every GST section
-    // $(document).ready(function() {
-    //     console.log('Another GST applet is loaded')
-    // });
-</script>

From 5990fa2ef5e382465f2d042efbe5a44eba5a4762 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Fri, 7 Dec 2012 17:25:24 +0200
Subject: [PATCH 241/541] Integrated RequireJS with xmodule for GST.

---
 common/lib/xmodule/xmodule/gst_module.py      | 14 ++++++-
 .../js/src/graphical_slider_tool/gst.js       | 37 ++++++++++---------
 .../js/src/graphical_slider_tool/gst_main.js  | 17 +++++++++
 .../{module.js => mod1.js}                    |  3 +-
 .../js/src/graphical_slider_tool/mod2.js      | 16 ++++++++
 .../js/src/graphical_slider_tool/mod3.js      | 19 ++++++++++
 .../js/src/graphical_slider_tool/mod4.js      | 16 ++++++++
 .../js/src/graphical_slider_tool/mod5.js      | 16 ++++++++
 8 files changed, 119 insertions(+), 19 deletions(-)
 create mode 100644 common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
 rename common/lib/xmodule/xmodule/js/src/graphical_slider_tool/{module.js => mod1.js} (88%)
 create mode 100644 common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod2.js
 create mode 100644 common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod3.js
 create mode 100644 common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod4.js
 create mode 100644 common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod5.js

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index 60c03dec10..f89cb0f990 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -22,7 +22,19 @@ log = logging.getLogger("mitx.common.lib.gst_module")
 class GraphicalSliderToolModule(XModule):
     ''' Graphical-Slider-Tool Module
     '''
-    js = {'js': [resource_string(__name__, 'js/src/graphical_slider_tool/gst.js')]}
+
+    js = {
+      'js': [
+        resource_string(__name__, 'js/src/graphical_slider_tool/gst_main.js'),
+        resource_string(__name__, 'js/src/graphical_slider_tool/mod1.js'),
+        resource_string(__name__, 'js/src/graphical_slider_tool/mod2.js'),
+        resource_string(__name__, 'js/src/graphical_slider_tool/mod3.js'),
+        resource_string(__name__, 'js/src/graphical_slider_tool/mod4.js'),
+        resource_string(__name__, 'js/src/graphical_slider_tool/mod5.js'),
+
+        resource_string(__name__, 'js/src/graphical_slider_tool/gst.js')
+      ]
+    }
     js_module_name = "GraphicalSliderTool"
 
     def __init__(self, system, location, definition, descriptor, instance_state=None,
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst.js
index 03778ea437..1434d05f70 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst.js
@@ -1,17 +1,20 @@
-//  Graphical Slider Tool module
-
-(function() {
-    this.GraphicalSliderTool = (function() {
-        function GST(el) {
-            console.log(el);
-        // element is :
-        //<section class="xmodule_display
-        // xmodule_GraphicalSliderToolModule" data-type="GST">
-        }
-        // console.log('in GST');
-        return GST;
-
-    })();
-}).call(this);
-// this=window, after call
-// window['Graphical_Slider_Tool'] is available.
\ No newline at end of file
+/*
+ * We will add a function that will be called for all GraphicalSliderTool
+ * xmodule module instances. It must be available globally by design of
+ * xmodule.
+ */
+window.GraphicalSliderTool = function (el) {
+    // All the work will be performed by the GstMain module. We will get access
+    // to it, and all it's dependencies, via Require JS. Currently Require JS
+    // is namespaced and is available via a global object RequireJS.
+    RequireJS.require(['GstMain'], function (GstMain) {
+        // The GstMain module expects the DOM ID of a Graphical Slider Tool
+        // element. Since we are given a <section> element which might in
+        // theory contain multiple graphical_slider_tool <div> elements (each
+        // with a unique DOM ID), we will iterate over all children, and for
+        // each match, we will call GstMain module.
+        $(el).children('.graphical_slider_tool').each(function (index, value) {
+            GstMain($(value).attr('id'));
+        });
+    });
+};
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
new file mode 100644
index 0000000000..66f98eddf7
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
@@ -0,0 +1,17 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+(function (requirejs, require, define) {
+
+define('GstMain', ['mod1', 'mod2', 'mod3', 'mod4'], function (mod1, mod2, mod3, mod4) {
+    return GstMain;
+
+    function GstMain(gstId) {
+        console.log('The DOM ID of the current GST element is ' + gstId);
+    }
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/module.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod1.js
similarity index 88%
rename from common/lib/xmodule/xmodule/js/src/graphical_slider_tool/module.js
rename to common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod1.js
index c4661b5e44..44674b96d3 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/module.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod1.js
@@ -2,7 +2,8 @@
 // define() functions from Require JS available inside the anonymous function.
 (function (requirejs, require, define) {
 
-define([], function () {
+define('mod1', [], function () {
+    console.log('we are in the mod1 callback');
     return {
         'module_status': 'OK'
     };
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod2.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod2.js
new file mode 100644
index 0000000000..9c26bb1dfe
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod2.js
@@ -0,0 +1,16 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+(function (requirejs, require, define) {
+
+define('mod2', [], function () {
+    console.log('we are in the mod2 callback');
+    return {
+        'module_status': 'OK'
+    };
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod3.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod3.js
new file mode 100644
index 0000000000..21961f3611
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod3.js
@@ -0,0 +1,19 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+(function (requirejs, require, define) {
+
+define('mod3', ['mod5'], function (mod5) {
+    console.log('we are in the mod3 callback');
+
+    console.log('mod5 status: [' + mod5.module_status + '].');
+
+    return {
+        'module_status': 'OK'
+    };
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod4.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod4.js
new file mode 100644
index 0000000000..0edf809155
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod4.js
@@ -0,0 +1,16 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+(function (requirejs, require, define) {
+
+define('mod4', [], function () {
+    console.log('we are in the mod4 callback');
+    return {
+        'module_status': 'OK'
+    };
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod5.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod5.js
new file mode 100644
index 0000000000..5e843ac468
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod5.js
@@ -0,0 +1,16 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+(function (requirejs, require, define) {
+
+define('mod5', [], function () {
+    console.log('we are in the mod5 callback');
+    return {
+        'module_status': 'OK'
+    };
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)

From 080e96fdc481b95f9a50348c368872baacc17a12 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Mon, 10 Dec 2012 08:28:34 +0200
Subject: [PATCH 242/541] Work in progress on GST.

---
 common/lib/xmodule/xmodule/gst_module.py      |  14 +-
 .../{mod3.js => general_methods.js}           |  12 +-
 .../js/src/graphical_slider_tool/gst_main.js  |  12 +-
 .../js/src/graphical_slider_tool/logme.js     |  54 ++++++
 .../js/src/graphical_slider_tool/mod1.js      |  16 --
 .../js/src/graphical_slider_tool/mod2.js      |  16 --
 .../js/src/graphical_slider_tool/mod4.js      |  16 --
 .../js/src/graphical_slider_tool/sliders.js   | 142 +++++++++++++++
 .../js/src/graphical_slider_tool/state.js     | 165 ++++++++++++++++++
 lms/templates/graphical_slider_tool.html      |  16 +-
 10 files changed, 395 insertions(+), 68 deletions(-)
 rename common/lib/xmodule/xmodule/js/src/graphical_slider_tool/{mod3.js => general_methods.js} (65%)
 create mode 100644 common/lib/xmodule/xmodule/js/src/graphical_slider_tool/logme.js
 delete mode 100644 common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod1.js
 delete mode 100644 common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod2.js
 delete mode 100644 common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod4.js
 create mode 100644 common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
 create mode 100644 common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index f89cb0f990..3d7b8a9f02 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -26,10 +26,10 @@ class GraphicalSliderToolModule(XModule):
     js = {
       'js': [
         resource_string(__name__, 'js/src/graphical_slider_tool/gst_main.js'),
-        resource_string(__name__, 'js/src/graphical_slider_tool/mod1.js'),
-        resource_string(__name__, 'js/src/graphical_slider_tool/mod2.js'),
-        resource_string(__name__, 'js/src/graphical_slider_tool/mod3.js'),
-        resource_string(__name__, 'js/src/graphical_slider_tool/mod4.js'),
+        resource_string(__name__, 'js/src/graphical_slider_tool/state.js'),
+        resource_string(__name__, 'js/src/graphical_slider_tool/logme.js'),
+        resource_string(__name__, 'js/src/graphical_slider_tool/general_methods.js'),
+        resource_string(__name__, 'js/src/graphical_slider_tool/sliders.js'),
         resource_string(__name__, 'js/src/graphical_slider_tool/mod5.js'),
 
         resource_string(__name__, 'js/src/graphical_slider_tool/gst.js')
@@ -128,7 +128,7 @@ class GraphicalSliderToolModule(XModule):
         Simple variant: slider and plot controls are not inside any tag.
         """
         #substitute plot
-        plot_div = '<div class="${element_class}_plot" id="${element_id}_plot" \
+        plot_div = '<div class="' + self.html_class + '_plot" id="' + self.html_id + '_plot" \
         style="width: 600px; height: 600px; padding: 0px; position: relative;"> \
         This is plot</div>'
         html_string = html_string.replace('$plot$', plot_div)
@@ -139,7 +139,7 @@ class GraphicalSliderToolModule(XModule):
             sliders = [sliders]
         vars = [x['@var'] for x in sliders]
 
-        slider_div = '<div class="{element_class}_slider" id="{element_id}_{var}" \
+        slider_div = '<div class="{element_class}_slider" id="{element_id}_slider_{var}" \
         data-var="{var}">This is slider</div>'
 
         for var in vars:
@@ -155,7 +155,7 @@ class GraphicalSliderToolModule(XModule):
             inputs = [inputs]
         vars = [x['@var'] for x in inputs]
 
-        input_div = '<div class="{element_class}_input" id="{element_id}_{var}" \
+        input_div = '<div class="{element_class}_input" id="{element_id}_input_{var}" \
         data-var="{var}">This is input</div>'
 
         for var in vars:
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod3.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/general_methods.js
similarity index 65%
rename from common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod3.js
rename to common/lib/xmodule/xmodule/js/src/graphical_slider_tool/general_methods.js
index 21961f3611..9cdd4fff0f 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod3.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/general_methods.js
@@ -2,12 +2,16 @@
 // define() functions from Require JS available inside the anonymous function.
 (function (requirejs, require, define) {
 
-define('mod3', ['mod5'], function (mod5) {
-    console.log('we are in the mod3 callback');
-
-    console.log('mod5 status: [' + mod5.module_status + '].');
+define('GeneralMethods', [], function () {
+    if (!String.prototype.trim) {
+        // http://blog.stevenlevithan.com/archives/faster-trim-javascript
+        String.prototype.trim = function trim(str) {
+            return str.replace(/^\s\s*/, '').replace(/\s\s*$/, '');
+        };
+    }
 
     return {
+        'module_name': 'GeneralMethods',
         'module_status': 'OK'
     };
 });
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
index 66f98eddf7..9f2c4c356d 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
@@ -2,11 +2,19 @@
 // define() functions from Require JS available inside the anonymous function.
 (function (requirejs, require, define) {
 
-define('GstMain', ['mod1', 'mod2', 'mod3', 'mod4'], function (mod1, mod2, mod3, mod4) {
+define('GstMain', ['State', 'logme', 'GeneralMethods', 'Sliders'], function (State, logme, GeneralMethods, Sliders) {
+    logme(GeneralMethods);
+
     return GstMain;
 
     function GstMain(gstId) {
-        console.log('The DOM ID of the current GST element is ' + gstId);
+        var config, state;
+
+        config = JSON.parse($('#' + gstId + '_json').html()).root;
+
+        state = State(gstId, config);
+
+        Sliders(gstId, config, state);
     }
 });
 
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/logme.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/logme.js
new file mode 100644
index 0000000000..c045757044
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/logme.js
@@ -0,0 +1,54 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+(function (requirejs, require, define) {
+
+define('logme', [], function () {
+    var debugMode;
+
+    // debugMode can be one of the following:
+    //
+    //     true - All messages passed to logme will be written to the internal
+    //            browser console.
+    //     false - Suppress all output to the internal browser console.
+    //
+    // Obviously, if anywhere there is a direct console.log() call, we can't do
+    // anything about it. That's why use logme() - it will allow to turn off
+    // the output of debug information with a single change to a variable.
+    debugMode = true;
+
+    return logme;
+
+    /*
+     * function: logme
+     *
+     * A helper function that provides logging facilities. We don't want
+     * to call console.log() directly, because sometimes it is not supported
+     * by the browser. Also when everything is routed through this function.
+     * the logging output can be easily turned off.
+     *
+     * logme() supports multiple parameters. Each parameter will be passed to
+     * console.log() function separately.
+     *
+     */
+    function logme() {
+        var i;
+
+        if (
+            (typeof debugMode === 'undefined') ||
+            (debugMode !== true) ||
+            (typeof window.console === 'undefined')
+        ) {
+            return;
+        }
+
+        for (i = 0; i < arguments.length; i++) {
+            window.console.log(arguments[i]);
+        }
+    } // End-of: function logme
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod1.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod1.js
deleted file mode 100644
index 44674b96d3..0000000000
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod1.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
-// define() functions from Require JS available inside the anonymous function.
-(function (requirejs, require, define) {
-
-define('mod1', [], function () {
-    console.log('we are in the mod1 callback');
-    return {
-        'module_status': 'OK'
-    };
-});
-
-// End of wrapper for RequireJS. As you can see, we are passing
-// namespaced Require JS variables to an anonymous function. Within
-// it, you can use the standard requirejs(), require(), and define()
-// functions as if they were in the global namespace.
-}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod2.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod2.js
deleted file mode 100644
index 9c26bb1dfe..0000000000
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod2.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
-// define() functions from Require JS available inside the anonymous function.
-(function (requirejs, require, define) {
-
-define('mod2', [], function () {
-    console.log('we are in the mod2 callback');
-    return {
-        'module_status': 'OK'
-    };
-});
-
-// End of wrapper for RequireJS. As you can see, we are passing
-// namespaced Require JS variables to an anonymous function. Within
-// it, you can use the standard requirejs(), require(), and define()
-// functions as if they were in the global namespace.
-}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod4.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod4.js
deleted file mode 100644
index 0edf809155..0000000000
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod4.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
-// define() functions from Require JS available inside the anonymous function.
-(function (requirejs, require, define) {
-
-define('mod4', [], function () {
-    console.log('we are in the mod4 callback');
-    return {
-        'module_status': 'OK'
-    };
-});
-
-// End of wrapper for RequireJS. As you can see, we are passing
-// namespaced Require JS variables to an anonymous function. Within
-// it, you can use the standard requirejs(), require(), and define()
-// functions as if they were in the global namespace.
-}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
new file mode 100644
index 0000000000..6ef53bdbeb
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
@@ -0,0 +1,142 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+(function (requirejs, require, define) {
+
+define('Sliders', ['logme'], function (logme) {
+    return Sliders;
+
+    function Sliders(gstId, config, state) {
+        logme('We are inside Sliders function.');
+
+        logme('gstId: ' + gstId);
+        logme(config);
+        logme(state);
+
+        // We will go through all of the sliders. For each one, we will make a
+        // jQuery UI slider for it, attach "on change" events, and set it's
+        // state - initial value, max, and min parameters.
+        if ((typeof config.sliders !== 'undefined') &&
+            (typeof config.sliders.slider !== 'undefined')) {
+            if ($.isArray(config.sliders.slider)) {
+                // config.sliders.slider is an array
+
+                for (c1 = 0; c1 < config.sliders.slider.length; c1++) {
+                    createSlider(config.sliders.slider[c1]);
+                }
+            } else if ($.isPlainObject(config.sliders.slider)) {
+                // config.sliders.slider is an object
+                createSlider(config.sliders.slider);
+            }
+        }
+
+        function createSlider(obj) {
+            var constName, constValue, rangeBlobs, valueMin, valueMax,
+                sliderDiv, sliderWidth;
+
+            // The name of the constant is obj['@var']. Multiple sliders and/or
+            // inputs can represent the same constant - therefore we will get
+            // the most recent const value from the state object. The range is
+            // a string composed of 3 blobs, separated by commas. The first
+            // blob is the min value for the slider, the third blob is the max
+            // value for the slider.
+
+            if (typeof obj['@var'] === 'undefined') {
+                return;
+            }
+
+            constName = obj['@var'];
+
+            constValue = state.getConstValue(constName);
+            if (constValue === undefined) {
+                constValue = 0;
+            }
+
+            if (typeof obj['@range'] !== 'string') {
+                valueMin = constValue - 10;
+                valueMax = constValue + 10;
+            } else {
+                rangeBlobs = obj['@range'].split(',');
+
+                // We must have gotten exactly 3 blobs (pieces) from the split.
+                if (rangeBlobs.length !== 3) {
+                    valueMin = constValue - 10;
+                    valueMax = constValue + 10;
+                } else {
+                    // Get the first blob from the split string.
+                    valueMin = parseFloat(rangeBlobs[0]);
+
+                    if (isNaN(valueMin) === true) {
+                        valueMin = constValue - 10;
+                    }
+
+                    // Get the third blob from the split string.
+                    valueMax = parseFloat(rangeBlobs[2]);
+
+                    if (isNaN(valueMax) === true) {
+                        valueMax = constValue + 10;
+                    }
+
+                    // Logically, the min, value, and max should make sense.
+                    // I.e. we will make sure that:
+                    //
+                    //     min <= value <= max
+                    //
+                    // If this is not the case, we will set some defaults.
+                    if ((valueMin > valueMax) ||
+                        (valueMin > constValue) ||
+                        (valueMax < constValue)) {
+                        valueMin = constValue - 10;
+                        valueMax = constValue + 10;
+                    }
+                }
+            }
+
+            sliderDiv = $('#' + gstId + '_slider_' + constName);
+
+            // If a corresponding slider  DIV for this constant does not exist,
+            // do not do anything.
+            if (sliderDiv.length === 0) {
+                return;
+            }
+
+            // The default slider width.
+            sliderWidth = 400;
+
+            logme('width: 0');
+            logme(obj['@width']);
+            if (typeof obj['@width'] === 'string') {
+                logme('width: 1');
+                if (isNaN(parseInt(obj['@width'], 10)) === false) {
+                    logme('width: 2');
+                    sliderWidth = parseInt(obj['@width'], 10);
+                }
+            }
+
+            // Set the new width to the slider.
+            sliderDiv.width(sliderWidth);
+
+            // Create a jQuery UI slider from the current DIV. We will set
+            // starting parameters, and will also attach a handler to update
+            // the state on the change event.
+            sliderDiv.slider({
+                'min': valueMin,
+                'max': valueMax,
+                'value': constValue,
+
+                'change': sliderOnChange
+            });
+
+            return;
+
+            function sliderOnChange(event, ui) {
+                state.setConstValue(constName, ui.value);
+            }
+        }
+    }
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
new file mode 100644
index 0000000000..17c8721a73
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
@@ -0,0 +1,165 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+(function (requirejs, require, define) {
+
+define('State', ['logme'], function (logme) {
+    // Since there will be (can be) multiple GST on a page, and each will have
+    // a separate state, we will create a factory constructor function. The
+    // constructor will expect the ID of the DIV with the GST contents, and the
+    // configuration object (parsed from a JSON string). It will return and
+    // object containing methods to set and get the private state properties.
+
+    // This module defines and returns a factory constructor.
+    return State;
+
+    /*
+     * function: State
+     *
+     *
+     */
+    function State(gstId, config) {
+        var constants, c1;
+
+        constants = {};
+
+        // We must go through all of the input, and slider elements and
+        // retrieve all of the available constants. These will be added to an
+        // object as it's properties.
+        //
+        // First we will go through all of the inputs.
+        if ((typeof config.inputs !== 'undefined') &&
+            (typeof config.inputs.input !== 'undefined')) {
+            if ($.isArray(config.inputs.input)) {
+                // config.inputs.input is an array
+
+                for (c1 = 0; c1 < config.inputs.input.length; c1++) {
+                    addConstFromInput(config.inputs.input[c1]);
+                }
+            } else if ($.isPlainObject(config.inputs.input)) {
+                // config.inputs.input is an object
+                addConstFromInput(config.inputs.input);
+            }
+        }
+
+        // Now we will go through all of the sliders.
+        if ((typeof config.sliders !== 'undefined') &&
+            (typeof config.sliders.slider !== 'undefined')) {
+            if ($.isArray(config.sliders.slider)) {
+                // config.sliders.slider is an array
+
+                for (c1 = 0; c1 < config.sliders.slider.length; c1++) {
+                    addConstFromSlider(config.sliders.slider[c1]);
+                }
+            } else if ($.isPlainObject(config.sliders.slider)) {
+                // config.sliders.slider is an object
+                addConstFromSlider(config.sliders.slider);
+            }
+        }
+
+        logme(constants);
+
+        // The constructor will return an object with methods to operate on
+        // it's private properties.
+        return {
+            'getConstValue': getConstValue,
+            'setConstValue': setConstValue
+        };
+
+        function getConstValue(constName) {
+            if (constants.hasOwnProperty(constName) === false) {
+                // If the name of the constant is not tracked by state, return an
+                // 'undefined' value.
+                return;
+            }
+
+            return constants[constName];
+        }
+
+        function setConstValue(constName, constValue) {
+            if (constants.hasOwnProperty(constName) === false) {
+                // If the name of the constant is not tracked by state, return an
+                // 'undefined' value.
+                return;
+            }
+
+            if (isNaN(parseFloat(constValue)) === true) {
+                // We are interested only in valid float values.
+                return;
+            }
+
+            constants[constName] = parseFloat(constValue);
+
+            logme('From setConstValue: new value for "' + constName + '" is ' + constValue);
+        }
+
+        function addConstFromInput(obj) {
+            var constName, constValue;
+
+            // The name of the constant is obj['@var']. The value (initial) of
+            // the constant is obj['@initial']. I have taken the word 'initial'
+            // into brackets, because multiple inputs and/or sliders can
+            // represent the state of a single constant.
+
+            if (typeof obj['@var'] === 'undefined') {
+                return;
+            }
+
+            constName = obj['@var'];
+
+            if (typeof obj['@initial'] === 'undefined') {
+                constValue = 0;
+            } else {
+                constValue = parseFloat(obj['@initial']);
+
+                if (isNaN(constValue) === true) {
+                    constValue = 0;
+                }
+            }
+
+            constants[constName] = constValue;
+        }
+
+        function addConstFromSlider(obj) {
+            var constName, constValue, rangeBlobs;
+
+            // The name of the constant is obj['@var']. The value (initial) of
+            // the constant is the second blob of the 'range' parameter of the
+            // slider which is obj['@range']. Multiple sliders and/or inputs
+            // can represent the same constant - therefore 'initial' is in
+            // brackets. The range is a string composed of 3 blobs, separated
+            // by commas.
+
+            if (typeof obj['@var'] === 'undefined') {
+                return;
+            }
+
+            constName = obj['@var'];
+
+            if (typeof obj['@range'] !== 'string') {
+                constValue = 0;
+            } else {
+                rangeBlobs = obj['@range'].split(',');
+
+                // We must have gotten exactly 3 blobs (pieces) from the split.
+                if (rangeBlobs.length !== 3) {
+                    constValue = 0;
+                } else {
+                    // Get the second blob from the split string.
+                    constValue = parseFloat(rangeBlobs[1]);
+
+                    if (isNaN(constValue) === true) {
+                        constValue = 0;
+                    }
+                }
+            }
+
+            constants[constName] = constValue;
+        }
+    } // End-of: function State
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/lms/templates/graphical_slider_tool.html b/lms/templates/graphical_slider_tool.html
index d6cffc67e2..17d2bae5e9 100644
--- a/lms/templates/graphical_slider_tool.html
+++ b/lms/templates/graphical_slider_tool.html
@@ -1,12 +1,14 @@
 <div align="center" id="${element_id}" class="${element_class}">
-    <!-- xidden field to read configuration json from -->
-    <div class="${element_class}" id="${element_id}_json" style="hidden"
-    data-json="${configuration_json}"></div>
+    <!-- hidden field to read configuration json from -->
+    <div class="${element_class}" id="${element_id}_json" style="display: none;">
+        ${configuration_json}
+    </div>
 
-    <!-- xidden field to read configuration json from -->
-    <div class="${element_class}" id="${element_id}_plot_code" style="hidden"
-    data-plot="${plot_code}"></div>
+    <!-- hidden field to read configuration json from -->
+    <div class="${element_class}" id="${element_id}_plot_code" style="display: none;">
+        ${plot_code}
+    </div>
 
-    <!-- main xml with marked places for sliders, number and plots -->
+    <!-- main xml with marked places for sliders, numbers, and plot -->
     ${gst_html}
 </div>

From ce7a01dd26b0f407487b4c78a27bad559b9699ae Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Mon, 10 Dec 2012 09:08:36 +0200
Subject: [PATCH 243/541] GST work in progress.

---
 common/lib/xmodule/xmodule/gst_module.py      |  2 +-
 .../js/src/graphical_slider_tool/graph.js     | 62 +++++++++++++++++++
 .../js/src/graphical_slider_tool/gst_main.js  |  7 ++-
 .../js/src/graphical_slider_tool/mod5.js      | 16 -----
 .../js/src/graphical_slider_tool/state.js     |  8 +++
 5 files changed, 77 insertions(+), 18 deletions(-)
 create mode 100644 common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
 delete mode 100644 common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod5.js

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index 3d7b8a9f02..633f5e9406 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -30,7 +30,7 @@ class GraphicalSliderToolModule(XModule):
         resource_string(__name__, 'js/src/graphical_slider_tool/logme.js'),
         resource_string(__name__, 'js/src/graphical_slider_tool/general_methods.js'),
         resource_string(__name__, 'js/src/graphical_slider_tool/sliders.js'),
-        resource_string(__name__, 'js/src/graphical_slider_tool/mod5.js'),
+        resource_string(__name__, 'js/src/graphical_slider_tool/graph.js'),
 
         resource_string(__name__, 'js/src/graphical_slider_tool/gst.js')
       ]
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
new file mode 100644
index 0000000000..2aa19cfc02
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -0,0 +1,62 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+(function (requirejs, require, define) {
+
+define('Graph', ['logme'], function (logme) {
+
+    return Graph;
+
+    function Graph(gstId, state) {
+        var plotDiv, data;
+        logme('We are inside Graph module.', gstId, state);
+
+        plotDiv = $('#' + gstId + '_plot');
+
+        if (plotDiv.length === 0) {
+            return;
+        }
+
+        plotDiv.width(300);
+        plotDiv.height(300);
+
+        plotDiv.bind('update_plot', function (event, forGstId) {
+            if (forGstId !== gstId) {
+                logme('update_plot event not for current ID');
+            }
+
+            logme('redrawing plot');
+
+            generateData();
+            updatePlot();
+        });
+
+        generateData();
+        updatePlot();
+
+        return;
+
+        function generateData() {
+            var a, b, c1;
+
+            a = state.getConstValue('a');
+            b = state.getConstValue('b');
+
+            data = [];
+            data.push([]);
+
+            for (c1 = 0; c1 < 30; c1++) {
+                data[0].push([c1, a * c1 * (c1 + a)* (c1 - b) + b * c1 * (c1 + b * a)]);
+            }
+        }
+
+        function updatePlot() {
+            $.plot(plotDiv, data, {xaxis: {min: 0, max: 30}});
+        }
+    }
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
index 9f2c4c356d..68ef73e441 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
@@ -2,7 +2,10 @@
 // define() functions from Require JS available inside the anonymous function.
 (function (requirejs, require, define) {
 
-define('GstMain', ['State', 'logme', 'GeneralMethods', 'Sliders'], function (State, logme, GeneralMethods, Sliders) {
+define(
+    'GstMain',
+    ['State', 'logme', 'GeneralMethods', 'Sliders', 'Graph'],
+    function (State, logme, GeneralMethods, Sliders, Graph) {
     logme(GeneralMethods);
 
     return GstMain;
@@ -15,6 +18,8 @@ define('GstMain', ['State', 'logme', 'GeneralMethods', 'Sliders'], function (Sta
         state = State(gstId, config);
 
         Sliders(gstId, config, state);
+
+        Graph(gstId, state);
     }
 });
 
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod5.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod5.js
deleted file mode 100644
index 5e843ac468..0000000000
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/mod5.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
-// define() functions from Require JS available inside the anonymous function.
-(function (requirejs, require, define) {
-
-define('mod5', [], function () {
-    console.log('we are in the mod5 callback');
-    return {
-        'module_status': 'OK'
-    };
-});
-
-// End of wrapper for RequireJS. As you can see, we are passing
-// namespaced Require JS variables to an anonymous function. Within
-// it, you can use the standard requirejs(), require(), and define()
-// functions as if they were in the global namespace.
-}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
index 17c8721a73..ffd618c51b 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
@@ -76,6 +76,8 @@ define('State', ['logme'], function (logme) {
         }
 
         function setConstValue(constName, constValue) {
+            var plotDiv;
+
             if (constants.hasOwnProperty(constName) === false) {
                 // If the name of the constant is not tracked by state, return an
                 // 'undefined' value.
@@ -90,6 +92,12 @@ define('State', ['logme'], function (logme) {
             constants[constName] = parseFloat(constValue);
 
             logme('From setConstValue: new value for "' + constName + '" is ' + constValue);
+
+            plotDiv = $('#' + gstId + '_plot');
+
+            if (plotDiv.length === 1) {
+                plotDiv.trigger('update_plot', [gstId]);
+            }
         }
 
         function addConstFromInput(obj) {

From 7de575a84bf5f1915b5a58c0e0646e8c7f6e99e7 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Mon, 10 Dec 2012 09:26:29 +0200
Subject: [PATCH 244/541] GST work in progress.

---
 .../js/src/graphical_slider_tool/graph.js     | 18 ++++++++----------
 .../js/src/graphical_slider_tool/state.js     | 19 +++++++++++--------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 2aa19cfc02..fbd1f96da1 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -19,22 +19,20 @@ define('Graph', ['logme'], function (logme) {
         plotDiv.width(300);
         plotDiv.height(300);
 
-        plotDiv.bind('update_plot', function (event, forGstId) {
-            if (forGstId !== gstId) {
-                logme('update_plot event not for current ID');
-            }
-
-            logme('redrawing plot');
-
-            generateData();
-            updatePlot();
-        });
+        state.bindUpdatePlotEvent(plotDiv, onUpdatePlot);
 
         generateData();
         updatePlot();
 
         return;
 
+        function onUpdatePlot(event) {
+            logme('redrawing plot');
+
+            generateData();
+            updatePlot();
+        }
+
         function generateData() {
             var a, b, c1;
 
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
index ffd618c51b..735c100344 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
@@ -18,7 +18,7 @@ define('State', ['logme'], function (logme) {
      *
      */
     function State(gstId, config) {
-        var constants, c1;
+        var constants, c1, plotDiv;
 
         constants = {};
 
@@ -62,9 +62,16 @@ define('State', ['logme'], function (logme) {
         // it's private properties.
         return {
             'getConstValue': getConstValue,
-            'setConstValue': setConstValue
+            'setConstValue': setConstValue,
+            'bindUpdatePlotEvent': bindUpdatePlotEvent
         };
 
+        function bindUpdatePlotEvent(newPlotDiv, callback) {
+            plotDiv = newPlotDiv;
+
+            plotDiv.bind('update_plot', callback);
+        }
+
         function getConstValue(constName) {
             if (constants.hasOwnProperty(constName) === false) {
                 // If the name of the constant is not tracked by state, return an
@@ -76,8 +83,6 @@ define('State', ['logme'], function (logme) {
         }
 
         function setConstValue(constName, constValue) {
-            var plotDiv;
-
             if (constants.hasOwnProperty(constName) === false) {
                 // If the name of the constant is not tracked by state, return an
                 // 'undefined' value.
@@ -93,10 +98,8 @@ define('State', ['logme'], function (logme) {
 
             logme('From setConstValue: new value for "' + constName + '" is ' + constValue);
 
-            plotDiv = $('#' + gstId + '_plot');
-
-            if (plotDiv.length === 1) {
-                plotDiv.trigger('update_plot', [gstId]);
+            if (plotDiv !== undefined) {
+                plotDiv.trigger('update_plot');
             }
         }
 

From 32c70a524c3a3dca1cb1939b6417f9677ee8809b Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Mon, 10 Dec 2012 11:37:55 +0200
Subject: [PATCH 245/541] GST work in progress.

---
 .../js/src/graphical_slider_tool/graph.js     | 95 ++++++++++++++++---
 .../js/src/graphical_slider_tool/gst_main.js  |  7 +-
 .../js/src/graphical_slider_tool/sliders.js   | 12 +--
 .../js/src/graphical_slider_tool/state.js     | 34 +++++--
 4 files changed, 113 insertions(+), 35 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index fbd1f96da1..762789cbf5 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -2,13 +2,12 @@
 // define() functions from Require JS available inside the anonymous function.
 (function (requirejs, require, define) {
 
-define('Graph', ['logme'], function (logme) {
+define('Graph', [], function () {
 
     return Graph;
 
-    function Graph(gstId, state) {
-        var plotDiv, data;
-        logme('We are inside Graph module.', gstId, state);
+    function Graph(gstId, config, state) {
+        var plotDiv, dataSets, functions;
 
         plotDiv = $('#' + gstId + '_plot');
 
@@ -21,34 +20,102 @@ define('Graph', ['logme'], function (logme) {
 
         state.bindUpdatePlotEvent(plotDiv, onUpdatePlot);
 
+        createFunctions();
+
         generateData();
         updatePlot();
 
         return;
 
-        function onUpdatePlot(event) {
-            logme('redrawing plot');
+        function createFunctions() {
+            functions = [];
 
+            if (typeof config.plot['function'] === 'undefined') {
+                return;
+            }
+
+            if (typeof config.plot['function'] === 'string') {
+                addFunction(config.plot['function']);
+            } else if ($.isPlainObject(config.plot['function']) === true) {
+
+            } else if ($.isArray(config.plot['function'])) {
+
+            }
+
+            return;
+
+            function addFunction(funcString, color, line, dot, label, style, point_size) {
+                var newFunctionObject, func, constNames;
+
+                if (typeof funcString !== 'string') {
+                    return;
+                }
+
+                newFunctionObject = {};
+
+                constNames = state.getAllConstantNames();
+
+                // The 'x' is always one of the function parameters.
+                constNames.push('x');
+
+                // Must make sure that the function body also gets passed to
+                // the Function cosntructor.
+                constNames.push(funcString);
+
+                func = Function.apply(null, constNames);
+                newFunctionObject['func'] = func;
+
+                if (typeof color === 'string') {
+                    newFunctionObject['color'] = color;
+                }
+
+                if (typeof line === 'boolean') {
+                    newFunctionObject['line'] = line;
+                }
+
+                if (typeof dot === 'boolean') {
+                    newFunctionObject['dot'] = dot;
+                }
+
+                if (typeof label === 'string') {
+                    newFunctionObject['label'] = label;
+                }
+
+                functions.push(newFunctionObject);
+            }
+        }
+
+        function onUpdatePlot(event) {
             generateData();
             updatePlot();
         }
 
         function generateData() {
-            var a, b, c1;
+            var c0, c1, datapoints, constValues, x, y;
 
-            a = state.getConstValue('a');
-            b = state.getConstValue('b');
+            constValues = state.getAllConstantValues();
 
-            data = [];
-            data.push([]);
+            dataSets = [];
 
-            for (c1 = 0; c1 < 30; c1++) {
-                data[0].push([c1, a * c1 * (c1 + a)* (c1 - b) + b * c1 * (c1 + b * a)]);
+            for (c0 = 0; c0 < functions.length; c0 += 1) {
+                datapoints = [];
+
+                for (c1 = 0; c1 < 30; c1 += 0.1) {
+                    x = c1;
+                    // Push the 'x' variable to the end of the parameter array.
+                    constValues.push(x);
+                    y = functions[c0].func.apply(window, constValues);
+                    constValues.pop();
+
+                    datapoints.push([x, y]);
+                }
+
+                dataSets.push(datapoints);
             }
         }
 
         function updatePlot() {
-            $.plot(plotDiv, data, {xaxis: {min: 0, max: 30}});
+            $.plot(plotDiv, dataSets);
         }
     }
 });
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
index 68ef73e441..71de12b423 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
@@ -4,9 +4,8 @@
 
 define(
     'GstMain',
-    ['State', 'logme', 'GeneralMethods', 'Sliders', 'Graph'],
-    function (State, logme, GeneralMethods, Sliders, Graph) {
-    logme(GeneralMethods);
+    ['State', 'GeneralMethods', 'Sliders', 'Graph'],
+    function (State, GeneralMethods, Sliders, Graph) {
 
     return GstMain;
 
@@ -19,7 +18,7 @@ define(
 
         Sliders(gstId, config, state);
 
-        Graph(gstId, state);
+        Graph(gstId, config, state);
     }
 });
 
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
index 6ef53bdbeb..e871e9f035 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
@@ -2,16 +2,10 @@
 // define() functions from Require JS available inside the anonymous function.
 (function (requirejs, require, define) {
 
-define('Sliders', ['logme'], function (logme) {
+define('Sliders', [], function () {
     return Sliders;
 
     function Sliders(gstId, config, state) {
-        logme('We are inside Sliders function.');
-
-        logme('gstId: ' + gstId);
-        logme(config);
-        logme(state);
-
         // We will go through all of the sliders. For each one, we will make a
         // jQuery UI slider for it, attach "on change" events, and set it's
         // state - initial value, max, and min parameters.
@@ -102,12 +96,8 @@ define('Sliders', ['logme'], function (logme) {
             // The default slider width.
             sliderWidth = 400;
 
-            logme('width: 0');
-            logme(obj['@width']);
             if (typeof obj['@width'] === 'string') {
-                logme('width: 1');
                 if (isNaN(parseInt(obj['@width'], 10)) === false) {
-                    logme('width: 2');
                     sliderWidth = parseInt(obj['@width'], 10);
                 }
             }
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
index 735c100344..d632429c9b 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
@@ -2,7 +2,7 @@
 // define() functions from Require JS available inside the anonymous function.
 (function (requirejs, require, define) {
 
-define('State', ['logme'], function (logme) {
+define('State', [], function () {
     // Since there will be (can be) multiple GST on a page, and each will have
     // a separate state, we will create a factory constructor function. The
     // constructor will expect the ID of the DIV with the GST contents, and the
@@ -56,16 +56,40 @@ define('State', ['logme'], function (logme) {
             }
         }
 
-        logme(constants);
-
         // The constructor will return an object with methods to operate on
         // it's private properties.
         return {
             'getConstValue': getConstValue,
             'setConstValue': setConstValue,
-            'bindUpdatePlotEvent': bindUpdatePlotEvent
+            'bindUpdatePlotEvent': bindUpdatePlotEvent,
+            'getAllConstantNames': getAllConstantNames,
+            'getAllConstantValues': getAllConstantValues
         };
 
+        function getAllConstantNames() {
+            var constName, allConstNames;
+
+            allConstNames = [];
+
+            for (constName in constants) {
+                allConstNames.push(constName);
+            }
+
+            return allConstNames;
+        }
+
+        function getAllConstantValues() {
+            var constName, allConstValues;
+
+            allConstValues = [];
+
+            for (constName in constants) {
+                allConstValues.push(constants[constName]);
+            }
+
+            return allConstValues;
+        }
+
         function bindUpdatePlotEvent(newPlotDiv, callback) {
             plotDiv = newPlotDiv;
 
@@ -96,8 +120,6 @@ define('State', ['logme'], function (logme) {
 
             constants[constName] = parseFloat(constValue);
 
-            logme('From setConstValue: new value for "' + constName + '" is ' + constValue);
-
             if (plotDiv !== undefined) {
                 plotDiv.trigger('update_plot');
             }

From ae03090f3c980ce5b7c7ee5862f31acc86b08773 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Mon, 10 Dec 2012 12:43:01 +0200
Subject: [PATCH 246/541] GST work in progress.

---
 common/lib/xmodule/xmodule/gst_module.py                  | 5 ++---
 .../xmodule/xmodule/js/src/graphical_slider_tool/graph.js | 8 +++++++-
 .../xmodule/js/src/graphical_slider_tool/sliders.js       | 1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index 633f5e9406..c07c0670d7 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -129,8 +129,7 @@ class GraphicalSliderToolModule(XModule):
         """
         #substitute plot
         plot_div = '<div class="' + self.html_class + '_plot" id="' + self.html_id + '_plot" \
-        style="width: 600px; height: 600px; padding: 0px; position: relative;"> \
-        This is plot</div>'
+        style="width: 600px; height: 600px; padding: 0px; position: relative;">This is plot</div>'
         html_string = html_string.replace('$plot$', plot_div)
 
         # substitute sliders
@@ -140,7 +139,7 @@ class GraphicalSliderToolModule(XModule):
         vars = [x['@var'] for x in sliders]
 
         slider_div = '<div class="{element_class}_slider" id="{element_id}_slider_{var}" \
-        data-var="{var}">This is slider</div>'
+        data-var="{var}"></div>'
 
         for var in vars:
             html_string = re.sub(r'\$slider\s+' + var + r'\$',
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 762789cbf5..991cb0a26e 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -28,6 +28,8 @@ define('Graph', [], function () {
         return;
 
         function createFunctions() {
+            var c1;
+
             functions = [];
 
             if (typeof config.plot['function'] === 'undefined') {
@@ -39,7 +41,11 @@ define('Graph', [], function () {
             } else if ($.isPlainObject(config.plot['function']) === true) {
 
             } else if ($.isArray(config.plot['function'])) {
-
+                for (c1 = 0; c1 < config.plot['function'].length; c1++) {
+                    if (typeof config.plot['function'][c1] === 'string') {
+                        addFunction(config.plot['function'][c1]);
+                    }
+                }
             }
 
             return;
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
index e871e9f035..226f53d696 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
@@ -112,6 +112,7 @@ define('Sliders', [], function () {
                 'min': valueMin,
                 'max': valueMax,
                 'value': constValue,
+                'step': 0.01,
 
                 'change': sliderOnChange
             });

From 3e9d325a9f166901a2e24bc2dfe3942173f892c8 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Mon, 10 Dec 2012 14:07:06 +0200
Subject: [PATCH 247/541] GST work in progress.

---
 common/lib/xmodule/xmodule/gst_module.py      |  5 +-
 .../js/src/graphical_slider_tool/gst_main.js  |  5 +-
 .../js/src/graphical_slider_tool/inputs.js    | 70 +++++++++++++++++++
 .../js/src/graphical_slider_tool/sliders.js   |  1 +
 .../js/src/graphical_slider_tool/state.js     |  7 ++
 5 files changed, 84 insertions(+), 4 deletions(-)
 create mode 100644 common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index c07c0670d7..9e9273bc25 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -30,6 +30,7 @@ class GraphicalSliderToolModule(XModule):
         resource_string(__name__, 'js/src/graphical_slider_tool/logme.js'),
         resource_string(__name__, 'js/src/graphical_slider_tool/general_methods.js'),
         resource_string(__name__, 'js/src/graphical_slider_tool/sliders.js'),
+        resource_string(__name__, 'js/src/graphical_slider_tool/inputs.js'),
         resource_string(__name__, 'js/src/graphical_slider_tool/graph.js'),
 
         resource_string(__name__, 'js/src/graphical_slider_tool/gst.js')
@@ -154,8 +155,8 @@ class GraphicalSliderToolModule(XModule):
             inputs = [inputs]
         vars = [x['@var'] for x in inputs]
 
-        input_div = '<div class="{element_class}_input" id="{element_id}_input_{var}" \
-        data-var="{var}">This is input</div>'
+        input_div = '<span class="{element_class}_input" id="{element_id}_input_{var}" \
+        data-var="{var}"></span>'
 
         for var in vars:
             html_string = re.sub(r'\$input\s+' + var + r'\$',
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
index 71de12b423..47881b66c6 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
@@ -4,8 +4,8 @@
 
 define(
     'GstMain',
-    ['State', 'GeneralMethods', 'Sliders', 'Graph'],
-    function (State, GeneralMethods, Sliders, Graph) {
+    ['State', 'GeneralMethods', 'Sliders', 'Inputs', 'Graph'],
+    function (State, GeneralMethods, Sliders, Inputs, Graph) {
 
     return GstMain;
 
@@ -17,6 +17,7 @@ define(
         state = State(gstId, config);
 
         Sliders(gstId, config, state);
+        Inputs(gstId, config, state);
 
         Graph(gstId, config, state);
     }
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
new file mode 100644
index 0000000000..5b9f1f87c2
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
@@ -0,0 +1,70 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+(function (requirejs, require, define) {
+
+define('Inputs', ['logme'], function (logme) {
+    return Inputs;
+
+    function Inputs(gstId, config, state) {
+        logme('Inside "Inputs" module.');
+        logme(gstId, config, state);
+
+        // We will go thorugh all of the inputs, and those that have a valid
+        // '@var' property will be added to the page as a HTML text input
+        // element.
+        if ((typeof config.inputs !== 'undefined') &&
+            (typeof config.inputs.input !== 'undefined')) {
+            if ($.isArray(config.inputs.input)) {
+                // config.inputs.input is an array
+
+                for (c1 = 0; c1 < config.inputs.input.length; c1++) {
+                    createInput(config.inputs.input[c1]);
+                }
+            } else if ($.isPlainObject(config.inputs.input)) {
+                // config.inputs.input is an object
+                createInput(config.inputs.input);
+            }
+        }
+
+        function createInput(obj) {
+            var constName, constValue, inputDiv, textInputDiv;
+
+            if (typeof obj['@var'] === 'undefined') {
+                return;
+            }
+
+            constName = obj['@var'];
+
+            constValue = state.getConstValue(constName);
+            if (constValue === undefined) {
+                constValue = 0;
+            }
+
+            inputDiv = $('#' + gstId + '_input_' + constName);
+
+            if (inputDiv.length === 0) {
+                return;
+            }
+
+            textInputDiv = $('<input type"text" />');
+            textInputDiv.width(50);
+
+            textInputDiv.appendTo(inputDiv);
+            textInputDiv.val(constValue);
+
+            textInputDiv.bind('change', inputOnChange);
+
+            return;
+
+            function inputOnChange(event) {
+                state.setConstValue(constName, $(this).val());
+            }
+        }
+    }
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
index 226f53d696..51bd2c8b12 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
@@ -104,6 +104,7 @@ define('Sliders', [], function () {
 
             // Set the new width to the slider.
             sliderDiv.width(sliderWidth);
+            sliderDiv.css('display', 'inline-block');
 
             // Create a jQuery UI slider from the current DIV. We will set
             // starting parameters, and will also attach a handler to update
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
index d632429c9b..88951f0e9d 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
@@ -107,6 +107,8 @@ define('State', [], function () {
         }
 
         function setConstValue(constName, constValue) {
+            var inputDiv;
+
             if (constants.hasOwnProperty(constName) === false) {
                 // If the name of the constant is not tracked by state, return an
                 // 'undefined' value.
@@ -123,6 +125,11 @@ define('State', [], function () {
             if (plotDiv !== undefined) {
                 plotDiv.trigger('update_plot');
             }
+
+            inputDiv = $('#' + gstId + '_input_' + constName).children('input');
+            if (inputDiv.length !== 0) {
+                inputDiv.val(constValue);
+            }
         }
 
         function addConstFromInput(obj) {

From b08b25b98388e4f42f501c930f8d7a4490fca960 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Mon, 10 Dec 2012 16:11:29 +0200
Subject: [PATCH 248/541] GST work in progress.

---
 common/lib/xmodule/xmodule/gst_module.py      |  4 +--
 .../js/src/graphical_slider_tool/inputs.js    | 27 ++++++++++++-------
 .../js/src/graphical_slider_tool/sliders.js   | 20 ++++++++------
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index 9e9273bc25..61a883fbf8 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -139,8 +139,8 @@ class GraphicalSliderToolModule(XModule):
             sliders = [sliders]
         vars = [x['@var'] for x in sliders]
 
-        slider_div = '<div class="{element_class}_slider" id="{element_id}_slider_{var}" \
-        data-var="{var}"></div>'
+        slider_div = '<span class="{element_class}_slider" id="{element_id}_slider_{var}" \
+        data-var="{var}"></span>'
 
         for var in vars:
             html_string = re.sub(r'\$slider\s+' + var + r'\$',
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
index 5b9f1f87c2..d7f64328e0 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
@@ -27,9 +27,9 @@ define('Inputs', ['logme'], function (logme) {
         }
 
         function createInput(obj) {
-            var constName, constValue, inputDiv, textInputDiv;
+            var constName, constValue, spanEl, inputEl;
 
-            if (typeof obj['@var'] === 'undefined') {
+            if (typeof obj['@var'] !== 'string') {
                 return;
             }
 
@@ -40,19 +40,28 @@ define('Inputs', ['logme'], function (logme) {
                 constValue = 0;
             }
 
-            inputDiv = $('#' + gstId + '_input_' + constName);
+            spanEl = $('#' + gstId + '_input_' + constName);
 
-            if (inputDiv.length === 0) {
+            if (spanEl.length === 0) {
                 return;
             }
 
-            textInputDiv = $('<input type"text" />');
-            textInputDiv.width(50);
+            inputEl = $('<input type"text" />');
 
-            textInputDiv.appendTo(inputDiv);
-            textInputDiv.val(constValue);
+            // inputEl.width(50);
+            inputEl.val(constValue);
+            inputEl.bind('change', inputOnChange);
+            inputEl.button().css({
+                'font': 'inherit',
+                'color': 'inherit',
+                'text-align': 'left',
+                'outline': 'none',
+                'cursor': 'text',
+                'height': '15px',
+                'width': '50px'
+            });
 
-            textInputDiv.bind('change', inputOnChange);
+            inputEl.appendTo(spanEl);
 
             return;
 
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
index 51bd2c8b12..3db0c3e67c 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
@@ -25,7 +25,7 @@ define('Sliders', [], function () {
 
         function createSlider(obj) {
             var constName, constValue, rangeBlobs, valueMin, valueMax,
-                sliderDiv, sliderWidth;
+                spanEl, sliderEl, sliderWidth;
 
             // The name of the constant is obj['@var']. Multiple sliders and/or
             // inputs can represent the same constant - therefore we will get
@@ -34,7 +34,7 @@ define('Sliders', [], function () {
             // blob is the min value for the slider, the third blob is the max
             // value for the slider.
 
-            if (typeof obj['@var'] === 'undefined') {
+            if (typeof obj['@var'] !== 'string') {
                 return;
             }
 
@@ -85,14 +85,16 @@ define('Sliders', [], function () {
                 }
             }
 
-            sliderDiv = $('#' + gstId + '_slider_' + constName);
+            spanEl = $('#' + gstId + '_slider_' + constName);
 
             // If a corresponding slider  DIV for this constant does not exist,
             // do not do anything.
-            if (sliderDiv.length === 0) {
+            if (spanEl.length === 0) {
                 return;
             }
 
+            sliderEl = $('<div>');
+
             // The default slider width.
             sliderWidth = 400;
 
@@ -103,21 +105,23 @@ define('Sliders', [], function () {
             }
 
             // Set the new width to the slider.
-            sliderDiv.width(sliderWidth);
-            sliderDiv.css('display', 'inline-block');
+            sliderEl.width(sliderWidth);
+            sliderEl.css('display', 'inline-block');
 
             // Create a jQuery UI slider from the current DIV. We will set
             // starting parameters, and will also attach a handler to update
             // the state on the change event.
-            sliderDiv.slider({
+            sliderEl.slider({
                 'min': valueMin,
                 'max': valueMax,
                 'value': constValue,
-                'step': 0.01,
+                'step': (valueMax - valueMin) / 50.0,
 
                 'change': sliderOnChange
             });
 
+            sliderEl.appendTo(spanEl);
+
             return;
 
             function sliderOnChange(event, ui) {

From 3682cb46c4522bee93c6acafa7e38c02cc052403 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Mon, 10 Dec 2012 18:37:20 +0200
Subject: [PATCH 249/541] GST work in progress.

---
 .../js/src/graphical_slider_tool/graph.js     |  15 +-
 .../js/src/graphical_slider_tool/inputs.js    |  72 +++++++--
 .../js/src/graphical_slider_tool/sliders.js   | 137 ++++++++++++++----
 3 files changed, 186 insertions(+), 38 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 991cb0a26e..61228413f5 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -121,7 +121,20 @@ define('Graph', [], function () {
         }
 
         function updatePlot() {
-            $.plot(plotDiv, dataSets);
+            $.plot(
+                plotDiv,
+                dataSets,
+                {
+                    'xaxis': {
+                        'min': 0,
+                        'max': 30
+                    },
+                    'yaxis': {
+                        'min': -5,
+                        'max': 5
+                    }
+                }
+            );
         }
     }
 });
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
index d7f64328e0..3e7e55f02c 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
@@ -2,12 +2,24 @@
 // define() functions from Require JS available inside the anonymous function.
 (function (requirejs, require, define) {
 
-define('Inputs', ['logme'], function (logme) {
+define('Inputs', [], function () {
     return Inputs;
 
     function Inputs(gstId, config, state) {
-        logme('Inside "Inputs" module.');
-        logme(gstId, config, state);
+        var constNamesUsed;
+
+        // There should not be more than one text input per a constant. This
+        // just does not make sense. However, nothing really prevents the user
+        // from specifying more than one text input for the same constant name.
+        // That's why we have to track which constant names already have
+        // text inputs for them, and prevent adding further text inputs to
+        // these constants.
+        //
+        // constNamesUsed is an object to which we will add properties having
+        // the name of the constant to which we are adding a text input to.
+        // When creating a new text input, we must consult with this object, to
+        // see if the constant name is not defined as it's property.
+        constNamesUsed = {};
 
         // We will go thorugh all of the inputs, and those that have a valid
         // '@var' property will be added to the page as a HTML text input
@@ -15,42 +27,75 @@ define('Inputs', ['logme'], function (logme) {
         if ((typeof config.inputs !== 'undefined') &&
             (typeof config.inputs.input !== 'undefined')) {
             if ($.isArray(config.inputs.input)) {
-                // config.inputs.input is an array
 
+                // config.inputs.input is an array. For each element, we will
+                // add a text input.
                 for (c1 = 0; c1 < config.inputs.input.length; c1++) {
                     createInput(config.inputs.input[c1]);
                 }
             } else if ($.isPlainObject(config.inputs.input)) {
-                // config.inputs.input is an object
+
+                // config.inputs.input is an object. Add a text input for it.
                 createInput(config.inputs.input);
+
             }
         }
 
         function createInput(obj) {
             var constName, constValue, spanEl, inputEl;
 
+            // The name of the constant is obj['@var']. If it is not specified,
+            // we will skip creating a text input for this constant.
             if (typeof obj['@var'] !== 'string') {
                 return;
             }
-
             constName = obj['@var'];
 
-            constValue = state.getConstValue(constName);
-            if (constValue === undefined) {
-                constValue = 0;
+            // We will not add a text input for a constant which already has a
+            // text input defined for it.
+            //
+            // We will add the constant name to the 'constNamesUsed' object in
+            // the end, when everything went successfully.
+            if (constNamesUsed.hasOwnProperty(constName)) {
+                return;
             }
 
+            // Multiple sliders and/or inputs can represent the same constant.
+            // Therefore we will get the most recent const value from the state
+            // object. If it is undefined, we will skip creating a text input
+            // for this constant.
+            constValue = state.getConstValue(constName);
+            if (constValue === undefined) {
+                return;
+            }
+
+            // With the constant name, and the constant value being defined,
+            // lets get the element on the page into which the text input will
+            // be inserted.
             spanEl = $('#' + gstId + '_input_' + constName);
 
+            // If a corresponding element for this constant does not exist on
+            // the page, we will not be making a text input.
             if (spanEl.length === 0) {
                 return;
             }
 
+            // Create the text input element.
             inputEl = $('<input type"text" />');
 
-            // inputEl.width(50);
+            // Set the current constant to the text input. It will be visible
+            // to the user.
             inputEl.val(constValue);
+
+            // Bind a function to the 'change' event. Whenever the user changes
+            // the value of this text input, and presses 'enter' (or clicks
+            // somewhere else on the page), this event will be triggered, and
+            // our callback will be called.
             inputEl.bind('change', inputOnChange);
+
+            // Lets style the input element nicely. We will use the button()
+            // widget for this since there is no native widget for the text
+            // input.
             inputEl.button().css({
                 'font': 'inherit',
                 'color': 'inherit',
@@ -61,10 +106,17 @@ define('Inputs', ['logme'], function (logme) {
                 'width': '50px'
             });
 
+            // And finally, publish the text input element to the page.
             inputEl.appendTo(spanEl);
 
+            // Don't forget to add the constant to the list of used constants.
+            // Next time a slider for this constant will not be created.
+            constNamesUsed[constName] = true;
+
             return;
 
+            // When the user changes the value of this text input, the 'state'
+            // will be updated, forcing the plot to be redrawn.
             function inputOnChange(event) {
                 state.setConstValue(constName, $(this).val());
             }
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
index 3db0c3e67c..33bdd89dd1 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
@@ -6,68 +6,117 @@ define('Sliders', [], function () {
     return Sliders;
 
     function Sliders(gstId, config, state) {
+        var constNamesUsed;
+
+        // There should not be more than one slider per a constant. This just
+        // does not make sense. However, nothing really prevents the user from
+        // specifying more than one slider for the same constant name. That's
+        // why we have to track which constant names already have sliders for
+        // them, and prevent adding further sliders to these constants.
+        //
+        // constNamesUsed is an object to which we will add properties having
+        // the name of the constant to which we are adding a slider to. When
+        // creating a new slider, we must consult with this object, to see if
+        // the constant name is not defined as it's property.
+        constNamesUsed = {};
+
         // We will go through all of the sliders. For each one, we will make a
         // jQuery UI slider for it, attach "on change" events, and set it's
         // state - initial value, max, and min parameters.
         if ((typeof config.sliders !== 'undefined') &&
             (typeof config.sliders.slider !== 'undefined')) {
             if ($.isArray(config.sliders.slider)) {
-                // config.sliders.slider is an array
 
+                // config.sliders.slider is an array. For each object in the
+                // array, create a slider.
                 for (c1 = 0; c1 < config.sliders.slider.length; c1++) {
                     createSlider(config.sliders.slider[c1]);
                 }
+
             } else if ($.isPlainObject(config.sliders.slider)) {
-                // config.sliders.slider is an object
+
+                // config.sliders.slider is an object. Create a slider for it.
                 createSlider(config.sliders.slider);
+
             }
         }
 
         function createSlider(obj) {
-            var constName, constValue, rangeBlobs, valueMin, valueMax,
-                spanEl, sliderEl, sliderWidth;
-
-            // The name of the constant is obj['@var']. Multiple sliders and/or
-            // inputs can represent the same constant - therefore we will get
-            // the most recent const value from the state object. The range is
-            // a string composed of 3 blobs, separated by commas. The first
-            // blob is the min value for the slider, the third blob is the max
-            // value for the slider.
+            var constName, constValue, rangeBlobs, valueMin, valueMax, spanEl,
+                sliderEl, sliderWidth;
 
+            // The name of the constant is obj['@var']. If it is not specified,
+            // we will skip creating a slider for this constant.
             if (typeof obj['@var'] !== 'string') {
                 return;
             }
-
             constName = obj['@var'];
 
-            constValue = state.getConstValue(constName);
-            if (constValue === undefined) {
-                constValue = 0;
+            // We will not add a slider for a constant which already has a
+            // slider defined for it.
+            //
+            // We will add the constant name to the 'constNamesUsed' object in
+            // the end, when everything went successfully.
+            if (constNamesUsed.hasOwnProperty(constName)) {
+                return;
             }
 
+            // Multiple sliders and/or inputs can represent the same constant.
+            // Therefore we will get the most recent const value from the state
+            // object. If it is undefined, then something terrible has
+            // happened! We will skip creating a slider for this constant.
+            constValue = state.getConstValue(constName);
+            if (constValue === undefined) {
+                return;
+            }
+
+            // The range is a string composed of 3 blobs, separated by commas.
+            // The first blob is the min value for the slider, the third blob
+            // is the max value for the slider.
             if (typeof obj['@range'] !== 'string') {
+
+                // If the range is not a string, we will set a default range.
+                // No promise as to the quality of the data points that this
+                // range will produce.
                 valueMin = constValue - 10;
                 valueMax = constValue + 10;
+
             } else {
+
+                // Separate the range string by commas, and store each blob as
+                // an element in an array.
                 rangeBlobs = obj['@range'].split(',');
 
                 // We must have gotten exactly 3 blobs (pieces) from the split.
                 if (rangeBlobs.length !== 3) {
-                    valueMin = constValue - 10;
-                    valueMax = constValue + 10;
+
+                    // Set some sensible defaults, if the range string was
+                    // split into more or less than 3 pieces.
+                    setDefaultMinMax();
+
                 } else {
-                    // Get the first blob from the split string.
+
+                    // Get the first blob from the split string. It is the min
+                    // value.
                     valueMin = parseFloat(rangeBlobs[0]);
 
+                    // Is it a well-formed float number?
                     if (isNaN(valueMin) === true) {
+
+                        // No? Then set a sensible default value.
                         valueMin = constValue - 10;
+
                     }
 
-                    // Get the third blob from the split string.
+                    // Get the third blob from the split string. It is the max.
                     valueMax = parseFloat(rangeBlobs[2]);
 
+                    // Is it a well-formed float number?
                     if (isNaN(valueMax) === true) {
+
+                        // No? Then set a sensible default value.
                         valueMax = constValue + 10;
+
                     }
 
                     // Logically, the min, value, and max should make sense.
@@ -79,38 +128,53 @@ define('Sliders', [], function () {
                     if ((valueMin > valueMax) ||
                         (valueMin > constValue) ||
                         (valueMax < constValue)) {
-                        valueMin = constValue - 10;
-                        valueMax = constValue + 10;
+
+                        // Set some sensible defaults, if min/value/max logic
+                        // is broken.
+                        setDefaultMinMax();
+
                     }
                 }
             }
 
+            // At this point we have the constant name, the constant value, and
+            // the min and max values for this slider. Lets get the element on
+            // the page into which the slider will be inserted.
             spanEl = $('#' + gstId + '_slider_' + constName);
 
-            // If a corresponding slider  DIV for this constant does not exist,
-            // do not do anything.
+            // If a corresponding element for this constant does not exist on
+            // the page, we will not be making a slider.
             if (spanEl.length === 0) {
                 return;
             }
 
+            // Create the slider DIV.
             sliderEl = $('<div>');
 
-            // The default slider width.
+            // We will define the width of the slider to a sensible default.
             sliderWidth = 400;
 
+            // Then we will see if one is provided in the config for this
+            // slider. If we find it, and it is a well-formed integer, we will
+            // use it, instead of the default width.
             if (typeof obj['@width'] === 'string') {
                 if (isNaN(parseInt(obj['@width'], 10)) === false) {
                     sliderWidth = parseInt(obj['@width'], 10);
                 }
             }
 
-            // Set the new width to the slider.
+            // Set the defined width to the slider.
             sliderEl.width(sliderWidth);
+
+            // And make sure that it gets added to the page as an
+            // 'inline-block' element. This will allow for the insertion of the
+            // slider into a paragraph, without the browser forcing it out of
+            // the paragraph onto a new line, separate line.
             sliderEl.css('display', 'inline-block');
 
-            // Create a jQuery UI slider from the current DIV. We will set
+            // Create a jQuery UI slider from the slider DIV. We will set
             // starting parameters, and will also attach a handler to update
-            // the state on the change event.
+            // the 'state' on the 'change' event.
             sliderEl.slider({
                 'min': valueMin,
                 'max': valueMax,
@@ -120,13 +184,32 @@ define('Sliders', [], function () {
                 'change': sliderOnChange
             });
 
+            // Append the slider DIV to the element on the page where the user
+            // wants to see it.
             sliderEl.appendTo(spanEl);
 
+            // OK! So we made it this far...
+            //
+            // Adding the constant to the list of used constants. Next time a
+            // slider for this constant will not be created.
+            constNamesUsed[constName] = true;
+
             return;
 
+            // Update the 'state' - i.e. set the value of the constant this
+            // slider is attached to to a new value.
+            //
+            // This will cause the plot to be redrawn each time after the user
+            // drags the slider handle and releases it.
             function sliderOnChange(event, ui) {
                 state.setConstValue(constName, ui.value);
             }
+
+            // The sensible defaults for the slider's range.
+            function setDefaultMinMax() {
+                valueMin = constValue - 10;
+                valueMax = constValue + 10;
+            }
         }
     }
 });

From 28f4921924c1e47c7a68a754292a63dcdea6c35e Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Tue, 11 Dec 2012 06:56:43 +0200
Subject: [PATCH 250/541] GST work in progress.

---
 .../js/src/graphical_slider_tool/graph.js     | 44 ++++++++++++++++---
 1 file changed, 39 insertions(+), 5 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 61228413f5..dba0483674 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -2,13 +2,15 @@
 // define() functions from Require JS available inside the anonymous function.
 (function (requirejs, require, define) {
 
-define('Graph', [], function () {
+define('Graph', ['logme'], function (logme) {
 
     return Graph;
 
     function Graph(gstId, config, state) {
         var plotDiv, dataSets, functions;
 
+        logme(config);
+
         plotDiv = $('#' + gstId + '_plot');
 
         if (plotDiv.length === 0) {
@@ -39,11 +41,29 @@ define('Graph', [], function () {
             if (typeof config.plot['function'] === 'string') {
                 addFunction(config.plot['function']);
             } else if ($.isPlainObject(config.plot['function']) === true) {
-
+                addFunction(
+                    config.plot['function']['#text'],
+                    config.plot['function']['@color'],
+                    config.plot['function']['@dot'],
+                    config.plot['function']['@label'],
+                    config.plot['function']['@line'],
+                    config.plot['function']['@point_size'],
+                    config.plot['function']['@style']
+                );
             } else if ($.isArray(config.plot['function'])) {
                 for (c1 = 0; c1 < config.plot['function'].length; c1++) {
                     if (typeof config.plot['function'][c1] === 'string') {
                         addFunction(config.plot['function'][c1]);
+                    } else if ($.isPlainObject(config.plot['function'][c1])) {
+                        addFunction(
+                            config.plot['function'][c1]['#text'],
+                            config.plot['function'][c1]['@color'],
+                            config.plot['function'][c1]['@dot'],
+                            config.plot['function'][c1]['@label'],
+                            config.plot['function'][c1]['@line'],
+                            config.plot['function'][c1]['@point_size'],
+                            config.plot['function'][c1]['@style']
+                        );
                     }
                 }
             }
@@ -76,17 +96,31 @@ define('Graph', [], function () {
                 }
 
                 if (typeof line === 'boolean') {
-                    newFunctionObject['line'] = line;
+                    if ((line === 'true') || (line === true)) {
+                        newFunctionObject['line'] = true;
+                    } else {
+                        newFunctionObject['line'] = false;
+                    }
                 }
 
-                if (typeof dot === 'boolean') {
-                    newFunctionObject['dot'] = dot;
+                if ((typeof dot === 'boolean') || (typeof dot === 'string')) {
+                    if ((dot === 'true') || (dot === true)) {
+                        newFunctionObject['dot'] = true;
+                    } else {
+                        newFunctionObject['dot'] = false;
+                    }
+                }
+
+                if ((newFunctionObject['dot'] === false) && (newFunctionObject['line'] === false)) {
+                    newFunctionObject['line'] = true;
                 }
 
                 if (typeof label === 'string') {
                     newFunctionObject['label'] = label;
                 }
 
+                logme(newFunctionObject);
+
                 functions.push(newFunctionObject);
             }
         }

From 3e46ecef646f194798dff81dc4f4176a9e69a27f Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Tue, 11 Dec 2012 10:47:46 +0200
Subject: [PATCH 251/541] GST work in progress.

---
 .../js/src/graphical_slider_tool/graph.js     | 132 ++++++++++++++----
 .../js/src/graphical_slider_tool/gst_main.js  |   4 +
 .../js/graphical_slider_tool/gst_module.js    |  15 --
 .../static/js/graphical_slider_tool/main.js   |  75 ----------
 4 files changed, 108 insertions(+), 118 deletions(-)
 delete mode 100644 common/static/js/graphical_slider_tool/gst_module.js
 delete mode 100644 common/static/js/graphical_slider_tool/main.js

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index dba0483674..c0c8addf80 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -7,7 +7,7 @@ define('Graph', ['logme'], function (logme) {
     return Graph;
 
     function Graph(gstId, config, state) {
-        var plotDiv, dataSets, functions;
+        var plotDiv, dataSeries, functions;
 
         logme(config);
 
@@ -39,37 +39,55 @@ define('Graph', ['logme'], function (logme) {
             }
 
             if (typeof config.plot['function'] === 'string') {
+
+                // If just one function string is present.
                 addFunction(config.plot['function']);
+
             } else if ($.isPlainObject(config.plot['function']) === true) {
-                addFunction(
-                    config.plot['function']['#text'],
-                    config.plot['function']['@color'],
-                    config.plot['function']['@dot'],
-                    config.plot['function']['@label'],
-                    config.plot['function']['@line'],
-                    config.plot['function']['@point_size'],
-                    config.plot['function']['@style']
-                );
+
+                // If a function is present, but it also has properties
+                // defined.
+                callAddFunction(config.plot['function']);
+
             } else if ($.isArray(config.plot['function'])) {
+
+                // If more than one function is defined.
                 for (c1 = 0; c1 < config.plot['function'].length; c1++) {
+
+                    // For each definition, we must check if it is a simple
+                    // string definition, or a complex one with properties.
                     if (typeof config.plot['function'][c1] === 'string') {
+
+                        // Simple string.
                         addFunction(config.plot['function'][c1]);
+
                     } else if ($.isPlainObject(config.plot['function'][c1])) {
-                        addFunction(
-                            config.plot['function'][c1]['#text'],
-                            config.plot['function'][c1]['@color'],
-                            config.plot['function'][c1]['@dot'],
-                            config.plot['function'][c1]['@label'],
-                            config.plot['function'][c1]['@line'],
-                            config.plot['function'][c1]['@point_size'],
-                            config.plot['function'][c1]['@style']
-                        );
+
+                        // Properties are present.
+                        callAddFunction(config.plot['function'][c1]);
+
                     }
                 }
             }
 
             return;
 
+            // This function will reduce code duplications. We have to call
+            // the function addFunction() several times passing object
+            // properties. A parameters. Rather than writing them out every
+            // time, we will have a single point of
+            function callAddFunction(obj) {
+                addFunction(
+                    obj['#text'],
+                    obj['@color'],
+                    obj['@line'],
+                    obj['@dot'],
+                    obj['@label'],
+                    obj['@style'],
+                    obj['@point_size']
+                );
+            }
+
             function addFunction(funcString, color, line, dot, label, style, point_size) {
                 var newFunctionObject, func, constNames;
 
@@ -95,7 +113,7 @@ define('Graph', ['logme'], function (logme) {
                     newFunctionObject['color'] = color;
                 }
 
-                if (typeof line === 'boolean') {
+                if ((typeof line === 'boolean') || (typeof line === 'string')) {
                     if ((line === 'true') || (line === true)) {
                         newFunctionObject['line'] = true;
                     } else {
@@ -111,6 +129,9 @@ define('Graph', ['logme'], function (logme) {
                     }
                 }
 
+                // By default, if no preference was set, or if the preference
+                // is conflicting (we must have either line or dot, none is
+                // not an option), we will show line.
                 if ((newFunctionObject['dot'] === false) && (newFunctionObject['line'] === false)) {
                     newFunctionObject['line'] = true;
                 }
@@ -131,33 +152,68 @@ define('Graph', ['logme'], function (logme) {
         }
 
         function generateData() {
-            var c0, c1, datapoints, constValues, x, y;
+            var c0, c1, functionObj, seriesObj, dataPoints, constValues, x, y;
 
             constValues = state.getAllConstantValues();
 
-            dataSets = [];
+            dataSeries = [];
 
             for (c0 = 0; c0 < functions.length; c0 += 1) {
-                datapoints = [];
+                functionObj = functions[c0];
+                logme('Functions obj:', functionObj);
 
-                for (c1 = 0; c1 < 30; c1 += 0.1) {
+                seriesObj = {};
+                dataPoints = [];
+
+                for (c1 = 0; c1 < 30; c1 += 1) {
                     x = c1;
+
                     // Push the 'x' variable to the end of the parameter array.
                     constValues.push(x);
-                    y = functions[c0].func.apply(window, constValues);
+
+                    // We call the user defined function, passing all of the
+                    // available constant values. inside this function they
+                    // will be accessible by their names.
+                    y = functionObj.func.apply(window, constValues);
+
+                    // Return the constValues array to how it was before we
+                    // added 'x' variable to the end of it.
                     constValues.pop();
 
-                    datapoints.push([x, y]);
+                    // Add the generated point to the data points set.
+                    dataPoints.push([x, y]);
+
                 }
 
-                dataSets.push(datapoints);
+                // Put the entire data points set into the series object.
+                seriesObj.data = dataPoints;
+
+                // See if user defined a specific color for this function.
+                if (functionObj.hasOwnProperty('color') === true) {
+                    seriesObj.color = functionObj.color;
+                }
+
+                // See if a user defined a label for this function.
+                if (functionObj.hasOwnProperty('label') === true) {
+                    seriesObj.label = functionObj.label;
+                }
+
+                seriesObj.lines = {
+                    'show': functionObj.line
+                };
+
+                seriesObj.points = {
+                    'show': functionObj.dot
+                };
+
+                dataSeries.push(seriesObj);
             }
         }
 
         function updatePlot() {
             $.plot(
                 plotDiv,
-                dataSets,
+                dataSeries,
                 {
                     'xaxis': {
                         'min': 0,
@@ -166,9 +222,29 @@ define('Graph', ['logme'], function (logme) {
                     'yaxis': {
                         'min': -5,
                         'max': 5
+                    },
+                    'legend': {
+
+                        // To show the legend or not. Note, even if 'show' is
+                        // 'true', the legend will only show if labels are
+                        // provided for at least one of the series that are
+                        // going to be plotted.
+                        'show': true,
+
+                        // A floating point number in the range [0, 1]. The
+                        // smaller the number, the more transparent will the
+                        // legend background become.
+                        'backgroundOpacity': 0
+
                     }
                 }
             );
+
+            MathJax.Hub.Queue([
+                'Typeset',
+                MathJax.Hub,
+                plotDiv.attr('id')
+            ]);
         }
     }
 });
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
index 47881b66c6..8611fed1f2 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
@@ -4,6 +4,10 @@
 
 define(
     'GstMain',
+
+    // Even though it is not explicitly in this module, we have to specify
+    // 'GeneralMethods' as a dependency. It expands some of the core JS objects
+    // with additional useful methods that are used in other modules.
     ['State', 'GeneralMethods', 'Sliders', 'Inputs', 'Graph'],
     function (State, GeneralMethods, Sliders, Inputs, Graph) {
 
diff --git a/common/static/js/graphical_slider_tool/gst_module.js b/common/static/js/graphical_slider_tool/gst_module.js
deleted file mode 100644
index c4661b5e44..0000000000
--- a/common/static/js/graphical_slider_tool/gst_module.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
-// define() functions from Require JS available inside the anonymous function.
-(function (requirejs, require, define) {
-
-define([], function () {
-    return {
-        'module_status': 'OK'
-    };
-});
-
-// End of wrapper for RequireJS. As you can see, we are passing
-// namespaced Require JS variables to an anonymous function. Within
-// it, you can use the standard requirejs(), require(), and define()
-// functions as if they were in the global namespace.
-}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/static/js/graphical_slider_tool/main.js b/common/static/js/graphical_slider_tool/main.js
deleted file mode 100644
index da36d9c9d6..0000000000
--- a/common/static/js/graphical_slider_tool/main.js
+++ /dev/null
@@ -1,75 +0,0 @@
-// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
-// define() functions from Require JS available inside the anonymous function.
-(function (requirejs, require, define) {
-
-// For documentation please check:
-//     http://requirejs.org/docs/api.html
-requirejs.config({
-    // Because require.js is included as a simple <script> tag (and is
-    // forcefully namespaced) it does not get it's configuration from a
-    // predefined 'data-main' attribute. Therefore, from the start, it assumes
-    // that the 'baseUrl' is the same directory that require.js itself is
-    // contained in - i.e. in '/static/js/vendor'. So, we must specify a
-    // correct 'baseUrl'.
-    //
-    // Require JS initially searches this directory for all of the specified
-    // dependencies. If the dependency is
-    //
-    //     'sylvester'
-    //
-    // then it will try to get it from
-    //
-    //     baseUrl + '/' + 'sylvester' + '.js'
-    //
-    // If the dependency is
-    //
-    //     'vendor_libs/sylvester'
-    //
-    // then it will try to get it from
-    //
-    //     baseUrl + '/' + 'vendor_libs/sylvester' + '.js'
-    //
-    // This means two things. One - you can use sub-folders to separate your
-    // code. Two - don't include the '.js' suffix when specifying a dependency.
-    //
-    // For documentation please check:
-    //     http://requirejs.org/docs/api.html#config-baseUrl
-    'baseUrl': '/static/js/graphical_slider_tool',
-
-    // If you need to load from another path, you can specify it here on a
-    // per-module basis. For example you can specify CDN sources here, or
-    // absolute paths that lie outside of the 'baseUrl' directory.
-    //
-    // For documentation please check:
-    //     http://requirejs.org/docs/api.html#config-paths
-    'paths': {
-
-    },
-
-    // Since all of the modules that we require are not aware of our custom
-    // RequireJS solution, that means all of them will be working in the
-    // "old mode". I.e. they will populate the global namespace with their
-    // module object.
-    //
-    // For each module that we will use, we will specify what is exports into
-    // the global namespace, and, if necessary, other modules that it depends.
-    // on. Module dependencies  (downloading them, inserting into the document,
-    // etc.) are handled by RequireJS.
-    //
-    // For documentation please check:
-    //     http://requirejs.org/docs/api.html#config-shim
-    'shim': {
-
-    }
-}); // End-of: requirejs.config({
-
-// Start the main app logic.
-requirejs(['gst_module'], function (GstModule) {
-    console.log(GstModule);
-}); // End-of: requirejs(['gst_module'], function (GstModule)
-
-// End of wrapper for RequireJS. As you can see, we are passing
-// namespaced Require JS variables to an anonymous function. Within
-// it, you can use the standard requirejs(), require(), and define()
-// functions as if they were in the global namespace.
-}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)

From f2fd649a1689941fb2c419ba1d93dd0507833f45 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Tue, 11 Dec 2012 12:13:35 +0200
Subject: [PATCH 252/541] Removed unnecessary XML section. Documenting.

---
 common/lib/xmodule/xmodule/gst_module.py | 10 +++-------
 lms/templates/graphical_slider_tool.html |  5 -----
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index 61a883fbf8..f0c3d0b7e6 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -97,8 +97,6 @@ class GraphicalSliderToolModule(XModule):
                 number, then only error message is displayed.
                 Sliders and numbers are optional. Plot is required.-->
               </configuration>
-              <plot_code>
-              </plot_code>
             </graphical_slider_tool>
           </vertical>
         </sequential>
@@ -116,8 +114,7 @@ class GraphicalSliderToolModule(XModule):
                   'gst_html': gst_html,
                   'element_id': self.html_id,
                   'element_class': self.html_class,
-                  'configuration_json': self.configuration_json,
-                  'plot_code': self.definition['plot_code']
+                  'configuration_json': self.configuration_json
                   }
         self.content = (self.system.render_template(
                         'graphical_slider_tool.html', params))
@@ -195,7 +192,7 @@ class GraphicalSliderToolDescriptor(MakoModuleDescriptor, XmlDescriptor):
             dict
         """
         # check for presense of required tags in xml
-        expected_children_level_0 = ['render', 'configuration', 'plot_code']
+        expected_children_level_0 = ['render', 'configuration']
         for child in expected_children_level_0:
             if len(xml_object.xpath(child)) != 1:
                 raise ValueError("Self a\ssessment definition must include \
@@ -214,8 +211,7 @@ class GraphicalSliderToolDescriptor(MakoModuleDescriptor, XmlDescriptor):
 
         return {
                     'render': parse('render'),
-                    'configuration': xml_object.xpath('configuration')[0],
-                    'plot_code': parse('plot_code'),
+                    'configuration': xml_object.xpath('configuration')[0]
                 }
 
     def definition_to_xml(self, resource_fs):
diff --git a/lms/templates/graphical_slider_tool.html b/lms/templates/graphical_slider_tool.html
index 17d2bae5e9..93a6761784 100644
--- a/lms/templates/graphical_slider_tool.html
+++ b/lms/templates/graphical_slider_tool.html
@@ -4,11 +4,6 @@
         ${configuration_json}
     </div>
 
-    <!-- hidden field to read configuration json from -->
-    <div class="${element_class}" id="${element_id}_plot_code" style="display: none;">
-        ${plot_code}
-    </div>
-
     <!-- main xml with marked places for sliders, numbers, and plot -->
     ${gst_html}
 </div>

From 46d0045d0267aa359e3de23f192347fddb5c3238 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Tue, 11 Dec 2012 12:34:58 +0200
Subject: [PATCH 253/541] GST documentation and code refactoring.

---
 .../xmodule/xmodule/js/src/graphical_slider_tool/graph.js  | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index c0c8addf80..215feb214d 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -2,15 +2,13 @@
 // define() functions from Require JS available inside the anonymous function.
 (function (requirejs, require, define) {
 
-define('Graph', ['logme'], function (logme) {
+define('Graph', [], function () {
 
     return Graph;
 
     function Graph(gstId, config, state) {
         var plotDiv, dataSeries, functions;
 
-        logme(config);
-
         plotDiv = $('#' + gstId + '_plot');
 
         if (plotDiv.length === 0) {
@@ -140,8 +138,6 @@ define('Graph', ['logme'], function (logme) {
                     newFunctionObject['label'] = label;
                 }
 
-                logme(newFunctionObject);
-
                 functions.push(newFunctionObject);
             }
         }
@@ -160,7 +156,6 @@ define('Graph', ['logme'], function (logme) {
 
             for (c0 = 0; c0 < functions.length; c0 += 1) {
                 functionObj = functions[c0];
-                logme('Functions obj:', functionObj);
 
                 seriesObj = {};
                 dataPoints = [];

From 4265bf17c515cd6069980bea83c0f87d2a0eacbf Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Tue, 11 Dec 2012 14:46:05 +0200
Subject: [PATCH 254/541] Implemented ticks config, plot dimensions config. For
 sliders changed the event from Change to Slide. Now update to graph is
 near-instantaneous.

---
 .../js/src/graphical_slider_tool/graph.js     | 112 ++++++++++++++++--
 .../js/src/graphical_slider_tool/sliders.js   |   3 +-
 2 files changed, 102 insertions(+), 13 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 215feb214d..81c52e8ef5 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -2,12 +2,14 @@
 // define() functions from Require JS available inside the anonymous function.
 (function (requirejs, require, define) {
 
-define('Graph', [], function () {
+define('Graph', ['logme'], function (logme) {
 
     return Graph;
 
     function Graph(gstId, config, state) {
-        var plotDiv, dataSeries, functions;
+        var plotDiv, dataSeries, functions, xaxis, yaxis;
+
+        logme('config:', config);
 
         plotDiv = $('#' + gstId + '_plot');
 
@@ -15,8 +17,8 @@ define('Graph', [], function () {
             return;
         }
 
-        plotDiv.width(300);
-        plotDiv.height(300);
+        setGraphDimensions();
+        setGraphAxes();
 
         state.bindUpdatePlotEvent(plotDiv, onUpdatePlot);
 
@@ -27,6 +29,98 @@ define('Graph', [], function () {
 
         return;
 
+        function setGraphDimensions() {
+            var dimObj, width, height;
+
+            // If no dimensions are specified by the user, the graph have
+            // predefined dimensions.
+            width = 300;
+            height = 300;
+
+            // Get the user specified dimensions, if any.
+            if ($.isPlainObject(config.plot['dimensions']) === true) {
+                dimObj = config.plot['dimensions'];
+
+                if (dimObj.hasOwnProperty('@width') === true) {
+                    if (isNaN(parseInt(dimObj['@width'], 10)) === false) {
+                        width = parseInt(dimObj['@width'], 10);
+                    }
+                }
+
+                if (dimObj.hasOwnProperty('@height') === true) {
+                    if (isNaN(parseInt(dimObj['@height'], 10)) === false) {
+                        height = parseInt(dimObj['@height'], 10);
+                    }
+                }
+            }
+
+            plotDiv.width(width);
+            plotDiv.height(height);
+        }
+
+        function setGraphAxes() {
+            xaxis = {
+                'min': 0,
+                'tickSize': 3,
+                'max': 30
+            };
+
+            if (typeof config.plot['xticks'] === 'string') {
+                processTicks(config.plot['xticks'], xaxis);
+            }
+
+            yaxis = {
+                'min': -5,
+                'tickSize': 1,
+                'max': 5
+            };
+
+            if (typeof config.plot['yticks'] === 'string') {
+                processTicks(config.plot['yticks'], yaxis);
+            }
+
+            return;
+
+            function processTicks(ticksStr, ticksObj) {
+                var ticksBlobs, min, tickSize, max;
+
+                logme('Processing ticks. Ticks string is: [' + ticksStr + ']');
+                logme('Original ticks object:', ticksObj);
+
+                ticksBlobs = ticksStr.split(',');
+
+                if (ticksBlobs.length !== 3) {
+                    return;
+                }
+
+                min = parseFloat(ticksBlobs[0]);
+                if (isNaN(min) === false) {
+                    ticksObj.min = min;
+                }
+
+                tickSize = parseFloat(ticksBlobs[1]);
+                if (isNaN(tickSize) === false) {
+                    ticksObj.tickSize = tickSize;
+                }
+
+                max = parseFloat(ticksBlobs[2]);
+                if (isNaN(max) === false) {
+                    ticksObj.max = max;
+                }
+
+                if (ticksObj.min >= ticksObj.max) {
+                    ticksObj.min = 0;
+                    ticksObj.max = 10;
+                }
+
+                if (ticksObj.tickSize * 2 >= ticksObj.max - ticksObj.min) {
+                    ticksObj.tickSize = (ticksObj.max - ticksObj.min) / 10.0;
+                }
+
+                logme('Modified ticks object:', ticksObj);
+            }
+        }
+
         function createFunctions() {
             var c1;
 
@@ -210,14 +304,8 @@ define('Graph', [], function () {
                 plotDiv,
                 dataSeries,
                 {
-                    'xaxis': {
-                        'min': 0,
-                        'max': 30
-                    },
-                    'yaxis': {
-                        'min': -5,
-                        'max': 5
-                    },
+                    'xaxis': xaxis,
+                    'yaxis': yaxis,
                     'legend': {
 
                         // To show the legend or not. Note, even if 'show' is
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
index 33bdd89dd1..ea6398caad 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
@@ -181,7 +181,8 @@ define('Sliders', [], function () {
                 'value': constValue,
                 'step': (valueMax - valueMin) / 50.0,
 
-                'change': sliderOnChange
+                // 'change': sliderOnChange,
+                'slide': sliderOnChange
             });
 
             // Append the slider DIV to the element on the page where the user

From 46de7b2c52a822c48da7416516b85648e298fef8 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Tue, 11 Dec 2012 15:44:34 +0200
Subject: [PATCH 255/541] Added config options for number of points and xrange
 - start, end, step.

---
 .../js/src/graphical_slider_tool/graph.js     | 71 +++++++++++++------
 1 file changed, 49 insertions(+), 22 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 81c52e8ef5..5848c9da01 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -2,14 +2,12 @@
 // define() functions from Require JS available inside the anonymous function.
 (function (requirejs, require, define) {
 
-define('Graph', ['logme'], function (logme) {
+define('Graph', [], function () {
 
     return Graph;
 
     function Graph(gstId, config, state) {
-        var plotDiv, dataSeries, functions, xaxis, yaxis;
-
-        logme('config:', config);
+        var plotDiv, dataSeries, functions, xaxis, yaxis, xrange;
 
         plotDiv = $('#' + gstId + '_plot');
 
@@ -19,6 +17,7 @@ define('Graph', ['logme'], function (logme) {
 
         setGraphDimensions();
         setGraphAxes();
+        setGraphXRange();
 
         state.bindUpdatePlotEvent(plotDiv, onUpdatePlot);
 
@@ -30,27 +29,25 @@ define('Graph', ['logme'], function (logme) {
         return;
 
         function setGraphDimensions() {
-            var dimObj, width, height;
+            var dimObj, width, height, tempInt;
 
             // If no dimensions are specified by the user, the graph have
             // predefined dimensions.
-            width = 300;
-            height = 300;
+            width = 100;
+            height = 100;
 
             // Get the user specified dimensions, if any.
             if ($.isPlainObject(config.plot['dimensions']) === true) {
                 dimObj = config.plot['dimensions'];
 
-                if (dimObj.hasOwnProperty('@width') === true) {
-                    if (isNaN(parseInt(dimObj['@width'], 10)) === false) {
-                        width = parseInt(dimObj['@width'], 10);
-                    }
+                tempInt = parseInt(dimObj['@width'], 10);
+                if (isNaN(tempInt) === false) {
+                    width = tempInt;
                 }
 
-                if (dimObj.hasOwnProperty('@height') === true) {
-                    if (isNaN(parseInt(dimObj['@height'], 10)) === false) {
-                        height = parseInt(dimObj['@height'], 10);
-                    }
+                tempInt = parseInt(dimObj['@height'], 10);
+                if (isNaN(tempInt) === false) {
+                    height = tempInt;
                 }
             }
 
@@ -84,9 +81,6 @@ define('Graph', ['logme'], function (logme) {
             function processTicks(ticksStr, ticksObj) {
                 var ticksBlobs, min, tickSize, max;
 
-                logme('Processing ticks. Ticks string is: [' + ticksStr + ']');
-                logme('Original ticks object:', ticksObj);
-
                 ticksBlobs = ticksStr.split(',');
 
                 if (ticksBlobs.length !== 3) {
@@ -116,8 +110,42 @@ define('Graph', ['logme'], function (logme) {
                 if (ticksObj.tickSize * 2 >= ticksObj.max - ticksObj.min) {
                     ticksObj.tickSize = (ticksObj.max - ticksObj.min) / 10.0;
                 }
+            }
+        }
 
-                logme('Modified ticks object:', ticksObj);
+        function setGraphXRange() {
+            var xRangeStr, xRangeBlobs, tempNum;
+
+            xrange = {
+                'start': 0,
+                'end': 30,
+                'step': 0.1
+            };
+
+            if (typeof config.plot['xrange'] === 'string') {
+                xRangeStr = config.plot['xrange'];
+                xRangeBlobs = xRangeStr.split(',');
+
+                if (xRangeBlobs.length === 2) {
+
+                    tempNum = parseFloat(xRangeBlobs[0]);
+                    if (isNaN(tempNum) === false) {
+                        xrange.start = tempNum;
+                    }
+
+                    tempNum = parseFloat(xRangeBlobs[1]);
+                    if (isNaN(tempNum) === false) {
+                        xrange.end = tempNum;
+                    }
+
+                }
+            }
+
+            if (typeof config.plot['num_points'] === 'string') {
+                tempNum = parseInt(config.plot['num_points'], 10);
+                if (isNaN(tempNum) === false) {
+                    xrange.step = (xrange.end - xrange.start) / tempNum;
+                }
             }
         }
 
@@ -242,7 +270,7 @@ define('Graph', ['logme'], function (logme) {
         }
 
         function generateData() {
-            var c0, c1, functionObj, seriesObj, dataPoints, constValues, x, y;
+            var c0, functionObj, seriesObj, dataPoints, constValues, x, y;
 
             constValues = state.getAllConstantValues();
 
@@ -254,8 +282,7 @@ define('Graph', ['logme'], function (logme) {
                 seriesObj = {};
                 dataPoints = [];
 
-                for (c1 = 0; c1 < 30; c1 += 1) {
-                    x = c1;
+                for (x = xrange.start; x <= xrange.end; x += xrange.step) {
 
                     // Push the 'x' variable to the end of the parameter array.
                     constValues.push(x);

From 6caddad6679a6daebeb0c25ac2718c888c8fdb72 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Tue, 11 Dec 2012 17:52:04 +0200
Subject: [PATCH 256/541] Added ability to congiure a text input to be
 readonly. Changed the default width and height of the graph to 300px and
 300px respectively.

---
 .../js/src/graphical_slider_tool/graph.js     |  4 +--
 .../js/src/graphical_slider_tool/inputs.js    | 34 +++++++++++++++----
 .../js/src/graphical_slider_tool/state.js     |  6 +---
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 5848c9da01..89b1bb17c1 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -33,8 +33,8 @@ define('Graph', [], function () {
 
             // If no dimensions are specified by the user, the graph have
             // predefined dimensions.
-            width = 100;
-            height = 100;
+            width = 300;
+            height = 300;
 
             // Get the user specified dimensions, if any.
             if ($.isPlainObject(config.plot['dimensions']) === true) {
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
index 3e7e55f02c..d7789cb000 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
@@ -42,7 +42,7 @@ define('Inputs', [], function () {
         }
 
         function createInput(obj) {
-            var constName, constValue, spanEl, inputEl;
+            var constName, constValue, spanEl, inputEl, readOnly;
 
             // The name of the constant is obj['@var']. If it is not specified,
             // we will skip creating a text input for this constant.
@@ -86,12 +86,34 @@ define('Inputs', [], function () {
             // Set the current constant to the text input. It will be visible
             // to the user.
             inputEl.val(constValue);
+            
+            // Before binding a 'change' event, we will check if this text
+            // input is specified as 'read only'.
+            //
+            // By default, this setting is false - the user can change the 
+            // value in the text input.
+            readonly = false;
+            if (typeof obj['@readonly'] === 'string') {
+                if (obj['@readonly'] === 'true') {
+                    readonly = true;
+                }
+            }
 
-            // Bind a function to the 'change' event. Whenever the user changes
-            // the value of this text input, and presses 'enter' (or clicks
-            // somewhere else on the page), this event will be triggered, and
-            // our callback will be called.
-            inputEl.bind('change', inputOnChange);
+            if (readonly === true) {
+            
+                // In the case of a readonly config option, configure the text
+                // inputit as read-only, and NOT bind an event to it.
+                inputEl.attr('readonly', 'readonly');
+
+            } else { // readonly !== true
+
+                // Bind a function to the 'change' event. Whenever the user changes
+                // the value of this text input, and presses 'enter' (or clicks
+                // somewhere else on the page), this event will be triggered, and
+                // our callback will be called.
+                inputEl.bind('change', inputOnChange);
+
+            }
 
             // Lets style the input element nicely. We will use the button()
             // widget for this since there is no native widget for the text
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
index 88951f0e9d..6e878e120f 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
@@ -12,11 +12,7 @@ define('State', [], function () {
     // This module defines and returns a factory constructor.
     return State;
 
-    /*
-     * function: State
-     *
-     *
-     */
+    // function: State
     function State(gstId, config) {
         var constants, c1, plotDiv;
 

From 8efab2c953175619c1d59da2b2655af87310f4d7 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Tue, 11 Dec 2012 18:28:19 +0200
Subject: [PATCH 257/541] Minor edits.

---
 .../xmodule/xmodule/js/src/graphical_slider_tool/inputs.js  | 6 +++---
 .../xmodule/xmodule/js/src/graphical_slider_tool/state.js   | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
index d7789cb000..595021023f 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
@@ -86,11 +86,11 @@ define('Inputs', [], function () {
             // Set the current constant to the text input. It will be visible
             // to the user.
             inputEl.val(constValue);
-            
+
             // Before binding a 'change' event, we will check if this text
             // input is specified as 'read only'.
             //
-            // By default, this setting is false - the user can change the 
+            // By default, this setting is false - the user can change the
             // value in the text input.
             readonly = false;
             if (typeof obj['@readonly'] === 'string') {
@@ -100,7 +100,7 @@ define('Inputs', [], function () {
             }
 
             if (readonly === true) {
-            
+
                 // In the case of a readonly config option, configure the text
                 // inputit as read-only, and NOT bind an event to it.
                 inputEl.attr('readonly', 'readonly');
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
index 6e878e120f..996384fe74 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
@@ -26,14 +26,17 @@ define('State', [], function () {
         if ((typeof config.inputs !== 'undefined') &&
             (typeof config.inputs.input !== 'undefined')) {
             if ($.isArray(config.inputs.input)) {
-                // config.inputs.input is an array
 
+                // config.inputs.input is an array
                 for (c1 = 0; c1 < config.inputs.input.length; c1++) {
                     addConstFromInput(config.inputs.input[c1]);
                 }
+
             } else if ($.isPlainObject(config.inputs.input)) {
+
                 // config.inputs.input is an object
                 addConstFromInput(config.inputs.input);
+
             }
         }
 

From 78a3b7cf301f0043fa9c7de212bb34534edb48d1 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Wed, 12 Dec 2012 16:38:32 +0200
Subject: [PATCH 258/541] Added documentation for code. Fixed several minor
 issues. Added checks for some error cases.

---
 .../js/src/graphical_slider_tool/graph.js     | 167 +++++++++++++-----
 .../js/src/graphical_slider_tool/gst_main.js  |   8 +
 2 files changed, 132 insertions(+), 43 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 89b1bb17c1..bf74933f0f 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -9,29 +9,39 @@ define('Graph', [], function () {
     function Graph(gstId, config, state) {
         var plotDiv, dataSeries, functions, xaxis, yaxis, xrange;
 
+        // We must have a graph container DIV element available in order to
+        // proceed.
         plotDiv = $('#' + gstId + '_plot');
-
         if (plotDiv.length === 0) {
             return;
         }
 
+        // Configure some settings for the graph.
         setGraphDimensions();
         setGraphAxes();
         setGraphXRange();
 
-        state.bindUpdatePlotEvent(plotDiv, onUpdatePlot);
-
+        // Get the user defined functions. If there aren't any, don't do
+        // anything else.
         createFunctions();
+        if (functions.length === 0) {
+            return;
+        }
 
+        // Create the initial graph and plot it for the user to see.
         generateData();
         updatePlot();
 
+        // Bind an event. Whenever some constant changes, the graph will be
+        // redrawn
+        state.bindUpdatePlotEvent(plotDiv, onUpdatePlot);
+
         return;
 
         function setGraphDimensions() {
             var dimObj, width, height, tempInt;
 
-            // If no dimensions are specified by the user, the graph have
+            // If no dimensions are specified by the user, the graph will have
             // predefined dimensions.
             width = 300;
             height = 300;
@@ -51,27 +61,30 @@ define('Graph', [], function () {
                 }
             }
 
+            // Apply the dimensions to the graph container DIV element.
             plotDiv.width(width);
             plotDiv.height(height);
         }
 
         function setGraphAxes() {
+            // Define the xaxis Flot configuration, and then see if the user
+            // supplied custom values.
             xaxis = {
                 'min': 0,
-                'tickSize': 3,
-                'max': 30
+                'tickSize': 1,
+                'max': 10
             };
-
             if (typeof config.plot['xticks'] === 'string') {
                 processTicks(config.plot['xticks'], xaxis);
             }
 
+            // Define the yaxis Flot configuration, and then see if the user
+            // supplied custom values.
             yaxis = {
-                'min': -5,
+                'min': 0,
                 'tickSize': 1,
-                'max': 5
+                'max': 10
             };
-
             if (typeof config.plot['yticks'] === 'string') {
                 processTicks(config.plot['yticks'], yaxis);
             }
@@ -79,34 +92,41 @@ define('Graph', [], function () {
             return;
 
             function processTicks(ticksStr, ticksObj) {
-                var ticksBlobs, min, tickSize, max;
+                var ticksBlobs, tempFloat;
 
+                // The 'ticks' setting is a string containing 3 floating-point
+                // numbers.
                 ticksBlobs = ticksStr.split(',');
 
                 if (ticksBlobs.length !== 3) {
                     return;
                 }
 
-                min = parseFloat(ticksBlobs[0]);
-                if (isNaN(min) === false) {
-                    ticksObj.min = min;
+                tempFloat = parseFloat(ticksBlobs[0]);
+                if (isNaN(tempFloat) === false) {
+                    ticksObj.min = tempFloat;
                 }
 
-                tickSize = parseFloat(ticksBlobs[1]);
-                if (isNaN(tickSize) === false) {
-                    ticksObj.tickSize = tickSize;
+                tempFloat = parseFloat(ticksBlobs[1]);
+                if (isNaN(tempFloat) === false) {
+                    ticksObj.tickSize = tempFloat;
                 }
 
-                max = parseFloat(ticksBlobs[2]);
-                if (isNaN(max) === false) {
-                    ticksObj.max = max;
+                tempFloat = parseFloat(ticksBlobs[2]);
+                if (isNaN(tempFloat) === false) {
+                    ticksObj.max = tempFloat;
                 }
 
+                // Is the starting tick to the left of the ending tick (on the
+                // x-axis)? If not, set default starting and ending tick.
                 if (ticksObj.min >= ticksObj.max) {
                     ticksObj.min = 0;
                     ticksObj.max = 10;
                 }
 
+                // Make sure the range makes sense - i.e. that there are at
+                // least 3 ticks. If not, set a tickSize which will produce
+                // 11 ticks. tickSize is the spacing between the ticks.
                 if (ticksObj.tickSize * 2 >= ticksObj.max - ticksObj.min) {
                     ticksObj.tickSize = (ticksObj.max - ticksObj.min) / 10.0;
                 }
@@ -118,10 +138,13 @@ define('Graph', [], function () {
 
             xrange = {
                 'start': 0,
-                'end': 30,
+                'end': 10,
                 'step': 0.1
             };
 
+            // The 'xrange' is a string containing two floating point numbers
+            // separated by a comma. The first number is the starting
+            // x-coordinate , the second number is the ending x-coordinate
             if (typeof config.plot['xrange'] === 'string') {
                 xRangeStr = config.plot['xrange'];
                 xRangeBlobs = xRangeStr.split(',');
@@ -138,13 +161,25 @@ define('Graph', [], function () {
                         xrange.end = tempNum;
                     }
 
+                    if (xrange.start >= xrange.end) {
+                        xrange.start = 0;
+                        xrange.end = 10;
+                    }
+
                 }
             }
 
+            // The user can specify the number of points. However, internally
+            // we will use it to generate a 'step' - i.e. the distance (on
+            // x-axis) between two adjacent points.
             if (typeof config.plot['num_points'] === 'string') {
                 tempNum = parseInt(config.plot['num_points'], 10);
-                if (isNaN(tempNum) === false) {
-                    xrange.step = (xrange.end - xrange.start) / tempNum;
+                if (
+                    (isNaN(tempNum) === false) &&
+                    (tempNum >= 2) &&
+                    (tempNum <= 500)
+                ) {
+                    xrange.step = (xrange.end - xrange.start) / (tempNum - 1);
                 }
             }
         }
@@ -192,67 +227,97 @@ define('Graph', [], function () {
 
             return;
 
-            // This function will reduce code duplications. We have to call
+            // This function will reduce code duplication. We have to call
             // the function addFunction() several times passing object
-            // properties. A parameters. Rather than writing them out every
-            // time, we will have a single point of
+            // properties as parameters. Rather than writing them out every
+            // time, we will have a single place where it is done.
             function callAddFunction(obj) {
                 addFunction(
                     obj['#text'],
                     obj['@color'],
                     obj['@line'],
                     obj['@dot'],
-                    obj['@label'],
-                    obj['@style'],
-                    obj['@point_size']
+                    obj['@label']
                 );
             }
 
-            function addFunction(funcString, color, line, dot, label, style, point_size) {
+            function addFunction(funcString, color, line, dot, label) {
                 var newFunctionObject, func, constNames;
 
+                // The main requirement is function string. Without it we can't
+                // create a function, and the series cannot be calculated.
                 if (typeof funcString !== 'string') {
                     return;
                 }
 
-                newFunctionObject = {};
+                // Some defaults. If no options are set for the graph, we will
+                // make sure that at least a line is drawn for a function.
+                newFunctionObject = {
+                    'line': true,
+                    'dot': false
+                };
 
+                // Get all of the constant names defined by the user in the
+                // XML.
                 constNames = state.getAllConstantNames();
 
                 // The 'x' is always one of the function parameters.
                 constNames.push('x');
 
                 // Must make sure that the function body also gets passed to
-                // the Function cosntructor.
+                // the Function constructor.
                 constNames.push(funcString);
 
-                func = Function.apply(null, constNames);
+                // Create the function from the function string, and all of the
+                // available constants + the 'x' variable as it's parameters.
+                // For this we will use the built-in Function object
+                // constructor.
+                //
+                // If something goes wrong during this step, most
+                // likely the user supplied an invalid JavaScript function body
+                // string. In this case we will not proceed.
+                try {
+                    func = Function.apply(null, constNames);
+                } catch (err) {
+                    // Let's tell the user. He will see a nice red error
+                    // message instead of a graph.
+                    plotDiv.html(
+                        '<span style="color: red;">' +
+                            'Error while parsing JavaScript function body string!' +
+                        '</span>'
+                    );
+
+                    return;
+                }
+
                 newFunctionObject['func'] = func;
 
                 if (typeof color === 'string') {
                     newFunctionObject['color'] = color;
                 }
 
-                if ((typeof line === 'boolean') || (typeof line === 'string')) {
-                    if ((line === 'true') || (line === true)) {
+                if (typeof line === 'string') {
+                    if (line === 'true') {
                         newFunctionObject['line'] = true;
-                    } else {
+                    } else if (line === 'false') {
                         newFunctionObject['line'] = false;
                     }
                 }
 
-                if ((typeof dot === 'boolean') || (typeof dot === 'string')) {
-                    if ((dot === 'true') || (dot === true)) {
+                if (typeof dot === 'string') {
+                    if (dot === 'true') {
                         newFunctionObject['dot'] = true;
-                    } else {
+                    } else if (dot === 'false') {
                         newFunctionObject['dot'] = false;
                     }
                 }
 
-                // By default, if no preference was set, or if the preference
-                // is conflicting (we must have either line or dot, none is
-                // not an option), we will show line.
-                if ((newFunctionObject['dot'] === false) && (newFunctionObject['line'] === false)) {
+                // If the preference is conflicting (we must have either line
+                // or dot, none is not an option), we will show line.
+                if (
+                    (newFunctionObject['dot'] === false) &&
+                    (newFunctionObject['line'] === false)
+                ) {
                     newFunctionObject['line'] = true;
                 }
 
@@ -264,6 +329,8 @@ define('Graph', [], function () {
             }
         }
 
+        // The callback that will be called whenever a constant changes (gets
+        // updated via a slider or a text input).
         function onUpdatePlot(event) {
             generateData();
             updatePlot();
@@ -282,6 +349,7 @@ define('Graph', [], function () {
                 seriesObj = {};
                 dataPoints = [];
 
+                // Generate the data points.
                 for (x = xrange.start; x <= xrange.end; x += xrange.step) {
 
                     // Push the 'x' variable to the end of the parameter array.
@@ -314,19 +382,25 @@ define('Graph', [], function () {
                     seriesObj.label = functionObj.label;
                 }
 
+                // Should the data points be connected by a line?
                 seriesObj.lines = {
                     'show': functionObj.line
                 };
 
+                // Should each data point be represented by a point on the
+                // graph?
                 seriesObj.points = {
                     'show': functionObj.dot
                 };
 
+                // Add the newly created series object to the series set which
+                // will be plotted by Flot.
                 dataSeries.push(seriesObj);
             }
         }
 
         function updatePlot() {
+            // Tell Flot to draw the graph to our specification.
             $.plot(
                 plotDiv,
                 dataSeries,
@@ -350,6 +424,13 @@ define('Graph', [], function () {
                 }
             );
 
+            // The first time that the graph gets added to the page, the legend
+            // is created from scratch. When it appears, MathJax works some
+            // magic, and all of the specially marked TeX gets rendered nicely.
+            // The next time when we update the graph, no such thing happens.
+            // We must ask MathJax to typeset the legend again (well, we will
+            // ask it to look at our entire graph DIV), the next time it's
+            // worker queue is available.
             MathJax.Hub.Queue([
                 'Typeset',
                 MathJax.Hub,
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
index 8611fed1f2..0b46eb42bb 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
@@ -16,13 +16,21 @@ define(
     function GstMain(gstId) {
         var config, state;
 
+        // Get the JSON configuration, and parse it, and store as an object.
         config = JSON.parse($('#' + gstId + '_json').html()).root;
 
+        // Parse the configuration settings for sliders and text inputs, and
+        // extract all of the defined constants (their names along with their
+        // initial values).
         state = State(gstId, config);
 
+        // Create the sliders and the text inputs, attaching them to
+        // approriate constants.
         Sliders(gstId, config, state);
         Inputs(gstId, config, state);
 
+        // Configure and display the loop. Attach event for the graph to be
+        // updated on any change of a slider or a text input.
         Graph(gstId, config, state);
     }
 });

From 5f988fd916fb8052a6ff0257e9b01bcc710ace56 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 13 Dec 2012 14:13:52 +0200
Subject: [PATCH 259/541] sliders and inputs are now optional

---
 common/lib/xmodule/xmodule/gst_module.py | 113 ++++++-----------------
 1 file changed, 29 insertions(+), 84 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index f0c3d0b7e6..74cc70e076 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -41,65 +41,8 @@ class GraphicalSliderToolModule(XModule):
     def __init__(self, system, location, definition, descriptor, instance_state=None,
                  shared_state=None, **kwargs):
         """
-        Definition  should have....
-        sliders, text, module
+        For XML file format please look at documentation.
 
-        Sample file:
-
-        <sequential>
-          <vertical>
-            <graphical_slider_tool>
-              <render>
-                <p>Graphic slider tool html.</p>
-                <p>Can include 'input', 'slider' and 'plot' tags.
-                They will be replaced by proper number, slider and plot
-                widgets. </p>
-                For example: $slider a$, second $slider b$,
-                  number $input a$, and, plot:
-                  $plot$
-
-                  <!-- Sliders, and plot cannot be inside <p> -->
-              </render>
-              <configuration>
-                <sliders>
-                  <!-- optional: width=100 (in pixels), default is 400,
-                  show_value=[editable, not-editable], default is disabled.-->
-                  <slider var="a" range="-100, 1, 100" />
-                  <slider var="b" range="-1000, 100, 1000" witdh="300"/>
-                </sliders>
-                <inputs>
-                  <!-- optional: width=100 (in pixels), readonly=[true|false] -->
-                  <input var="a" initial="1"/>
-                </inputs>
-                <plot>
-                  <!-- optional: color=[standard web]; line=[true|false], default true;
-                  dot=[true|false], default false; label="string",
-                  style of line =[normal, dashed], default normal,
-                  point size-->
-                  <function y="x^2 + a" />
-                  <function y="3*x + b" color="red"/>
-                  <!-- asymtotes are functions,
-                  optional: name="string" -->
-                  <function y="b" color="red" style="dashed" name="b"/>
-                  <function y="b/2" color="red" style="dashed" name="b/2"/>
-                  <!-- xrange: min, max, yrange is calculated automatically -->
-                  <xrange>-10, 10</xrange>
-                  <!-- optional number of points, default is 300 -->
-                  <numpoints>60</numpoints>
-                  <!-- xticks and yticks are optional: min, step, max -->
-                  <xticks>-9, 1, 9</xticks>
-                  <yticks>-9, 1, 9</yticks>
-                  <!-- xaxis and xaxis are optional -->
-                  <xaxis unit="cm"/>
-                  <yaxis unit="s"/>
-                </plot>
-                <!-- if some parameter in function is not related to any slider or
-                number, then only error message is displayed.
-                Sliders and numbers are optional. Plot is required.-->
-              </configuration>
-            </graphical_slider_tool>
-          </vertical>
-        </sequential>
         """
         XModule.__init__(self, system, location, definition, descriptor,
                          instance_state, shared_state, **kwargs)
@@ -130,37 +73,39 @@ class GraphicalSliderToolModule(XModule):
         style="width: 600px; height: 600px; padding: 0px; position: relative;">This is plot</div>'
         html_string = html_string.replace('$plot$', plot_div)
 
-        # substitute sliders
-        sliders = json.loads(self.configuration_json)['root']['sliders']['slider']
-        if type(sliders) == dict:
-            sliders = [sliders]
-        vars = [x['@var'] for x in sliders]
+        # substitute sliders if we have them
+        if json.loads(self.configuration_json)['root'].get('sliders'):
+            sliders = json.loads(self.configuration_json)['root']['sliders']['slider']
+            if type(sliders) == dict:
+                sliders = [sliders]
+            vars = [x['@var'] for x in sliders]
 
-        slider_div = '<span class="{element_class}_slider" id="{element_id}_slider_{var}" \
-        data-var="{var}"></span>'
+            slider_div = '<span class="{element_class}_slider" id="{element_id}_slider_{var}" \
+            data-var="{var}"></span>'
 
-        for var in vars:
-            html_string = re.sub(r'\$slider\s+' + var + r'\$',
-                                slider_div.format(element_class=self.html_class,
-                                                  element_id=self.html_id,
-                                                  var=var),
-                                html_string, flags=re.IGNORECASE | re.UNICODE)
+            for var in vars:
+                html_string = re.sub(r'\$slider\s+' + var + r'\$',
+                                    slider_div.format(element_class=self.html_class,
+                                                      element_id=self.html_id,
+                                                      var=var),
+                                    html_string, flags=re.IGNORECASE | re.UNICODE)
 
-        # substitute numbers
-        inputs = json.loads(self.configuration_json)['root']['inputs']['input']
-        if type(inputs) == dict:
-            inputs = [inputs]
-        vars = [x['@var'] for x in inputs]
+        # substitute numbers if we have them
+        if json.loads(self.configuration_json)['root'].get('inputs'):
+            inputs = json.loads(self.configuration_json)['root']['inputs']['input']
+            if type(inputs) == dict:
+                inputs = [inputs]
+            vars = [x['@var'] for x in inputs]
 
-        input_div = '<span class="{element_class}_input" id="{element_id}_input_{var}" \
-        data-var="{var}"></span>'
+            input_div = '<span class="{element_class}_input" id="{element_id}_input_{var}" \
+            data-var="{var}"></span>'
 
-        for var in vars:
-            html_string = re.sub(r'\$input\s+' + var + r'\$',
-                                input_div.format(element_class=self.html_class,
-                                                 element_id=self.html_id,
-                                                 var=var),
-                                html_string, flags=re.IGNORECASE | re.UNICODE)
+            for var in vars:
+                html_string = re.sub(r'\$input\s+' + var + r'\$',
+                                    input_div.format(element_class=self.html_class,
+                                                     element_id=self.html_id,
+                                                     var=var),
+                                    html_string, flags=re.IGNORECASE | re.UNICODE)
         # import ipdb; ipdb.set_trace()
         return html_string
 

From dbf1dc682bb0c8411f94b8e5ad54ab7afca2096f Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Thu, 13 Dec 2012 17:23:53 +0200
Subject: [PATCH 260/541] Added some debug output information via logme().

---
 .../js/src/graphical_slider_tool/graph.js     | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index bf74933f0f..14594a7b3b 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -2,7 +2,7 @@
 // define() functions from Require JS available inside the anonymous function.
 (function (requirejs, require, define) {
 
-define('Graph', [], function () {
+define('Graph', ['logme'], function (logme) {
 
     return Graph;
 
@@ -141,46 +141,72 @@ define('Graph', [], function () {
                 'end': 10,
                 'step': 0.1
             };
+            logme('Default xrange:', xrange);
 
             // The 'xrange' is a string containing two floating point numbers
             // separated by a comma. The first number is the starting
             // x-coordinate , the second number is the ending x-coordinate
             if (typeof config.plot['xrange'] === 'string') {
+                logme('xrange is a string; xrange = "' + config.plot['xrange'] + '".');
+
                 xRangeStr = config.plot['xrange'];
                 xRangeBlobs = xRangeStr.split(',');
 
                 if (xRangeBlobs.length === 2) {
+                    logme('xrange contains 2 blobs; 1 -> "' + xRangeBlobs[0] + '", 2 -> "' + xRangeBlobs[1] + '".');
 
                     tempNum = parseFloat(xRangeBlobs[0]);
                     if (isNaN(tempNum) === false) {
                         xrange.start = tempNum;
+
+                        logme('First blob was parsed as a float. xrange.start = "' + xrange.start + '".');
+                    } else {
+                        logme('ERROR: First blob was parsed as a NaN.');
                     }
 
                     tempNum = parseFloat(xRangeBlobs[1]);
                     if (isNaN(tempNum) === false) {
                         xrange.end = tempNum;
+
+                        logme('Second blob was parsed as a float. xrange.end = "' + xrange.end + '".');
+                    } else {
+                        logme('ERROR: Second blob was parsed as a NaN.');
                     }
 
                     if (xrange.start >= xrange.end) {
                         xrange.start = 0;
                         xrange.end = 10;
+
+                        logme('xrange.start is greater than xrange.end - will set defaults. xrange.start = "' + xrange.start + '". xrange.end = "' + xrange.end + '".');
                     }
 
+                } else {
+                    logme('ERROR: xrange does not contain 2 blobs.');
                 }
+            } else {
+                logme('ERROR: xrange is not a string.');
             }
 
             // The user can specify the number of points. However, internally
             // we will use it to generate a 'step' - i.e. the distance (on
             // x-axis) between two adjacent points.
             if (typeof config.plot['num_points'] === 'string') {
+                logme('num_points is a string. num_points = "' + config.plot['num_points'] + '".');
+
                 tempNum = parseInt(config.plot['num_points'], 10);
                 if (
-                    (isNaN(tempNum) === false) &&
+                    (isNaN(tempNum) === false) ||
                     (tempNum >= 2) &&
                     (tempNum <= 500)
                 ) {
+                    logme('num_points was parsed as a number. num_points = "' + tempNum + '".');
                     xrange.step = (xrange.end - xrange.start) / (tempNum - 1);
+                    logme('xrange.step = "' + xrange.step + '".');
+                } else {
+                    logme('ERROR: num_points was not parsed as a number, or num_points < 2, or num_points > 500.');
                 }
+            } else {
+                logme('ERROR: num_points is not a string.');
             }
         }
 

From 4e78e58902e9b2ea9c251534cdb52a348b7bd846 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Fri, 14 Dec 2012 11:00:25 +0200
Subject: [PATCH 261/541] Mod to XML GST.

---
 common/lib/xmodule/xmodule/gst_module.py               |  7 +++----
 .../xmodule/js/src/graphical_slider_tool/inputs.js     |  4 ++--
 .../xmodule/js/src/graphical_slider_tool/sliders.js    | 10 +++++++++-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index 74cc70e076..276762408f 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -69,8 +69,7 @@ class GraphicalSliderToolModule(XModule):
         Simple variant: slider and plot controls are not inside any tag.
         """
         #substitute plot
-        plot_div = '<div class="' + self.html_class + '_plot" id="' + self.html_id + '_plot" \
-        style="width: 600px; height: 600px; padding: 0px; position: relative;">This is plot</div>'
+        plot_div = '<div class="' + self.html_class + '_plot" id="' + self.html_id + '_plot"></div>'
         html_string = html_string.replace('$plot$', plot_div)
 
         # substitute sliders if we have them
@@ -81,7 +80,7 @@ class GraphicalSliderToolModule(XModule):
             vars = [x['@var'] for x in sliders]
 
             slider_div = '<span class="{element_class}_slider" id="{element_id}_slider_{var}" \
-            data-var="{var}"></span>'
+            data-var="{var}" data-el_width="120"></span>'
 
             for var in vars:
                 html_string = re.sub(r'\$slider\s+' + var + r'\$',
@@ -98,7 +97,7 @@ class GraphicalSliderToolModule(XModule):
             vars = [x['@var'] for x in inputs]
 
             input_div = '<span class="{element_class}_input" id="{element_id}_input_{var}" \
-            data-var="{var}"></span>'
+            data-var="{var}" data-el_width="60"></span>'
 
             for var in vars:
                 html_string = re.sub(r'\$input\s+' + var + r'\$',
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
index 595021023f..b5d3217a85 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
@@ -124,8 +124,8 @@ define('Inputs', [], function () {
                 'text-align': 'left',
                 'outline': 'none',
                 'cursor': 'text',
-                'height': '15px',
-                'width': '50px'
+                'height': '15px'
+                // 'width': '50px'
             });
 
             // And finally, publish the text input element to the page.
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
index ea6398caad..ef3d5bb6d3 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
@@ -164,7 +164,15 @@ define('Sliders', [], function () {
             }
 
             // Set the defined width to the slider.
-            sliderEl.width(sliderWidth);
+            // sliderEl.width(sliderWidth);
+
+            console.log('[Before]');
+            console.log('sliderEl.width: ' + sliderEl.width());
+
+            sliderEl.width(spanEl.data('el_width'));
+
+            console.log('[After]');
+            console.log('sliderEl.width: ' + sliderEl.width());
 
             // And make sure that it gets added to the page as an
             // 'inline-block' element. This will allow for the insertion of the

From b6417c797b14ac4f952be768f33416f6796d25c0 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 14 Dec 2012 16:10:47 +0200
Subject: [PATCH 262/541] change parsing to support new format of xml

---
 common/lib/xmodule/xmodule/gst_module.py | 97 ++++++++++++++++--------
 1 file changed, 67 insertions(+), 30 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index 276762408f..87ce2a8b68 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -70,42 +70,79 @@ class GraphicalSliderToolModule(XModule):
         """
         #substitute plot
         plot_div = '<div class="' + self.html_class + '_plot" id="' + self.html_id + '_plot"></div>'
-        html_string = html_string.replace('$plot$', plot_div)
+        html_string = re.sub(r'\$[^\$]*plot[^\$]*\$',
+                plot_div, html_string, flags=re.IGNORECASE | re.UNICODE)
 
-        # substitute sliders if we have them
-        if json.loads(self.configuration_json)['root'].get('sliders'):
-            sliders = json.loads(self.configuration_json)['root']['sliders']['slider']
-            if type(sliders) == dict:
-                sliders = [sliders]
-            vars = [x['@var'] for x in sliders]
+        # get variables
+        if json.loads(self.configuration_json)['root'].get('parameters'):
+            variables = json.loads(self.configuration_json)['root']['parameters']['param']
+            if type(variables) == dict:
+                variables = [variables]
+            variables = [x['@var'] for x in variables]
+        else:
+            return html_string
 
-            slider_div = '<span class="{element_class}_slider" id="{element_id}_slider_{var}" \
-            data-var="{var}" data-el_width="120"></span>'
+        #substitute sliders
+        slider_div = '<div class="{element_class}_slider" \
+                                   id="{element_id}_slider_{var}" \
+                                   data-var="{var}" data-el_width="{width}"\
+                     </div>'
+        for var in variables:
+            # find $slider var='var' ... $
+            instances = re.findall(r'\$slider\s+(?=.*var\=[\"\']' + var + '[\"\'])' \
+                          + r'[^\$]*\$', html_string)
+            if instances:  # if presented
+                slider_def = instances[0]  # get $slider var='var' ... $ string
+                # get width
+                width = re.search(r'(?=.*width\=[\"\'](\d+)[\"\'])', slider_def)
+                if width:
+                    width = width.groups()[0]
+                else:  # no width parameter
+                    width = ''
+                # substitue parameters to slider div
+                replacement = slider_div.format(element_class=self.html_class,
+                                            element_id=self.html_id,
+                                            var=var,
+                                            width=width)
+                # subsitute $slider var='var' ... $ in html_srting to proper
+                # html div element
+                html_string = re.sub(r'\$slider\s+(?=.*var\=[\"\'](' + \
+                    var + ')[\"\'])' + r'[^\$]*\$',
+                replacement, html_string, flags=re.IGNORECASE | re.UNICODE)
 
-            for var in vars:
-                html_string = re.sub(r'\$slider\s+' + var + r'\$',
-                                    slider_div.format(element_class=self.html_class,
-                                                      element_id=self.html_id,
-                                                      var=var),
-                                    html_string, flags=re.IGNORECASE | re.UNICODE)
+        # substitute inputs if we have them
+        input_el = '<input class="{element_class}_input" \
+                                  id="{element_id}_input_{var}" \
+                                   data-var="{var}" data-el_width="{width}" \
+                                   data-el_readonly="{readonly}"> \
+                     </input>'
 
-        # substitute numbers if we have them
-        if json.loads(self.configuration_json)['root'].get('inputs'):
-            inputs = json.loads(self.configuration_json)['root']['inputs']['input']
-            if type(inputs) == dict:
-                inputs = [inputs]
-            vars = [x['@var'] for x in inputs]
+        input_index = 0  # make multiple inputs for same variable have
+        # different id
 
-            input_div = '<span class="{element_class}_input" id="{element_id}_input_{var}" \
-            data-var="{var}" data-el_width="60"></span>'
+        for var in variables:  # multiple inputs test
+            input_index = +1
+            instances = re.findall(r'\$input\s+(?=.*var\=[\"\']' + var + '[\"\'])' \
+                          + r'[^\$]*\$', html_string)
+            # import ipdb; ipdb.set_trace()
+            for input_def in instances:
+                width = re.search(r'(?=.*width\=[\"\'](\d+)[\"\'])', input_def)
+                if width:
+                    width = width.groups()[0]
+                else:
+                    width = ''
+                readonly = re.search(r'(?=.*readonly\=[\"\'](\w+)[\"\'])', input_def)
+                if readonly:
+                    readonly = readonly.groups()[0]
+                else:
+                    readonly = ''
 
-            for var in vars:
-                html_string = re.sub(r'\$input\s+' + var + r'\$',
-                                    input_div.format(element_class=self.html_class,
-                                                     element_id=self.html_id,
-                                                     var=var),
-                                    html_string, flags=re.IGNORECASE | re.UNICODE)
-        # import ipdb; ipdb.set_trace()
+                replacement = input_el.format(element_class=self.html_class,
+                        element_id=self.html_id + '_' + str(input_index),
+                        var=var, width=width, readonly=readonly)
+                html_string = re.sub(r'\$input\s+(?=.*var\=[\"\'](' + \
+                                     var + ')[\"\'])' + r'[^\$]*\$',
+                replacement, html_string, flags=re.IGNORECASE | re.UNICODE)
         return html_string
 
     def get_configuration(self):

From 29b4299070f4d2c93154d4a005207919a7de09c2 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Fri, 14 Dec 2012 16:25:24 +0200
Subject: [PATCH 263/541] Work in progress on updating version of GST.

---
 .../js/src/graphical_slider_tool/state.js     | 211 +++++++++++-------
 1 file changed, 135 insertions(+), 76 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
index 996384fe74..6f55cf18e5 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
@@ -2,7 +2,7 @@
 // define() functions from Require JS available inside the anonymous function.
 (function (requirejs, require, define) {
 
-define('State', [], function () {
+define('State', ['logme'], function (logme) {
     // Since there will be (can be) multiple GST on a page, and each will have
     // a separate state, we will create a factory constructor function. The
     // constructor will expect the ID of the DIV with the GST contents, and the
@@ -14,79 +14,67 @@ define('State', [], function () {
 
     // function: State
     function State(gstId, config) {
-        var constants, c1, plotDiv;
+        var parameters, allParameterNames, allParameterValues, plotDiv;
 
-        constants = {};
+        parameters = {};
 
-        // We must go through all of the input, and slider elements and
-        // retrieve all of the available constants. These will be added to an
-        // object as it's properties.
-        //
-        // First we will go through all of the inputs.
-        if ((typeof config.inputs !== 'undefined') &&
-            (typeof config.inputs.input !== 'undefined')) {
-            if ($.isArray(config.inputs.input)) {
-
-                // config.inputs.input is an array
-                for (c1 = 0; c1 < config.inputs.input.length; c1++) {
-                    addConstFromInput(config.inputs.input[c1]);
-                }
-
-            } else if ($.isPlainObject(config.inputs.input)) {
-
-                // config.inputs.input is an object
-                addConstFromInput(config.inputs.input);
+        if (
+            (typeof config.parameters !== 'undefined') &&
+            (typeof config.parameters.param !== 'undefined')
+        ) {
 
+            // If config.parameters.param is an array, pass it to the processor
+            // element by element.
+            if ($.isArray(config.parameters.param) === true) {
+                (function (c1) {
+                    while (c1 < config.parameters.param.length) {
+                        addConstFromInput(config.parameters.param[c1]);
+                        c1 += 1;
+                    }
+                }(0));
             }
-        }
 
-        // Now we will go through all of the sliders.
-        if ((typeof config.sliders !== 'undefined') &&
-            (typeof config.sliders.slider !== 'undefined')) {
-            if ($.isArray(config.sliders.slider)) {
-                // config.sliders.slider is an array
-
-                for (c1 = 0; c1 < config.sliders.slider.length; c1++) {
-                    addConstFromSlider(config.sliders.slider[c1]);
-                }
-            } else if ($.isPlainObject(config.sliders.slider)) {
-                // config.sliders.slider is an object
-                addConstFromSlider(config.sliders.slider);
+            // If config.parameters.param is an object, pass this object to the
+            // processor directly.
+            else if ($.isPlainObject(config.inputs.input) === true) {
+                addConstFromInput(config.parameters.param);
             }
+
         }
 
         // The constructor will return an object with methods to operate on
         // it's private properties.
         return {
-            'getConstValue': getConstValue,
-            'setConstValue': setConstValue,
-            'bindUpdatePlotEvent': bindUpdatePlotEvent,
-            'getAllConstantNames': getAllConstantNames,
-            'getAllConstantValues': getAllConstantValues
+            'getParameterValue': getParameterValue,
+            'setParameterValue': setParameterValue,
+
+            'getAllParameterNames': getAllParameterNames,
+            'getAllParameterValues': getAllParameterValues,
+
+            'bindUpdatePlotEvent': bindUpdatePlotEvent
         };
 
-        function getAllConstantNames() {
-            var constName, allConstNames;
+        // ####################################################################
+        //
+        // To get all parameter names, you would do:
+        //
+        //     allParamNames = getAllParameterProperties('name');
+        //
+        // To get all parameter values, you would do:
+        //
+        //     allParamValues = getAllParameterProperties('value');
+        //
+        // ####################################################################
+        function getAllParameterProperties(propertyName) {
+            var paramName, allParamProperties;
 
-            allConstNames = [];
+            allParamProperties = [];
 
-            for (constName in constants) {
-                allConstNames.push(constName);
+            for (paramName in parameters) {
+                allParamProperties.push(parameters[paramName][propertyName]);
             }
 
-            return allConstNames;
-        }
-
-        function getAllConstantValues() {
-            var constName, allConstValues;
-
-            allConstValues = [];
-
-            for (constName in constants) {
-                allConstValues.push(constants[constName]);
-            }
-
-            return allConstValues;
+            return allParamProperties;
         }
 
         function bindUpdatePlotEvent(newPlotDiv, callback) {
@@ -95,7 +83,9 @@ define('State', [], function () {
             plotDiv.bind('update_plot', callback);
         }
 
-        function getConstValue(constName) {
+        function getParameterValue(constName) {
+
+
             if (constants.hasOwnProperty(constName) === false) {
                 // If the name of the constant is not tracked by state, return an
                 // 'undefined' value.
@@ -131,31 +121,100 @@ define('State', [], function () {
             }
         }
 
-        function addConstFromInput(obj) {
-            var constName, constValue;
+        // ####################################################################
+        //
+        // Function: processParameter(obj)
+        // -------------------------------
+        //
+        //
+        // This function will be run once for each instance of a GST.
+        //
+        // 'newParamObj' must be empty from the start for each invocation of
+        // this function, that's why we will declare it locally.
+        //
+        // We will parse the passed object 'obj' and populate the 'newParamObj'
+        // object with required properties.
+        //
+        // Since there will be many properties that are of type floating-point
+        // number, we will have a separate function for parsing them.
+        //
+        // processParameter() will fail right away if 'obj' does not have a
+        // '@var' property which represents the name of the parameter we want
+        // to process.
+        //
+        // If, after all of the properties have been processed, we reached the
+        // end of the function successfully, the 'newParamObj' will be added to
+        // the 'parameters' object (that is defined in the scope of State()
+        // function) as a property named as the name of the parameter.
+        //
+        // If at least one of the properties from 'obj' does not get correctly
+        // parsed, then the parameter represented by 'obj' will be disregarded.
+        // It will not be available to user-defined plotting functions, and
+        // things will most likely break. We will notify the user about this.
+        //
+        // ####################################################################
+        function processParameter(obj) {
+            var newParamObj;
 
-            // The name of the constant is obj['@var']. The value (initial) of
-            // the constant is obj['@initial']. I have taken the word 'initial'
-            // into brackets, because multiple inputs and/or sliders can
-            // represent the state of a single constant.
+            if (typeof obj['@var'] !== 'string') {
+                logme(
+                    '[ERROR] state.processParameter(obj): obj["' + attrName + '"] is not a string.'
+                );
+            }
 
-            if (typeof obj['@var'] === 'undefined') {
+            newParamObj = {};
+
+            processString('@var', 'name');
+
+            processFloat('@min', 'min');
+            processFloat('@max', 'max');
+            processFloat('@initial', 'value');
+
+            if (checkRequired('name', 'min', 'max', 'value') === false) {
+                logme('Not creating a parameter.');
                 return;
             }
 
-            constName = obj['@var'];
-
-            if (typeof obj['@initial'] === 'undefined') {
-                constValue = 0;
-            } else {
-                constValue = parseFloat(obj['@initial']);
-
-                if (isNaN(constValue) === true) {
-                    constValue = 0;
-                }
-            }
 
             constants[constName] = constValue;
+
+            return;
+
+            function processFloat(attrName, newAttrName) {
+                var attrValue;
+
+                if (typeof obj[attrName] !== 'string') {
+                    logme(
+                        '[ERROR] state.processParameter(obj): obj["' + attrName + '"] is not a string.'
+                    );
+
+                    return;
+                } else {
+                    attrValue = parseFloat(obj[attrName]);
+
+                    if (isNaN(attrValue) === true) {
+                        logme(
+                            '[ERROR] state.processParameter(obj): for attrName = "' + attrName + '" attrValue is NaN.'
+                        );
+
+                        return;
+                    }
+                }
+
+                newParamObj[newAttrName] = paramValue;
+            }
+
+            function processString(attrName, newAttrName) {
+                if (typeof obj[attrName] !== 'string') {
+                    logme(
+                        '[ERROR] state.processParameter(obj): obj["' + attrName + '"] is not a string.'
+                    );
+
+                    return;
+                }
+
+                newParamObj[newAttrName] = obj[attrName];
+            }
         }
 
         function addConstFromSlider(obj) {

From 488140bf27d36cf3bd7593f67c4ee5adafbc0cea Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Fri, 14 Dec 2012 19:03:47 +0200
Subject: [PATCH 264/541] Work in progress on rewriting GST.

---
 .../js/src/graphical_slider_tool/state.js     | 134 ++++++++----------
 1 file changed, 60 insertions(+), 74 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
index 6f55cf18e5..c647f96846 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
@@ -83,19 +83,48 @@ define('State', ['logme'], function (logme) {
             plotDiv.bind('update_plot', callback);
         }
 
-        function getParameterValue(constName) {
+        function getParameterValue(paramName) {
 
-
-            if (constants.hasOwnProperty(constName) === false) {
-                // If the name of the constant is not tracked by state, return an
-                // 'undefined' value.
+            // If the name of the constant is not tracked by state, return an
+            // 'undefined' value.
+            if (parameters.hasOwnProperty(paramName) === false) {
                 return;
             }
 
-            return constants[constName];
+            return parameters[paramname].value;
         }
 
-        function setConstValue(constName, constValue) {
+        // ####################################################################
+        //
+        // Function: setParameterValue(paramName, paramValue, element)
+        // --------------------------------------------------
+        //
+        // This function can be called from a callback, registered by a slider
+        // or a text input, when specific events ('slide' or 'change') are
+        // triggered.
+        //
+        // The 'paramName' is the name of the parameter in 'parameters' object
+        // whose value must be updated to the new value of 'paramValue'.
+        //
+        // Before we update the value, we must check that:
+        //
+        //     1.) the parameter named as 'paramName' actually exists in the
+        //         'parameters' object;
+        //     2.) the value 'paramValue' is a valid floating-point number, and
+        //         it lies within the range specified by the 'min' and 'max'
+        //         properties of the stored parameter object.
+        //
+        // If 'paramName' and 'paramValue' turn out to be valid, we will update
+        // the stored value in the parameter with the new value, and also
+        // update all of the text inputs and the slider that correspond to this
+        // parameter (if any), so that they reflect the new parameter's value.
+        //
+        // If something went wrong (for example the new value is outside the
+        // allowed range), then we will reset the 'element' to display the
+        // original value.
+        //
+        // ####################################################################
+        function setParameterValue(paramName, paramValue, element) {
             var inputDiv;
 
             if (constants.hasOwnProperty(constName) === false) {
@@ -119,7 +148,7 @@ define('State', ['logme'], function (logme) {
             if (inputDiv.length !== 0) {
                 inputDiv.val(constValue);
             }
-        }
+        } // End-of: function setParameterValue
 
         // ####################################################################
         //
@@ -154,27 +183,30 @@ define('State', ['logme'], function (logme) {
         //
         // ####################################################################
         function processParameter(obj) {
-            var newParamObj;
+            var paramName, newParamObj;
 
             if (typeof obj['@var'] !== 'string') {
                 logme(
-                    '[ERROR] state.processParameter(obj): obj["' + attrName + '"] is not a string.'
+                    '[ERROR] State.processParameter(obj): obj["@var"] is not a string.',
+                    obj['@var'],
+                    '---> Not adding a parameter.'
                 );
-            }
 
-            newParamObj = {};
-
-            processString('@var', 'name');
-
-            processFloat('@min', 'min');
-            processFloat('@max', 'max');
-            processFloat('@initial', 'value');
-
-            if (checkRequired('name', 'min', 'max', 'value') === false) {
-                logme('Not creating a parameter.');
                 return;
             }
 
+            paramName = obj['@var'];
+            newParamObj = {};
+
+            if (
+                (processFloat('@min', 'min') === false) ||
+                (processFloat('@max', 'max') === false) ||
+                (processFloat('@initial', 'value') === false)
+            ) {
+                logme('---> Not adding a parameter named "' + paramName + '".');
+
+                return;
+            }
 
             constants[constName] = constValue;
 
@@ -185,10 +217,11 @@ define('State', ['logme'], function (logme) {
 
                 if (typeof obj[attrName] !== 'string') {
                     logme(
-                        '[ERROR] state.processParameter(obj): obj["' + attrName + '"] is not a string.'
+                        '[ERROR] state.processParameter(obj): obj["' + attrName + '"] is not a string.',
+                        obj[attrName]
                     );
 
-                    return;
+                    return false;
                 } else {
                     attrValue = parseFloat(obj[attrName]);
 
@@ -197,62 +230,15 @@ define('State', ['logme'], function (logme) {
                             '[ERROR] state.processParameter(obj): for attrName = "' + attrName + '" attrValue is NaN.'
                         );
 
-                        return;
+                        return false;
                     }
                 }
 
                 newParamObj[newAttrName] = paramValue;
-            }
 
-            function processString(attrName, newAttrName) {
-                if (typeof obj[attrName] !== 'string') {
-                    logme(
-                        '[ERROR] state.processParameter(obj): obj["' + attrName + '"] is not a string.'
-                    );
-
-                    return;
-                }
-
-                newParamObj[newAttrName] = obj[attrName];
-            }
-        }
-
-        function addConstFromSlider(obj) {
-            var constName, constValue, rangeBlobs;
-
-            // The name of the constant is obj['@var']. The value (initial) of
-            // the constant is the second blob of the 'range' parameter of the
-            // slider which is obj['@range']. Multiple sliders and/or inputs
-            // can represent the same constant - therefore 'initial' is in
-            // brackets. The range is a string composed of 3 blobs, separated
-            // by commas.
-
-            if (typeof obj['@var'] === 'undefined') {
-                return;
-            }
-
-            constName = obj['@var'];
-
-            if (typeof obj['@range'] !== 'string') {
-                constValue = 0;
-            } else {
-                rangeBlobs = obj['@range'].split(',');
-
-                // We must have gotten exactly 3 blobs (pieces) from the split.
-                if (rangeBlobs.length !== 3) {
-                    constValue = 0;
-                } else {
-                    // Get the second blob from the split string.
-                    constValue = parseFloat(rangeBlobs[1]);
-
-                    if (isNaN(constValue) === true) {
-                        constValue = 0;
-                    }
-                }
-            }
-
-            constants[constName] = constValue;
-        }
+                return true;
+            } // End-of: function processFloat
+        } // End-of: function processParameter
     } // End-of: function State
 });
 

From dc42f1813f8bf09efe87494334e7f6c1036d9f90 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Mon, 17 Dec 2012 15:40:03 +0200
Subject: [PATCH 265/541] GST: work in progress on refactoring.

---
 common/lib/xmodule/xmodule/gst_module.py      |   4 +-
 .../js/src/graphical_slider_tool/graph.js     |  28 +--
 .../js/src/graphical_slider_tool/gst_main.js  |  15 +-
 .../js/src/graphical_slider_tool/inputs.js    | 149 +++++-------
 .../js/src/graphical_slider_tool/sliders.js   | 216 +++---------------
 .../js/src/graphical_slider_tool/state.js     | 134 ++++++++---
 6 files changed, 210 insertions(+), 336 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index 87ce2a8b68..0d6677c2ff 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -85,7 +85,7 @@ class GraphicalSliderToolModule(XModule):
         #substitute sliders
         slider_div = '<div class="{element_class}_slider" \
                                    id="{element_id}_slider_{var}" \
-                                   data-var="{var}" data-el_width="{width}"\
+                                   data-var="{var}" data-el_width="{width}">\
                      </div>'
         for var in variables:
             # find $slider var='var' ... $
@@ -151,7 +151,7 @@ class GraphicalSliderToolModule(XModule):
         """
         # root added for interface compatibility with xmltodict.parse
         self.configuration_json = json.dumps(
-                xmltodict.parse('<root>' +
+                xmltodict.parse('<root class="' + self.location.category + '">' +
                 stringify_children(self.definition['configuration'])
                              + '</root>'))
         return self.configuration_json
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 14594a7b3b..385386eebc 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -268,7 +268,7 @@ define('Graph', ['logme'], function (logme) {
             }
 
             function addFunction(funcString, color, line, dot, label) {
-                var newFunctionObject, func, constNames;
+                var newFunctionObject, func, paramNames;
 
                 // The main requirement is function string. Without it we can't
                 // create a function, and the series cannot be calculated.
@@ -283,19 +283,19 @@ define('Graph', ['logme'], function (logme) {
                     'dot': false
                 };
 
-                // Get all of the constant names defined by the user in the
+                // Get all of the parameter names defined by the user in the
                 // XML.
-                constNames = state.getAllConstantNames();
+                paramNames = state.getAllParameterNames();
 
                 // The 'x' is always one of the function parameters.
-                constNames.push('x');
+                paramNames.push('x');
 
                 // Must make sure that the function body also gets passed to
                 // the Function constructor.
-                constNames.push(funcString);
+                paramNames.push(funcString);
 
                 // Create the function from the function string, and all of the
-                // available constants + the 'x' variable as it's parameters.
+                // available parameters AND the 'x' variable as it's parameters.
                 // For this we will use the built-in Function object
                 // constructor.
                 //
@@ -303,7 +303,7 @@ define('Graph', ['logme'], function (logme) {
                 // likely the user supplied an invalid JavaScript function body
                 // string. In this case we will not proceed.
                 try {
-                    func = Function.apply(null, constNames);
+                    func = Function.apply(null, paramNames);
                 } catch (err) {
                     // Let's tell the user. He will see a nice red error
                     // message instead of a graph.
@@ -363,9 +363,9 @@ define('Graph', ['logme'], function (logme) {
         }
 
         function generateData() {
-            var c0, functionObj, seriesObj, dataPoints, constValues, x, y;
+            var c0, functionObj, seriesObj, dataPoints, paramValues, x, y;
 
-            constValues = state.getAllConstantValues();
+            paramValues = state.getAllParameterValues();
 
             dataSeries = [];
 
@@ -379,16 +379,16 @@ define('Graph', ['logme'], function (logme) {
                 for (x = xrange.start; x <= xrange.end; x += xrange.step) {
 
                     // Push the 'x' variable to the end of the parameter array.
-                    constValues.push(x);
+                    paramValues.push(x);
 
                     // We call the user defined function, passing all of the
-                    // available constant values. inside this function they
+                    // available parameter values. Inside this function they
                     // will be accessible by their names.
-                    y = functionObj.func.apply(window, constValues);
+                    y = functionObj.func.apply(window, paramValues);
 
-                    // Return the constValues array to how it was before we
+                    // Return the paramValues array to how it was before we
                     // added 'x' variable to the end of it.
-                    constValues.pop();
+                    paramValues.pop();
 
                     // Add the generated point to the data points set.
                     dataPoints.push([x, y]);
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
index 0b46eb42bb..4d5d1d12ae 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
@@ -8,26 +8,29 @@ define(
     // Even though it is not explicitly in this module, we have to specify
     // 'GeneralMethods' as a dependency. It expands some of the core JS objects
     // with additional useful methods that are used in other modules.
-    ['State', 'GeneralMethods', 'Sliders', 'Inputs', 'Graph'],
-    function (State, GeneralMethods, Sliders, Inputs, Graph) {
+    ['State', 'GeneralMethods', 'Sliders', 'Inputs', 'Graph', 'logme'],
+    function (State, GeneralMethods, Sliders, Inputs, Graph, logme) {
 
     return GstMain;
 
     function GstMain(gstId) {
-        var config, state;
+        var config, gstClass, state;
 
         // Get the JSON configuration, and parse it, and store as an object.
         config = JSON.parse($('#' + gstId + '_json').html()).root;
 
+        gstClass = config['@class'];
+        logme('gstClass: ' + gstClass);
+
         // Parse the configuration settings for sliders and text inputs, and
         // extract all of the defined constants (their names along with their
         // initial values).
-        state = State(gstId, config);
+        state = State(gstId, gstClass, config);
 
         // Create the sliders and the text inputs, attaching them to
         // approriate constants.
-        Sliders(gstId, config, state);
-        Inputs(gstId, config, state);
+        Sliders(gstId, gstClass, state);
+        Inputs(gstId, gstClass, state);
 
         // Configure and display the loop. Attach event for the graph to be
         // updated on any change of a slider or a text input.
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
index b5d3217a85..0365f40ea5 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
@@ -2,108 +2,60 @@
 // define() functions from Require JS available inside the anonymous function.
 (function (requirejs, require, define) {
 
-define('Inputs', [], function () {
+define('Inputs', ['logme'], function (logme) {
     return Inputs;
 
-    function Inputs(gstId, config, state) {
-        var constNamesUsed;
+    function Inputs(gstId, gstClass, state) {
+        var c1, paramName, allParamNames;
 
-        // There should not be more than one text input per a constant. This
-        // just does not make sense. However, nothing really prevents the user
-        // from specifying more than one text input for the same constant name.
-        // That's why we have to track which constant names already have
-        // text inputs for them, and prevent adding further text inputs to
-        // these constants.
-        //
-        // constNamesUsed is an object to which we will add properties having
-        // the name of the constant to which we are adding a text input to.
-        // When creating a new text input, we must consult with this object, to
-        // see if the constant name is not defined as it's property.
-        constNamesUsed = {};
+        allParamNames = state.getAllParameterNames();
 
-        // We will go thorugh all of the inputs, and those that have a valid
-        // '@var' property will be added to the page as a HTML text input
-        // element.
-        if ((typeof config.inputs !== 'undefined') &&
-            (typeof config.inputs.input !== 'undefined')) {
-            if ($.isArray(config.inputs.input)) {
+        console.log(allParamNames);
 
-                // config.inputs.input is an array. For each element, we will
-                // add a text input.
-                for (c1 = 0; c1 < config.inputs.input.length; c1++) {
-                    createInput(config.inputs.input[c1]);
+        for (c1 = 0; c1 < allParamNames.length; c1 += 1) {
+            $('#' + gstId).children('.' + gstClass + '_input').each(function (index, value) {
+                var inputDiv, paramName;
+
+                paramName = allParamNames[c1];
+
+                inputDiv = $(value);
+
+                if (paramName === inputDiv.data('var')) {
+                    createInput(inputDiv, paramName);
                 }
-            } else if ($.isPlainObject(config.inputs.input)) {
-
-                // config.inputs.input is an object. Add a text input for it.
-                createInput(config.inputs.input);
-
-            }
+            });
         }
 
-        function createInput(obj) {
-            var constName, constValue, spanEl, inputEl, readOnly;
+        return;
 
-            // The name of the constant is obj['@var']. If it is not specified,
-            // we will skip creating a text input for this constant.
-            if (typeof obj['@var'] !== 'string') {
-                return;
-            }
-            constName = obj['@var'];
+        function createInput(inputDiv, paramName) {
+            var paramObj, inputWidth, readOnly;
 
-            // We will not add a text input for a constant which already has a
-            // text input defined for it.
-            //
-            // We will add the constant name to the 'constNamesUsed' object in
-            // the end, when everything went successfully.
-            if (constNamesUsed.hasOwnProperty(constName)) {
-                return;
+            paramObj = state.getParamObj(paramName);
+
+            // We will define the width of the slider to a sensible default.
+            inputWidth = 400;
+
+            // See if it was specified by the user.
+            if (isFinite(parseInt(inputDiv.data('el_width'))) === true) {
+                inputWidth = parseInt(inputDiv.data('el_width'));
             }
 
-            // Multiple sliders and/or inputs can represent the same constant.
-            // Therefore we will get the most recent const value from the state
-            // object. If it is undefined, we will skip creating a text input
-            // for this constant.
-            constValue = state.getConstValue(constName);
-            if (constValue === undefined) {
-                return;
+            // Set the width of the element.
+            inputDiv.width(inputWidth);
+
+            inputDiv.css('display', 'inline-block');
+
+            readOnly = false;
+            if (inputDiv.attr('data-el_readonly').toLowerCase() === 'true') {
+                readOnly = true;
             }
 
-            // With the constant name, and the constant value being defined,
-            // lets get the element on the page into which the text input will
-            // be inserted.
-            spanEl = $('#' + gstId + '_input_' + constName);
-
-            // If a corresponding element for this constant does not exist on
-            // the page, we will not be making a text input.
-            if (spanEl.length === 0) {
-                return;
-            }
-
-            // Create the text input element.
-            inputEl = $('<input type"text" />');
-
-            // Set the current constant to the text input. It will be visible
-            // to the user.
-            inputEl.val(constValue);
-
-            // Before binding a 'change' event, we will check if this text
-            // input is specified as 'read only'.
-            //
-            // By default, this setting is false - the user can change the
-            // value in the text input.
-            readonly = false;
-            if (typeof obj['@readonly'] === 'string') {
-                if (obj['@readonly'] === 'true') {
-                    readonly = true;
-                }
-            }
-
-            if (readonly === true) {
+            if (readOnly === true) {
 
                 // In the case of a readonly config option, configure the text
                 // inputit as read-only, and NOT bind an event to it.
-                inputEl.attr('readonly', 'readonly');
+                inputDiv.attr('readonly', 'readonly');
 
             } else { // readonly !== true
 
@@ -111,14 +63,16 @@ define('Inputs', [], function () {
                 // the value of this text input, and presses 'enter' (or clicks
                 // somewhere else on the page), this event will be triggered, and
                 // our callback will be called.
-                inputEl.bind('change', inputOnChange);
+                inputDiv.bind('change', inputOnChange);
 
             }
 
+            inputDiv.val(paramObj.value);
+
             // Lets style the input element nicely. We will use the button()
             // widget for this since there is no native widget for the text
             // input.
-            inputEl.button().css({
+            inputDiv.button().css({
                 'font': 'inherit',
                 'color': 'inherit',
                 'text-align': 'left',
@@ -128,19 +82,22 @@ define('Inputs', [], function () {
                 // 'width': '50px'
             });
 
-            // And finally, publish the text input element to the page.
-            inputEl.appendTo(spanEl);
-
-            // Don't forget to add the constant to the list of used constants.
-            // Next time a slider for this constant will not be created.
-            constNamesUsed[constName] = true;
+            paramObj.inputDivs.push(inputDiv);
 
             return;
 
-            // When the user changes the value of this text input, the 'state'
-            // will be updated, forcing the plot to be redrawn.
+            // Update the 'state' - i.e. set the value of the parameter this
+            // input is attached to to a new value.
+            //
+            // This will cause the plot to be redrawn each time after the user
+            // changes the value in the input. Note that he has to either press
+            // 'Enter', or click somewhere else on the page in order for the
+            // 'change' event to be tiggered.
             function inputOnChange(event) {
-                state.setConstValue(constName, $(this).val());
+                var inputDiv;
+
+                inputDiv = $(this);
+                state.setParameterValue(paramName, inputDiv.val(), inputDiv);
             }
         }
     }
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
index ef3d5bb6d3..f41a43fde7 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
@@ -2,222 +2,70 @@
 // define() functions from Require JS available inside the anonymous function.
 (function (requirejs, require, define) {
 
-define('Sliders', [], function () {
+define('Sliders', ['logme'], function (logme) {
     return Sliders;
 
-    function Sliders(gstId, config, state) {
-        var constNamesUsed;
+    function Sliders(gstId, gstClass, state) {
+        var c1, paramName, allParamNames, sliderDiv;
 
-        // There should not be more than one slider per a constant. This just
-        // does not make sense. However, nothing really prevents the user from
-        // specifying more than one slider for the same constant name. That's
-        // why we have to track which constant names already have sliders for
-        // them, and prevent adding further sliders to these constants.
-        //
-        // constNamesUsed is an object to which we will add properties having
-        // the name of the constant to which we are adding a slider to. When
-        // creating a new slider, we must consult with this object, to see if
-        // the constant name is not defined as it's property.
-        constNamesUsed = {};
+        allParamNames = state.getAllParameterNames();
 
-        // We will go through all of the sliders. For each one, we will make a
-        // jQuery UI slider for it, attach "on change" events, and set it's
-        // state - initial value, max, and min parameters.
-        if ((typeof config.sliders !== 'undefined') &&
-            (typeof config.sliders.slider !== 'undefined')) {
-            if ($.isArray(config.sliders.slider)) {
+        for (c1 = 0; c1 < allParamNames.length; c1 += 1) {
+            paramName = allParamNames[c1];
 
-                // config.sliders.slider is an array. For each object in the
-                // array, create a slider.
-                for (c1 = 0; c1 < config.sliders.slider.length; c1++) {
-                    createSlider(config.sliders.slider[c1]);
-                }
-
-            } else if ($.isPlainObject(config.sliders.slider)) {
-
-                // config.sliders.slider is an object. Create a slider for it.
-                createSlider(config.sliders.slider);
+            logme('Looking for slider with ID: ' + gstId + '_slider_' + paramName);
+            sliderDiv = $('#' + gstId + '_slider_' + paramName);
 
+            if (sliderDiv.length === 1) {
+                logme('Found one slider DIV with such an ID.');
+                createSlider(sliderDiv, paramName);
+            } else {
+                logme('Did not find such a slider.');
             }
         }
 
-        function createSlider(obj) {
-            var constName, constValue, rangeBlobs, valueMin, valueMax, spanEl,
-                sliderEl, sliderWidth;
+        function createSlider(sliderDiv, paramName) {
+            var paramObj, sliderWidth;
 
-            // The name of the constant is obj['@var']. If it is not specified,
-            // we will skip creating a slider for this constant.
-            if (typeof obj['@var'] !== 'string') {
-                return;
-            }
-            constName = obj['@var'];
-
-            // We will not add a slider for a constant which already has a
-            // slider defined for it.
-            //
-            // We will add the constant name to the 'constNamesUsed' object in
-            // the end, when everything went successfully.
-            if (constNamesUsed.hasOwnProperty(constName)) {
-                return;
-            }
-
-            // Multiple sliders and/or inputs can represent the same constant.
-            // Therefore we will get the most recent const value from the state
-            // object. If it is undefined, then something terrible has
-            // happened! We will skip creating a slider for this constant.
-            constValue = state.getConstValue(constName);
-            if (constValue === undefined) {
-                return;
-            }
-
-            // The range is a string composed of 3 blobs, separated by commas.
-            // The first blob is the min value for the slider, the third blob
-            // is the max value for the slider.
-            if (typeof obj['@range'] !== 'string') {
-
-                // If the range is not a string, we will set a default range.
-                // No promise as to the quality of the data points that this
-                // range will produce.
-                valueMin = constValue - 10;
-                valueMax = constValue + 10;
-
-            } else {
-
-                // Separate the range string by commas, and store each blob as
-                // an element in an array.
-                rangeBlobs = obj['@range'].split(',');
-
-                // We must have gotten exactly 3 blobs (pieces) from the split.
-                if (rangeBlobs.length !== 3) {
-
-                    // Set some sensible defaults, if the range string was
-                    // split into more or less than 3 pieces.
-                    setDefaultMinMax();
-
-                } else {
-
-                    // Get the first blob from the split string. It is the min
-                    // value.
-                    valueMin = parseFloat(rangeBlobs[0]);
-
-                    // Is it a well-formed float number?
-                    if (isNaN(valueMin) === true) {
-
-                        // No? Then set a sensible default value.
-                        valueMin = constValue - 10;
-
-                    }
-
-                    // Get the third blob from the split string. It is the max.
-                    valueMax = parseFloat(rangeBlobs[2]);
-
-                    // Is it a well-formed float number?
-                    if (isNaN(valueMax) === true) {
-
-                        // No? Then set a sensible default value.
-                        valueMax = constValue + 10;
-
-                    }
-
-                    // Logically, the min, value, and max should make sense.
-                    // I.e. we will make sure that:
-                    //
-                    //     min <= value <= max
-                    //
-                    // If this is not the case, we will set some defaults.
-                    if ((valueMin > valueMax) ||
-                        (valueMin > constValue) ||
-                        (valueMax < constValue)) {
-
-                        // Set some sensible defaults, if min/value/max logic
-                        // is broken.
-                        setDefaultMinMax();
-
-                    }
-                }
-            }
-
-            // At this point we have the constant name, the constant value, and
-            // the min and max values for this slider. Lets get the element on
-            // the page into which the slider will be inserted.
-            spanEl = $('#' + gstId + '_slider_' + constName);
-
-            // If a corresponding element for this constant does not exist on
-            // the page, we will not be making a slider.
-            if (spanEl.length === 0) {
-                return;
-            }
-
-            // Create the slider DIV.
-            sliderEl = $('<div>');
+            paramObj = state.getParamObj(paramName);
 
             // We will define the width of the slider to a sensible default.
             sliderWidth = 400;
 
-            // Then we will see if one is provided in the config for this
-            // slider. If we find it, and it is a well-formed integer, we will
-            // use it, instead of the default width.
-            if (typeof obj['@width'] === 'string') {
-                if (isNaN(parseInt(obj['@width'], 10)) === false) {
-                    sliderWidth = parseInt(obj['@width'], 10);
-                }
+            // See if it was specified by the user.
+            if (isFinite(parseInt(sliderDiv.data('el_width'))) === true) {
+                sliderWidth = parseInt(sliderDiv.data('el_width'));
             }
 
-            // Set the defined width to the slider.
-            // sliderEl.width(sliderWidth);
+            // Set the width of the element.
+            sliderDiv.width(sliderWidth);
 
-            console.log('[Before]');
-            console.log('sliderEl.width: ' + sliderEl.width());
-
-            sliderEl.width(spanEl.data('el_width'));
-
-            console.log('[After]');
-            console.log('sliderEl.width: ' + sliderEl.width());
-
-            // And make sure that it gets added to the page as an
-            // 'inline-block' element. This will allow for the insertion of the
-            // slider into a paragraph, without the browser forcing it out of
-            // the paragraph onto a new line, separate line.
-            sliderEl.css('display', 'inline-block');
+            sliderDiv.css('display', 'inline-block');
 
             // Create a jQuery UI slider from the slider DIV. We will set
             // starting parameters, and will also attach a handler to update
             // the 'state' on the 'change' event.
-            sliderEl.slider({
-                'min': valueMin,
-                'max': valueMax,
-                'value': constValue,
-                'step': (valueMax - valueMin) / 50.0,
+            sliderDiv.slider({
+                'min': paramObj.min,
+                'max': paramObj.max,
+                'value': paramObj.value,
+                'step': paramObj.step,
 
                 // 'change': sliderOnChange,
-                'slide': sliderOnChange
+                'slide': sliderOnSlide
             });
 
-            // Append the slider DIV to the element on the page where the user
-            // wants to see it.
-            sliderEl.appendTo(spanEl);
-
-            // OK! So we made it this far...
-            //
-            // Adding the constant to the list of used constants. Next time a
-            // slider for this constant will not be created.
-            constNamesUsed[constName] = true;
+            paramObj.sliderDiv = sliderDiv;
 
             return;
 
-            // Update the 'state' - i.e. set the value of the constant this
+            // Update the 'state' - i.e. set the value of the parameter this
             // slider is attached to to a new value.
             //
             // This will cause the plot to be redrawn each time after the user
             // drags the slider handle and releases it.
-            function sliderOnChange(event, ui) {
-                state.setConstValue(constName, ui.value);
-            }
-
-            // The sensible defaults for the slider's range.
-            function setDefaultMinMax() {
-                valueMin = constValue - 10;
-                valueMax = constValue + 10;
+            function sliderOnSlide(event, ui) {
+                state.setParameterValue(paramName, ui.value, sliderDiv);
             }
         }
     }
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
index c647f96846..ed0ca6ac8b 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
@@ -13,11 +13,22 @@ define('State', ['logme'], function (logme) {
     return State;
 
     // function: State
-    function State(gstId, config) {
-        var parameters, allParameterNames, allParameterValues, plotDiv;
+    function State(gstId, gstClass, config) {
+        var parameters, allParameterNames, allParameterValues,
+            plotDiv;
 
+        // Initially, there are no parameters to track. So, we will instantiate
+        // an empty object.
+        //
+        // As we parse the JSON config object, we will add parameters as
+        // named properties (for example
+        //
+        //     parameters.a = {...};
+        //
+        // for the parameter 'a'.
         parameters = {};
 
+        // Check that the required object is available.
         if (
             (typeof config.parameters !== 'undefined') &&
             (typeof config.parameters.param !== 'undefined')
@@ -28,7 +39,7 @@ define('State', ['logme'], function (logme) {
             if ($.isArray(config.parameters.param) === true) {
                 (function (c1) {
                     while (c1 < config.parameters.param.length) {
-                        addConstFromInput(config.parameters.param[c1]);
+                        processParameter(config.parameters.param[c1]);
                         c1 += 1;
                     }
                 }(0));
@@ -37,44 +48,53 @@ define('State', ['logme'], function (logme) {
             // If config.parameters.param is an object, pass this object to the
             // processor directly.
             else if ($.isPlainObject(config.inputs.input) === true) {
-                addConstFromInput(config.parameters.param);
+                processParameter(config.parameters.param);
             }
 
         }
 
+        // Instead of building these arrays every time when some component
+        // requests them, we will create them in the beginning, and then update
+        // by element when some parameter's value changes.
+        //
+        // Then we can just return the required array, instead of iterating
+        // over all of the properties of the 'parameters' object, and
+        // extracting their names/values one by one.
+        allParameterNames = [];
+        allParameterValues = [];
+
+        generateHelperArrays();
+
+        logme(parameters, allParameterNames, allParameterValues);
+
         // The constructor will return an object with methods to operate on
         // it's private properties.
         return {
             'getParameterValue': getParameterValue,
             'setParameterValue': setParameterValue,
 
+            'getParamObj': getParamObj,
+
             'getAllParameterNames': getAllParameterNames,
             'getAllParameterValues': getAllParameterValues,
 
             'bindUpdatePlotEvent': bindUpdatePlotEvent
         };
 
-        // ####################################################################
-        //
-        // To get all parameter names, you would do:
-        //
-        //     allParamNames = getAllParameterProperties('name');
-        //
-        // To get all parameter values, you would do:
-        //
-        //     allParamValues = getAllParameterProperties('value');
-        //
-        // ####################################################################
-        function getAllParameterProperties(propertyName) {
-            var paramName, allParamProperties;
+        function getAllParameterNames() {
+            return allParameterNames;
+        }
 
-            allParamProperties = [];
+        function getAllParameterValues() {
+            return allParameterValues;
+        }
 
-            for (paramName in parameters) {
-                allParamProperties.push(parameters[paramName][propertyName]);
+        function getParamObj(paramName) {
+            if (parameters.hasOwnProperty(paramName) === false) {
+                return;
             }
 
-            return allParamProperties;
+            return parameters[paramName];
         }
 
         function bindUpdatePlotEvent(newPlotDiv, callback) {
@@ -118,6 +138,8 @@ define('State', ['logme'], function (logme) {
         // the stored value in the parameter with the new value, and also
         // update all of the text inputs and the slider that correspond to this
         // parameter (if any), so that they reflect the new parameter's value.
+        // Finally, the helper array 'allParameterValues' will also be updated
+        // to reflect the change.
         //
         // If something went wrong (for example the new value is outside the
         // allowed range), then we will reset the 'element' to display the
@@ -125,29 +147,50 @@ define('State', ['logme'], function (logme) {
         //
         // ####################################################################
         function setParameterValue(paramName, paramValue, element) {
-            var inputDiv;
+            var paramValueNum, c1;
 
-            if (constants.hasOwnProperty(constName) === false) {
-                // If the name of the constant is not tracked by state, return an
-                // 'undefined' value.
+            // If a parameter with the name specified by the 'paramName'
+            // parameter is not tracked by state, do not do anything.
+            if (parameters.hasOwnProperty(paramName) === false) {
                 return;
             }
 
-            if (isNaN(parseFloat(constValue)) === true) {
-                // We are interested only in valid float values.
+            // Try to convert the passed value to a valid floating-point
+            // number.
+            paramValueNum = parseFloat(paramValue);
+
+            if (
+                // We are interested only in valid float values. NaN, -INF,
+                // +INF we will disregard.
+                (isFinite(paramValueNum) === false) ||
+
+                // If the new parameter's value is valid, but lies outised of
+                // the parameter's allowed range, we will also disregard it.
+                (paramValueNum < parameters[paramName].min) ||
+                (paramValueNum > parameters[paramName].max)
+            ) {
+                // We will also change the element's value back to the current
+                // parameter's value.
+                element.val(parameters[paramName].value);
+
                 return;
             }
 
-            constants[constName] = parseFloat(constValue);
+            parameters[paramName].value = paramValueNum;
 
             if (plotDiv !== undefined) {
                 plotDiv.trigger('update_plot');
             }
 
-            inputDiv = $('#' + gstId + '_input_' + constName).children('input');
-            if (inputDiv.length !== 0) {
-                inputDiv.val(constValue);
+            for (c1 = 0; c1 < parameters[paramName].inputDivs.length; c1 += 1) {
+                parameters[paramName].inputDivs[c1].val(paramValueNum);
             }
+
+            if (parameters[paramName].sliderDiv !== null) {
+                parameters[paramName].sliderDiv.slider('value', paramValueNum);
+            }
+
+            allParameterValues[parameters[paramName].helperArrayIndex] = paramValueNum;
         } // End-of: function setParameterValue
 
         // ####################################################################
@@ -156,7 +199,8 @@ define('State', ['logme'], function (logme) {
         // -------------------------------
         //
         //
-        // This function will be run once for each instance of a GST.
+        // This function will be run once for each instance of a GST when
+        // parsing the JSON config object.
         //
         // 'newParamObj' must be empty from the start for each invocation of
         // this function, that's why we will declare it locally.
@@ -201,6 +245,7 @@ define('State', ['logme'], function (logme) {
             if (
                 (processFloat('@min', 'min') === false) ||
                 (processFloat('@max', 'max') === false) ||
+                (processFloat('@step', 'step') === false) ||
                 (processFloat('@initial', 'value') === false)
             ) {
                 logme('---> Not adding a parameter named "' + paramName + '".');
@@ -208,7 +253,10 @@ define('State', ['logme'], function (logme) {
                 return;
             }
 
-            constants[constName] = constValue;
+            newParamObj.inputDivs = [];
+            newParamObj.sliderDiv = null;
+
+            parameters[paramName] = newParamObj;
 
             return;
 
@@ -234,11 +282,29 @@ define('State', ['logme'], function (logme) {
                     }
                 }
 
-                newParamObj[newAttrName] = paramValue;
+                newParamObj[newAttrName] = attrValue;
 
                 return true;
             } // End-of: function processFloat
         } // End-of: function processParameter
+
+        // Populate 'allParameterNames' and 'allParameterValues' with data.
+        // Link each parameter object with the corresponding helper array via
+        // an index ('helperArrayIndex'). It will be the same for both of the
+        // arrays.
+        function generateHelperArrays() {
+            var paramName, c1;
+
+            c1 = 0;
+            for (paramName in parameters) {
+                allParameterNames.push(paramName);
+                allParameterValues.push(parameters[paramName].value);
+
+                parameters[paramName].helperArrayIndex = c1;
+
+                c1 += 1;
+            }
+        }
     } // End-of: function State
 });
 

From 6c25bda20f0555cf62de2e2c695224aa25712e7d Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Mon, 17 Dec 2012 18:04:49 +0200
Subject: [PATCH 266/541] added style and removed width

---
 common/lib/xmodule/xmodule/gst_module.py | 76 +++++++++++++++---------
 1 file changed, 47 insertions(+), 29 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index 0d6677c2ff..94ffa3d1d3 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -69,9 +69,19 @@ class GraphicalSliderToolModule(XModule):
         Simple variant: slider and plot controls are not inside any tag.
         """
         #substitute plot
-        plot_div = '<div class="' + self.html_class + '_plot" id="' + self.html_id + '_plot"></div>'
-        html_string = re.sub(r'\$[^\$]*plot[^\$]*\$',
-                plot_div, html_string, flags=re.IGNORECASE | re.UNICODE)
+        plot_div = '<div class="{element_class}__plot" id="{element_id}_plot \
+                    style="{style}"></div>'
+        # extract css style from plot
+        plot_def = re.findall(r'\$\s+plot[^\$]*\$', html_string)
+        style = re.search(r'(?=.*width\=[\"\'](.*)[\"\'])', plot_def)
+        if style:
+            style = style.groups()[0]
+        else:  # no style parameter
+            style = ''
+        replacement = plot_div.format(element_class=self.html_class,
+                                            style=style)
+        html_string = re.sub(r'\$\s+plot[^\$]*\$', replacement, html_string,
+                        flags=re.IGNORECASE | re.UNICODE)
 
         # get variables
         if json.loads(self.configuration_json)['root'].get('parameters'):
@@ -85,62 +95,70 @@ class GraphicalSliderToolModule(XModule):
         #substitute sliders
         slider_div = '<div class="{element_class}_slider" \
                                    id="{element_id}_slider_{var}" \
-                                   data-var="{var}" data-el_width="{width}">\
+                                   data-var="{var}" data-el_style="{style}">\
                      </div>'
         for var in variables:
             # find $slider var='var' ... $
-            instances = re.findall(r'\$slider\s+(?=.*var\=[\"\']' + var + '[\"\'])' \
+            instances = re.findall(r'\$\s+slider\s+(?=.*var\=[\"\']' + var + '[\"\'])' \
                           + r'[^\$]*\$', html_string)
-            if instances:  # if presented
+            if instances:  # if presented, only one slider per var
                 slider_def = instances[0]  # get $slider var='var' ... $ string
-                # get width
-                width = re.search(r'(?=.*width\=[\"\'](\d+)[\"\'])', slider_def)
-                if width:
-                    width = width.groups()[0]
-                else:  # no width parameter
-                    width = ''
-                # substitue parameters to slider div
+                # extract var for proper style extraction further
+                var_substring = re.search(r'(var\=[\"\']' + var + r'[\"\'])',
+                                          slider_def)
+                slider_def = slider_def.replace(var_substring, '')
+                # get style
+                style = re.search(r'(?=.*style\=[\"\'](.*)[\"\'])', slider_def)
+                if style:
+                    style = style.groups()[0]
+                else:  # no style parameter
+                    style = ''
+                # substitute parameters to slider div
                 replacement = slider_div.format(element_class=self.html_class,
                                             element_id=self.html_id,
-                                            var=var,
-                                            width=width)
+                                            var=var, style=style)
                 # subsitute $slider var='var' ... $ in html_srting to proper
                 # html div element
-                html_string = re.sub(r'\$slider\s+(?=.*var\=[\"\'](' + \
+                html_string = re.sub(r'\$\s+slider\s+(?=.*var\=[\"\'](' + \
                     var + ')[\"\'])' + r'[^\$]*\$',
                 replacement, html_string, flags=re.IGNORECASE | re.UNICODE)
 
         # substitute inputs if we have them
         input_el = '<input class="{element_class}_input" \
                                   id="{element_id}_input_{var}" \
-                                   data-var="{var}" data-el_width="{width}" \
+                                   data-var="{var}" data-el_style="{style}" \
                                    data-el_readonly="{readonly}"> \
                      </input>'
 
         input_index = 0  # make multiple inputs for same variable have
         # different id
 
-        for var in variables:  # multiple inputs test
+        for var in variables:
             input_index = +1
-            instances = re.findall(r'\$input\s+(?=.*var\=[\"\']' + var + '[\"\'])' \
+            instances = re.findall(r'\$\s+input\s+(?=.*var\=[\"\']' + var + '[\"\'])' \
                           + r'[^\$]*\$', html_string)
             # import ipdb; ipdb.set_trace()
-            for input_def in instances:
-                width = re.search(r'(?=.*width\=[\"\'](\d+)[\"\'])', input_def)
-                if width:
-                    width = width.groups()[0]
-                else:
-                    width = ''
-                readonly = re.search(r'(?=.*readonly\=[\"\'](\w+)[\"\'])', input_def)
+            for input_def in instances:  # for multiple inputs per var
+                # extract var and readonly before style!
+                var_substring = re.search(r'(var\=[\"\']' + var + r'[\"\'])',
+                                          input_def)
+                input_def = input_def.replace(var_substring, '')
+                readonly = re.search(r'(?=.*(readonly\=[\"\'](\w+)[\"\']))', input_def)
                 if readonly:
-                    readonly = readonly.groups()[0]
+                    readonly = readonly.groups()[1]
+                    input_def = input_def.replace(readonly.groups()[0], '')
                 else:
                     readonly = ''
+                style = re.search(r'(?=.*style\=[\"\'](.*)[\"\'])', input_def)
+                if style:
+                    style = style.groups()[0]
+                else:
+                    style = ''
 
                 replacement = input_el.format(element_class=self.html_class,
                         element_id=self.html_id + '_' + str(input_index),
-                        var=var, width=width, readonly=readonly)
-                html_string = re.sub(r'\$input\s+(?=.*var\=[\"\'](' + \
+                        var=var, readonly=readonly, style=style)
+                html_string = re.sub(r'\$\s+input\s+(?=.*var\=[\"\'](' + \
                                      var + ')[\"\'])' + r'[^\$]*\$',
                 replacement, html_string, flags=re.IGNORECASE | re.UNICODE)
         return html_string

From 6bbcadb40f7453be8ecf13962b6c264a2af81a86 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Mon, 17 Dec 2012 18:49:47 +0200
Subject: [PATCH 267/541] fix bugs

---
 common/lib/xmodule/xmodule/gst_module.py | 29 ++++++++++++------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index 94ffa3d1d3..26d5793c59 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -69,18 +69,19 @@ class GraphicalSliderToolModule(XModule):
         Simple variant: slider and plot controls are not inside any tag.
         """
         #substitute plot
-        plot_div = '<div class="{element_class}__plot" id="{element_id}_plot \
+        plot_div = '<div class="{element_class}_plot" id="{element_id}_plot" \
                     style="{style}"></div>'
         # extract css style from plot
-        plot_def = re.findall(r'\$\s+plot[^\$]*\$', html_string)
-        style = re.search(r'(?=.*width\=[\"\'](.*)[\"\'])', plot_def)
+        plot_def = re.search(r'\$\s*plot[^\$]*\$', html_string).group()
+        style = re.search(r'(?=.*style\=[\"\'](.*)[\"\'])', plot_def)
         if style:
             style = style.groups()[0]
         else:  # no style parameter
             style = ''
         replacement = plot_div.format(element_class=self.html_class,
+                                      element_id=self.html_id,
                                             style=style)
-        html_string = re.sub(r'\$\s+plot[^\$]*\$', replacement, html_string,
+        html_string = re.sub(r'\$\s*plot[^\$]*\$', replacement, html_string,
                         flags=re.IGNORECASE | re.UNICODE)
 
         # get variables
@@ -99,13 +100,13 @@ class GraphicalSliderToolModule(XModule):
                      </div>'
         for var in variables:
             # find $slider var='var' ... $
-            instances = re.findall(r'\$\s+slider\s+(?=.*var\=[\"\']' + var + '[\"\'])' \
+            instances = re.findall(r'\$\s*slider\s+(?=.*var\=[\"\']' + var + '[\"\'])' \
                           + r'[^\$]*\$', html_string)
             if instances:  # if presented, only one slider per var
                 slider_def = instances[0]  # get $slider var='var' ... $ string
                 # extract var for proper style extraction further
                 var_substring = re.search(r'(var\=[\"\']' + var + r'[\"\'])',
-                                          slider_def)
+                                          slider_def).group()
                 slider_def = slider_def.replace(var_substring, '')
                 # get style
                 style = re.search(r'(?=.*style\=[\"\'](.*)[\"\'])', slider_def)
@@ -119,7 +120,7 @@ class GraphicalSliderToolModule(XModule):
                                             var=var, style=style)
                 # subsitute $slider var='var' ... $ in html_srting to proper
                 # html div element
-                html_string = re.sub(r'\$\s+slider\s+(?=.*var\=[\"\'](' + \
+                html_string = re.sub(r'\$\s*slider\s+(?=.*var\=[\"\'](' + \
                     var + ')[\"\'])' + r'[^\$]*\$',
                 replacement, html_string, flags=re.IGNORECASE | re.UNICODE)
 
@@ -127,26 +128,25 @@ class GraphicalSliderToolModule(XModule):
         input_el = '<input class="{element_class}_input" \
                                   id="{element_id}_input_{var}" \
                                    data-var="{var}" data-el_style="{style}" \
-                                   data-el_readonly="{readonly}"> \
-                     </input>'
+                                   data-el_readonly="{readonly}"/>'
 
         input_index = 0  # make multiple inputs for same variable have
         # different id
 
         for var in variables:
             input_index = +1
-            instances = re.findall(r'\$\s+input\s+(?=.*var\=[\"\']' + var + '[\"\'])' \
+            instances = re.findall(r'\$\s*input\s+(?=.*var\=[\"\']' + var + '[\"\'])' \
                           + r'[^\$]*\$', html_string)
             # import ipdb; ipdb.set_trace()
             for input_def in instances:  # for multiple inputs per var
                 # extract var and readonly before style!
                 var_substring = re.search(r'(var\=[\"\']' + var + r'[\"\'])',
-                                          input_def)
+                                          input_def).group()
                 input_def = input_def.replace(var_substring, '')
                 readonly = re.search(r'(?=.*(readonly\=[\"\'](\w+)[\"\']))', input_def)
                 if readonly:
-                    readonly = readonly.groups()[1]
                     input_def = input_def.replace(readonly.groups()[0], '')
+                    readonly = readonly.groups()[1]
                 else:
                     readonly = ''
                 style = re.search(r'(?=.*style\=[\"\'](.*)[\"\'])', input_def)
@@ -158,9 +158,10 @@ class GraphicalSliderToolModule(XModule):
                 replacement = input_el.format(element_class=self.html_class,
                         element_id=self.html_id + '_' + str(input_index),
                         var=var, readonly=readonly, style=style)
-                html_string = re.sub(r'\$\s+input\s+(?=.*var\=[\"\'](' + \
+                # import ipdb; ipdb.set_trace()
+                html_string = re.sub(r'\$\s*input\s+(?=.*var\=[\"\'](' + \
                                      var + ')[\"\'])' + r'[^\$]*\$',
-                replacement, html_string, flags=re.IGNORECASE | re.UNICODE)
+                replacement, html_string, count=1, flags=re.IGNORECASE | re.UNICODE)
         return html_string
 
     def get_configuration(self):

From e703b3aa0cab93aa981564852c0ee782aae866fa Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Tue, 18 Dec 2012 09:21:29 +0200
Subject: [PATCH 268/541] Refactoring GST.

---
 .../js/src/graphical_slider_tool/graph.js     |  15 --
 .../js/src/graphical_slider_tool/gst_main.js  |  44 +++--
 .../js/src/graphical_slider_tool/inputs.js    |  23 +--
 .../js/src/graphical_slider_tool/sliders.js   |  40 +++--
 .../js/src/graphical_slider_tool/state.js     | 158 ++++++++++++------
 5 files changed, 170 insertions(+), 110 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 385386eebc..bd9567b201 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -141,25 +141,18 @@ define('Graph', ['logme'], function (logme) {
                 'end': 10,
                 'step': 0.1
             };
-            logme('Default xrange:', xrange);
 
             // The 'xrange' is a string containing two floating point numbers
             // separated by a comma. The first number is the starting
             // x-coordinate , the second number is the ending x-coordinate
             if (typeof config.plot['xrange'] === 'string') {
-                logme('xrange is a string; xrange = "' + config.plot['xrange'] + '".');
-
                 xRangeStr = config.plot['xrange'];
                 xRangeBlobs = xRangeStr.split(',');
 
                 if (xRangeBlobs.length === 2) {
-                    logme('xrange contains 2 blobs; 1 -> "' + xRangeBlobs[0] + '", 2 -> "' + xRangeBlobs[1] + '".');
-
                     tempNum = parseFloat(xRangeBlobs[0]);
                     if (isNaN(tempNum) === false) {
                         xrange.start = tempNum;
-
-                        logme('First blob was parsed as a float. xrange.start = "' + xrange.start + '".');
                     } else {
                         logme('ERROR: First blob was parsed as a NaN.');
                     }
@@ -167,8 +160,6 @@ define('Graph', ['logme'], function (logme) {
                     tempNum = parseFloat(xRangeBlobs[1]);
                     if (isNaN(tempNum) === false) {
                         xrange.end = tempNum;
-
-                        logme('Second blob was parsed as a float. xrange.end = "' + xrange.end + '".');
                     } else {
                         logme('ERROR: Second blob was parsed as a NaN.');
                     }
@@ -176,8 +167,6 @@ define('Graph', ['logme'], function (logme) {
                     if (xrange.start >= xrange.end) {
                         xrange.start = 0;
                         xrange.end = 10;
-
-                        logme('xrange.start is greater than xrange.end - will set defaults. xrange.start = "' + xrange.start + '". xrange.end = "' + xrange.end + '".');
                     }
 
                 } else {
@@ -191,17 +180,13 @@ define('Graph', ['logme'], function (logme) {
             // we will use it to generate a 'step' - i.e. the distance (on
             // x-axis) between two adjacent points.
             if (typeof config.plot['num_points'] === 'string') {
-                logme('num_points is a string. num_points = "' + config.plot['num_points'] + '".');
-
                 tempNum = parseInt(config.plot['num_points'], 10);
                 if (
                     (isNaN(tempNum) === false) ||
                     (tempNum >= 2) &&
                     (tempNum <= 500)
                 ) {
-                    logme('num_points was parsed as a number. num_points = "' + tempNum + '".');
                     xrange.step = (xrange.end - xrange.start) / (tempNum - 1);
-                    logme('xrange.step = "' + xrange.step + '".');
                 } else {
                     logme('ERROR: num_points was not parsed as a number, or num_points < 2, or num_points > 500.');
                 }
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
index 4d5d1d12ae..0d7c27c4b1 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
@@ -16,23 +16,47 @@ define(
     function GstMain(gstId) {
         var config, gstClass, state;
 
-        // Get the JSON configuration, and parse it, and store as an object.
-        config = JSON.parse($('#' + gstId + '_json').html()).root;
+        // Get the JSON configuration, parse it, and store as an object.
+        try {
+            config = JSON.parse($('#' + gstId + '_json').html()).root;
+        } catch (err) {
+            logme('ERROR: could not parse config JSON.');
+            logme('$("#" + gstId + "_json").html() = ', $('#' + gstId + '_json').html());
+            logme('JSON.parse(...) = ', JSON.parse($('#' + gstId + '_json').html()));
+            logme('config = ', config);
 
+            return;
+        }
+
+        // Get the class name of the GST. All elements are assigned a class
+        // name that is based on the class name of the GST. For example, inputs
+        // are assigned a class name '{GST class name}_input'.
+        if (typeof config['@class'] !== 'string') {
+            logme('ERROR: Could not get the class name of GST.');
+            logme('config["@class"] = ', config['@class']);
+
+            return;
+        }
         gstClass = config['@class'];
-        logme('gstClass: ' + gstClass);
 
-        // Parse the configuration settings for sliders and text inputs, and
-        // extract all of the defined constants (their names along with their
-        // initial values).
-        state = State(gstId, gstClass, config);
+        // Parse the configuration settings for parameters, and store them in a
+        // state object.
+        state = State(gstId, config);
+
+        // It is possible that something goes wrong while extracting parameters
+        // from the JSON config object. In this case, we will not continue.
+        if (state === undefined) {
+            logme('ERROR: The state object was not initialized properly.');
+
+            return;
+        }
 
         // Create the sliders and the text inputs, attaching them to
-        // approriate constants.
-        Sliders(gstId, gstClass, state);
+        // appropriate parameters.
+        Sliders(gstId, state);
         Inputs(gstId, gstClass, state);
 
-        // Configure and display the loop. Attach event for the graph to be
+        // Configure and display the graph. Attach event for the graph to be
         // updated on any change of a slider or a text input.
         Graph(gstId, config, state);
     }
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
index 0365f40ea5..75a4275e90 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
@@ -10,14 +10,11 @@ define('Inputs', ['logme'], function (logme) {
 
         allParamNames = state.getAllParameterNames();
 
-        console.log(allParamNames);
-
         for (c1 = 0; c1 < allParamNames.length; c1 += 1) {
             $('#' + gstId).children('.' + gstClass + '_input').each(function (index, value) {
                 var inputDiv, paramName;
 
                 paramName = allParamNames[c1];
-
                 inputDiv = $(value);
 
                 if (paramName === inputDiv.data('var')) {
@@ -29,23 +26,17 @@ define('Inputs', ['logme'], function (logme) {
         return;
 
         function createInput(inputDiv, paramName) {
-            var paramObj, inputWidth, readOnly;
+            var paramObj, readOnly;
 
             paramObj = state.getParamObj(paramName);
 
-            // We will define the width of the slider to a sensible default.
-            inputWidth = 400;
+            // Check that the retrieval went OK.
+            if (paramObj === undefined) {
+                logme('ERROR: Could not get a paramObj for parameter "' + paramName + '".');
 
-            // See if it was specified by the user.
-            if (isFinite(parseInt(inputDiv.data('el_width'))) === true) {
-                inputWidth = parseInt(inputDiv.data('el_width'));
+                return;
             }
 
-            // Set the width of the element.
-            inputDiv.width(inputWidth);
-
-            inputDiv.css('display', 'inline-block');
-
             readOnly = false;
             if (inputDiv.attr('data-el_readonly').toLowerCase() === 'true') {
                 readOnly = true;
@@ -79,9 +70,11 @@ define('Inputs', ['logme'], function (logme) {
                 'outline': 'none',
                 'cursor': 'text',
                 'height': '15px'
-                // 'width': '50px'
             });
 
+            // Tell the parameter object from state that we are attaching a
+            // text input to it. Next time the parameter will be updated with
+            // a new value, tis input will also be updated.
             paramObj.inputDivs.push(inputDiv);
 
             return;
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
index f41a43fde7..7c9b5f1c38 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
@@ -5,7 +5,7 @@
 define('Sliders', ['logme'], function (logme) {
     return Sliders;
 
-    function Sliders(gstId, gstClass, state) {
+    function Sliders(gstId, state) {
         var c1, paramName, allParamNames, sliderDiv;
 
         allParamNames = state.getAllParameterNames();
@@ -13,38 +13,33 @@ define('Sliders', ['logme'], function (logme) {
         for (c1 = 0; c1 < allParamNames.length; c1 += 1) {
             paramName = allParamNames[c1];
 
-            logme('Looking for slider with ID: ' + gstId + '_slider_' + paramName);
             sliderDiv = $('#' + gstId + '_slider_' + paramName);
 
             if (sliderDiv.length === 1) {
-                logme('Found one slider DIV with such an ID.');
                 createSlider(sliderDiv, paramName);
+            } else if (sliderDiv.length > 1) {
+                logme('ERROR: Found more than one slider for the parameter "' + paramName + '".');
+                logme('sliderDiv.length = ', sliderDiv.length);
             } else {
-                logme('Did not find such a slider.');
+                logme('MESSAGE: Did not find a slider for the parameter "' + paramName + '".');
             }
         }
 
         function createSlider(sliderDiv, paramName) {
-            var paramObj, sliderWidth;
+            var paramObj;
 
             paramObj = state.getParamObj(paramName);
 
-            // We will define the width of the slider to a sensible default.
-            sliderWidth = 400;
+            // Check that the retrieval went OK.
+            if (paramObj === undefined) {
+                logme('ERROR: Could not get a paramObj for parameter "' + paramName + '".');
 
-            // See if it was specified by the user.
-            if (isFinite(parseInt(sliderDiv.data('el_width'))) === true) {
-                sliderWidth = parseInt(sliderDiv.data('el_width'));
+                return;
             }
 
-            // Set the width of the element.
-            sliderDiv.width(sliderWidth);
-
-            sliderDiv.css('display', 'inline-block');
-
             // Create a jQuery UI slider from the slider DIV. We will set
             // starting parameters, and will also attach a handler to update
-            // the 'state' on the 'change' event.
+            // the 'state' on the 'slide' event.
             sliderDiv.slider({
                 'min': paramObj.min,
                 'max': paramObj.max,
@@ -55,6 +50,9 @@ define('Sliders', ['logme'], function (logme) {
                 'slide': sliderOnSlide
             });
 
+            // Tell the parameter object stored in state that we have a slider
+            // that is attached to it. Next time when the parameter changes, it
+            // will also update the value of this slider.
             paramObj.sliderDiv = sliderDiv;
 
             return;
@@ -65,7 +63,15 @@ define('Sliders', ['logme'], function (logme) {
             // This will cause the plot to be redrawn each time after the user
             // drags the slider handle and releases it.
             function sliderOnSlide(event, ui) {
-                state.setParameterValue(paramName, ui.value, sliderDiv);
+
+                // Last parameter passed to setParameterValue() will be 'true'
+                // so that the function knows we are a slider, and it can
+                // change the our value back in the case when the new value is
+                // invalid for some reason.
+                if (state.setParameterValue(paramName, ui.value, sliderDiv, true) === undefined) {
+                    logme('ERROR: Could not update the parameter named "' + paramName + '" with the value "' + ui.value + '".');
+                }
+
             }
         }
     }
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
index ed0ca6ac8b..c72ce84230 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
@@ -6,14 +6,13 @@ define('State', ['logme'], function (logme) {
     // Since there will be (can be) multiple GST on a page, and each will have
     // a separate state, we will create a factory constructor function. The
     // constructor will expect the ID of the DIV with the GST contents, and the
-    // configuration object (parsed from a JSON string). It will return and
+    // configuration object (parsed from a JSON string). It will return an
     // object containing methods to set and get the private state properties.
 
     // This module defines and returns a factory constructor.
     return State;
 
-    // function: State
-    function State(gstId, gstClass, config) {
+    function State(gstId, config) {
         var parameters, allParameterNames, allParameterValues,
             plotDiv;
 
@@ -21,41 +20,50 @@ define('State', ['logme'], function (logme) {
         // an empty object.
         //
         // As we parse the JSON config object, we will add parameters as
-        // named properties (for example
+        // named properties. For example
         //
         //     parameters.a = {...};
         //
-        // for the parameter 'a'.
+        // will be created for the parameter 'a'.
         parameters = {};
 
-        // Check that the required object is available.
-        if (
-            (typeof config.parameters !== 'undefined') &&
-            (typeof config.parameters.param !== 'undefined')
-        ) {
+        // Check that the required parameters config object is available.
+        if ($.isPlainObject(config.parameters) === false) {
+            logme('ERROR: Expected config.parameters to be an object. It is not.');
+            logme('config.parameters = ', config.parameters);
 
-            // If config.parameters.param is an array, pass it to the processor
-            // element by element.
-            if ($.isArray(config.parameters.param) === true) {
-                (function (c1) {
-                    while (c1 < config.parameters.param.length) {
-                        processParameter(config.parameters.param[c1]);
-                        c1 += 1;
-                    }
-                }(0));
-            }
+            return;
+        }
 
-            // If config.parameters.param is an object, pass this object to the
-            // processor directly.
-            else if ($.isPlainObject(config.inputs.input) === true) {
-                processParameter(config.parameters.param);
-            }
+        // If config.parameters.param is an array, pass it to the processor
+        // element by element.
+        if ($.isArray(config.parameters.param) === true) {
+            (function (c1) {
+                while (c1 < config.parameters.param.length) {
+                    processParameter(config.parameters.param[c1]);
+                    c1 += 1;
+                }
+            }(0));
+        }
 
+        // If config.parameters.param is an object, pass this object to the
+        // processor directly.
+        else if ($.isPlainObject(config.inputs.input) === true) {
+            processParameter(config.parameters.param);
+        }
+
+        // If config.parameters.param is some other type, report an error and
+        // do not continue.
+        else {
+            logme('ERROR: config.parameters.param is of an unsupported type.');
+            logme('config.parameters.param = ', config.parameters.param);
+
+            return;
         }
 
         // Instead of building these arrays every time when some component
         // requests them, we will create them in the beginning, and then update
-        // by element when some parameter's value changes.
+        // each element individually when some parameter's value changes.
         //
         // Then we can just return the required array, instead of iterating
         // over all of the properties of the 'parameters' object, and
@@ -63,10 +71,9 @@ define('State', ['logme'], function (logme) {
         allParameterNames = [];
         allParameterValues = [];
 
+        // Populate 'allParameterNames', and 'allParameterValues' with data.
         generateHelperArrays();
 
-        logme(parameters, allParameterNames, allParameterValues);
-
         // The constructor will return an object with methods to operate on
         // it's private properties.
         return {
@@ -91,6 +98,8 @@ define('State', ['logme'], function (logme) {
 
         function getParamObj(paramName) {
             if (parameters.hasOwnProperty(paramName) === false) {
+                logme('ERROR: Object parameters does not have a property named "' + paramName + '".');
+
                 return;
             }
 
@@ -108,6 +117,8 @@ define('State', ['logme'], function (logme) {
             // If the name of the constant is not tracked by state, return an
             // 'undefined' value.
             if (parameters.hasOwnProperty(paramName) === false) {
+                logme('ERROR: Object parameters does not have a property named "' + paramName + '".');
+
                 return;
             }
 
@@ -119,6 +130,7 @@ define('State', ['logme'], function (logme) {
         // Function: setParameterValue(paramName, paramValue, element)
         // --------------------------------------------------
         //
+        //
         // This function can be called from a callback, registered by a slider
         // or a text input, when specific events ('slide' or 'change') are
         // triggered.
@@ -146,12 +158,14 @@ define('State', ['logme'], function (logme) {
         // original value.
         //
         // ####################################################################
-        function setParameterValue(paramName, paramValue, element) {
+        function setParameterValue(paramName, paramValue, element, slider) {
             var paramValueNum, c1;
 
             // If a parameter with the name specified by the 'paramName'
             // parameter is not tracked by state, do not do anything.
             if (parameters.hasOwnProperty(paramName) === false) {
+                logme('ERROR: Object parameters does not have a property named "' + paramName + '".');
+
                 return;
             }
 
@@ -159,38 +173,65 @@ define('State', ['logme'], function (logme) {
             // number.
             paramValueNum = parseFloat(paramValue);
 
-            if (
-                // We are interested only in valid float values. NaN, -INF,
-                // +INF we will disregard.
-                (isFinite(paramValueNum) === false) ||
+            // We are interested only in valid float values. NaN, -INF,
+            // +INF we will disregard.
+            if (isFinite(paramValueNum) === false) {
+                logme('ERROR: New parameter value is not a floating-point number.');
+                logme('paramValue = ', paramValue);
 
-                // If the new parameter's value is valid, but lies outised of
-                // the parameter's allowed range, we will also disregard it.
+                return;
+            }
+
+            // If the new parameter's value is valid, but lies outised of
+            // the parameter's allowed range, we will disregard it.
+            //
+            // We will also change the element's value back to the current
+            // parameter's value.
+            if (
                 (paramValueNum < parameters[paramName].min) ||
                 (paramValueNum > parameters[paramName].max)
             ) {
-                // We will also change the element's value back to the current
-                // parameter's value.
-                element.val(parameters[paramName].value);
+                logme('ERROR: New parameter\'s value lies outside of the allowed range.');
+                logme('Range is: min = ' + parameters[paramName].min + ', max = ' + parameters[paramName].max);
+                logme('paramValueNum = ' + paramValueNum);
+
+                // If element is a slider, the value must be set in a special
+                // way.
+                if (slider === true) {
+                    logme('Changing back the slider.');
+                    element.slider('value', parameters[paramName].value);
+                }
+
+                // If element is a text input, standard jQuery val() function
+                // will work.
+                else {
+                    element.val(parameters[paramName].value);
+                }
 
                 return;
             }
 
             parameters[paramName].value = paramValueNum;
 
+            // If we have a plot DIV to work with, tell to update.
             if (plotDiv !== undefined) {
                 plotDiv.trigger('update_plot');
             }
 
+            // Update all text inputs with the new parameter's value.
             for (c1 = 0; c1 < parameters[paramName].inputDivs.length; c1 += 1) {
                 parameters[paramName].inputDivs[c1].val(paramValueNum);
             }
 
+            // Update the single slider with the new parameter's value.
             if (parameters[paramName].sliderDiv !== null) {
                 parameters[paramName].sliderDiv.slider('value', paramValueNum);
             }
 
+            // Update the helper array with the new parameter's value.
             allParameterValues[parameters[paramName].helperArrayIndex] = paramValueNum;
+
+            return true;
         } // End-of: function setParameterValue
 
         // ####################################################################
@@ -230,11 +271,8 @@ define('State', ['logme'], function (logme) {
             var paramName, newParamObj;
 
             if (typeof obj['@var'] !== 'string') {
-                logme(
-                    '[ERROR] State.processParameter(obj): obj["@var"] is not a string.',
-                    obj['@var'],
-                    '---> Not adding a parameter.'
-                );
+                logme('ERROR: Expected obj["@var"] to be a string. It is not.');
+                logme('obj["@var"] = ', obj['@var']);
 
                 return;
             }
@@ -248,14 +286,19 @@ define('State', ['logme'], function (logme) {
                 (processFloat('@step', 'step') === false) ||
                 (processFloat('@initial', 'value') === false)
             ) {
-                logme('---> Not adding a parameter named "' + paramName + '".');
+                logme('ERROR: A required property is missing. Not creating parameter "' + paramName + '"');
 
                 return;
             }
 
+            // Pointers to text input and slider DIV elements that this
+            // parameter will be attached to. Initially there are none. When we
+            // will create text inputs and sliders, we will update these
+            // properties.
             newParamObj.inputDivs = [];
             newParamObj.sliderDiv = null;
 
+            // Everything went well, so save the new parameter object.
             parameters[paramName] = newParamObj;
 
             return;
@@ -264,19 +307,16 @@ define('State', ['logme'], function (logme) {
                 var attrValue;
 
                 if (typeof obj[attrName] !== 'string') {
-                    logme(
-                        '[ERROR] state.processParameter(obj): obj["' + attrName + '"] is not a string.',
-                        obj[attrName]
-                    );
+                    logme('ERROR: Expected obj["' + attrName + '"] to be a string. It is not.');
+                    logme('obj["' + attrName + '"] = ', obj[attrName]);
 
                     return false;
                 } else {
                     attrValue = parseFloat(obj[attrName]);
 
-                    if (isNaN(attrValue) === true) {
-                        logme(
-                            '[ERROR] state.processParameter(obj): for attrName = "' + attrName + '" attrValue is NaN.'
-                        );
+                    if (isFinite(attrValue) === false) {
+                        logme('ERROR: Expected obj["' + attrName + '"] to be a valid floating-point number. It is not.');
+                        logme('obj["' + attrName + '"] = ', obj[attrName]);
 
                         return false;
                     }
@@ -288,10 +328,22 @@ define('State', ['logme'], function (logme) {
             } // End-of: function processFloat
         } // End-of: function processParameter
 
+        // ####################################################################
+        //
+        // Function: generateHelperArrays()
+        // -------------------------------
+        //
+        //
         // Populate 'allParameterNames' and 'allParameterValues' with data.
         // Link each parameter object with the corresponding helper array via
-        // an index ('helperArrayIndex'). It will be the same for both of the
+        // an index 'helperArrayIndex'. It will be the same for both of the
         // arrays.
+        //
+        // NOTE: It is important to remember to update these helper arrays
+        // whenever a new parameter is added (or one is removed), or when a
+        // parameter's value changes.
+        //
+        // ####################################################################
         function generateHelperArrays() {
             var paramName, c1;
 

From f0ec3928e474bfe0dc0f38821c3034db3b36aac1 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Tue, 18 Dec 2012 11:37:02 +0200
Subject: [PATCH 269/541] Made the style setting be applied by Python, not by
 JS. Made background of readonly elements light gray.

---
 common/lib/xmodule/xmodule/gst_module.py        |  4 ++--
 .../js/src/graphical_slider_tool/inputs.js      | 17 +++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index 26d5793c59..572afd619f 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -96,7 +96,7 @@ class GraphicalSliderToolModule(XModule):
         #substitute sliders
         slider_div = '<div class="{element_class}_slider" \
                                    id="{element_id}_slider_{var}" \
-                                   data-var="{var}" data-el_style="{style}">\
+                                   data-var="{var}" style="{style}">\
                      </div>'
         for var in variables:
             # find $slider var='var' ... $
@@ -127,7 +127,7 @@ class GraphicalSliderToolModule(XModule):
         # substitute inputs if we have them
         input_el = '<input class="{element_class}_input" \
                                   id="{element_id}_input_{var}" \
-                                   data-var="{var}" data-el_style="{style}" \
+                                   data-var="{var}" style="{style}" \
                                    data-el_readonly="{readonly}"/>'
 
         input_index = 0  # make multiple inputs for same variable have
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
index 75a4275e90..7ec132b370 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
@@ -47,6 +47,7 @@ define('Inputs', ['logme'], function (logme) {
                 // In the case of a readonly config option, configure the text
                 // inputit as read-only, and NOT bind an event to it.
                 inputDiv.attr('readonly', 'readonly');
+                inputDiv.css('background-color', '#D3D3D3');
 
             } else { // readonly !== true
 
@@ -63,14 +64,14 @@ define('Inputs', ['logme'], function (logme) {
             // Lets style the input element nicely. We will use the button()
             // widget for this since there is no native widget for the text
             // input.
-            inputDiv.button().css({
-                'font': 'inherit',
-                'color': 'inherit',
-                'text-align': 'left',
-                'outline': 'none',
-                'cursor': 'text',
-                'height': '15px'
-            });
+            // inputDiv.button().css({
+            //     'font': 'inherit',
+            //     'color': 'inherit',
+            //     'text-align': 'left',
+            //     'outline': 'none',
+            //     'cursor': 'text',
+            //     'height': '15px'
+            // });
 
             // Tell the parameter object from state that we are attaching a
             // text input to it. Next time the parameter will be updated with

From 5ab1abf56f3fd218d34285853db01c4ae77c8e44 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Tue, 18 Dec 2012 13:17:44 +0200
Subject: [PATCH 270/541] Debug info for GST.

---
 .../js/src/graphical_slider_tool/graph.js     | 94 ++++++++++++-------
 .../js/src/graphical_slider_tool/state.js     |  9 +-
 2 files changed, 67 insertions(+), 36 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index bd9567b201..2357b706d5 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -7,17 +7,26 @@ define('Graph', ['logme'], function (logme) {
     return Graph;
 
     function Graph(gstId, config, state) {
-        var plotDiv, dataSeries, functions, xaxis, yaxis, xrange;
+        var plotDiv, dataSeries, functions, xaxis, yaxis, numPoints, xrange;
 
         // We must have a graph container DIV element available in order to
         // proceed.
         plotDiv = $('#' + gstId + '_plot');
         if (plotDiv.length === 0) {
+            logme('ERROR: Could not find the plot DIV with ID "' + gstId + '_plot".');
+
             return;
         }
 
+        if (plotDiv.width() === 0) {
+            plotDiv.width(300);
+        }
+
+        if (plotDiv.height() === 0) {
+            plotDiv.height(plotDiv.width());
+        }
+
         // Configure some settings for the graph.
-        setGraphDimensions();
         setGraphAxes();
         setGraphXRange();
 
@@ -25,6 +34,8 @@ define('Graph', ['logme'], function (logme) {
         // anything else.
         createFunctions();
         if (functions.length === 0) {
+            logme('ERROR: No functions were specified, or something went wrong.');
+
             return;
         }
 
@@ -38,34 +49,6 @@ define('Graph', ['logme'], function (logme) {
 
         return;
 
-        function setGraphDimensions() {
-            var dimObj, width, height, tempInt;
-
-            // If no dimensions are specified by the user, the graph will have
-            // predefined dimensions.
-            width = 300;
-            height = 300;
-
-            // Get the user specified dimensions, if any.
-            if ($.isPlainObject(config.plot['dimensions']) === true) {
-                dimObj = config.plot['dimensions'];
-
-                tempInt = parseInt(dimObj['@width'], 10);
-                if (isNaN(tempInt) === false) {
-                    width = tempInt;
-                }
-
-                tempInt = parseInt(dimObj['@height'], 10);
-                if (isNaN(tempInt) === false) {
-                    height = tempInt;
-                }
-            }
-
-            // Apply the dimensions to the graph container DIV element.
-            plotDiv.width(width);
-            plotDiv.height(height);
-        }
-
         function setGraphAxes() {
             // Define the xaxis Flot configuration, and then see if the user
             // supplied custom values.
@@ -76,6 +59,8 @@ define('Graph', ['logme'], function (logme) {
             };
             if (typeof config.plot['xticks'] === 'string') {
                 processTicks(config.plot['xticks'], xaxis);
+            } else {
+                logme('MESSAGE: "xticks" were not specified. Using defaults.');
             }
 
             // Define the yaxis Flot configuration, and then see if the user
@@ -87,6 +72,8 @@ define('Graph', ['logme'], function (logme) {
             };
             if (typeof config.plot['yticks'] === 'string') {
                 processTicks(config.plot['yticks'], yaxis);
+            } else {
+                logme('MESSAGE: "yticks" were not specified. Using defaults.');
             }
 
             return;
@@ -99,27 +86,37 @@ define('Graph', ['logme'], function (logme) {
                 ticksBlobs = ticksStr.split(',');
 
                 if (ticksBlobs.length !== 3) {
+                    logme('ERROR: Did not get 3 blobs from ticksStr = "' + ticksStr + '".');
+
                     return;
                 }
 
                 tempFloat = parseFloat(ticksBlobs[0]);
                 if (isNaN(tempFloat) === false) {
                     ticksObj.min = tempFloat;
+                } else {
+                    logme('ERROR: Invalid "min". ticksBlobs[0] = ', ticksBlobs[0]);
                 }
 
                 tempFloat = parseFloat(ticksBlobs[1]);
                 if (isNaN(tempFloat) === false) {
                     ticksObj.tickSize = tempFloat;
+                } else {
+                    logme('ERROR: Invalid "tickSize". ticksBlobs[1] = ', ticksBlobs[1]);
                 }
 
                 tempFloat = parseFloat(ticksBlobs[2]);
                 if (isNaN(tempFloat) === false) {
                     ticksObj.max = tempFloat;
+                } else {
+                    logme('ERROR: Invalid "max". ticksBlobs[2] = ', ticksBlobs[2]);
                 }
 
                 // Is the starting tick to the left of the ending tick (on the
                 // x-axis)? If not, set default starting and ending tick.
                 if (ticksObj.min >= ticksObj.max) {
+                    logme('ERROR: min >= max. Setting defaults.');
+
                     ticksObj.min = 0;
                     ticksObj.max = 10;
                 }
@@ -128,6 +125,8 @@ define('Graph', ['logme'], function (logme) {
                 // least 3 ticks. If not, set a tickSize which will produce
                 // 11 ticks. tickSize is the spacing between the ticks.
                 if (ticksObj.tickSize * 2 >= ticksObj.max - ticksObj.min) {
+                    logme('ERROR: tickSize * 2 >= max - min. Setting defaults.');
+
                     ticksObj.tickSize = (ticksObj.max - ticksObj.min) / 10.0;
                 }
             }
@@ -170,10 +169,10 @@ define('Graph', ['logme'], function (logme) {
                     }
 
                 } else {
-                    logme('ERROR: xrange does not contain 2 blobs.');
+                    logme('ERROR: xrange does not contain 2 blobs. xRangeBlobs.length = ' + xRangeBlobs.length);
                 }
             } else {
-                logme('ERROR: xrange is not a string.');
+                logme('ERROR: xrange is not a string. config.plot["xrange"] = ', config.plot['xrange']);
             }
 
             // The user can specify the number of points. However, internally
@@ -184,9 +183,10 @@ define('Graph', ['logme'], function (logme) {
                 if (
                     (isNaN(tempNum) === false) ||
                     (tempNum >= 2) &&
-                    (tempNum <= 500)
+                    (tempNum <= 1000)
                 ) {
-                    xrange.step = (xrange.end - xrange.start) / (tempNum - 1);
+                    numPoints = tempNum;
+                    xrange.step = (xrange.end - xrange.start) / (numPoints - 1);
                 } else {
                     logme('ERROR: num_points was not parsed as a number, or num_points < 2, or num_points > 500.');
                 }
@@ -201,6 +201,8 @@ define('Graph', ['logme'], function (logme) {
             functions = [];
 
             if (typeof config.plot['function'] === 'undefined') {
+                logme('ERROR: config.plot["function"] is undefined.');
+
                 return;
             }
 
@@ -234,6 +236,10 @@ define('Graph', ['logme'], function (logme) {
 
                     }
                 }
+            } else {
+                logme('ERROR: config.plot["function"] is of an unsupported type.');
+
+                return;
             }
 
             return;
@@ -348,7 +354,7 @@ define('Graph', ['logme'], function (logme) {
         }
 
         function generateData() {
-            var c0, functionObj, seriesObj, dataPoints, paramValues, x, y;
+            var c0, c1, functionObj, seriesObj, dataPoints, paramValues, x, y;
 
             paramValues = state.getAllParameterValues();
 
@@ -360,6 +366,11 @@ define('Graph', ['logme'], function (logme) {
                 seriesObj = {};
                 dataPoints = [];
 
+                // For counting number of points added. In the end we will
+                // compare this number to 'numPoints' specified in the config
+                // JSON.
+                c1 = 0;
+
                 // Generate the data points.
                 for (x = xrange.start; x <= xrange.end; x += xrange.step) {
 
@@ -378,6 +389,19 @@ define('Graph', ['logme'], function (logme) {
                     // Add the generated point to the data points set.
                     dataPoints.push([x, y]);
 
+                    c1 += 1;
+
+                }
+
+                // If the last point did not get included because of rounding
+                // of floating-point number addition, then we will include it
+                // manually.
+                if (c1 != numPoints) {
+                    x = xrange.end;
+                    paramValues.push(x);
+                    y = functionObj.func.apply(window, paramValues);
+                    paramValues.pop();
+                    dataPoints.push([x, y]);
                 }
 
                 // Put the entire data points set into the series object.
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
index c72ce84230..19bb557b24 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
@@ -3,12 +3,16 @@
 (function (requirejs, require, define) {
 
 define('State', ['logme'], function (logme) {
+    var stateInst;
+
     // Since there will be (can be) multiple GST on a page, and each will have
     // a separate state, we will create a factory constructor function. The
     // constructor will expect the ID of the DIV with the GST contents, and the
     // configuration object (parsed from a JSON string). It will return an
     // object containing methods to set and get the private state properties.
 
+    stateInst = 0;
+
     // This module defines and returns a factory constructor.
     return State;
 
@@ -16,6 +20,9 @@ define('State', ['logme'], function (logme) {
         var parameters, allParameterNames, allParameterValues,
             plotDiv;
 
+        stateInst += 1;
+        logme('MESSAGE: Creating state instance # ' + stateInst + '.');
+
         // Initially, there are no parameters to track. So, we will instantiate
         // an empty object.
         //
@@ -48,7 +55,7 @@ define('State', ['logme'], function (logme) {
 
         // If config.parameters.param is an object, pass this object to the
         // processor directly.
-        else if ($.isPlainObject(config.inputs.input) === true) {
+        else if ($.isPlainObject(config.parameters.param) === true) {
             processParameter(config.parameters.param);
         }
 

From ed20fe3417dd32e8bd2463a446f49e41256bc5ed Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Tue, 18 Dec 2012 13:39:47 +0200
Subject: [PATCH 271/541] fix  inputs id

---
 common/lib/xmodule/xmodule/gst_module.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index 572afd619f..21842054bb 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -126,19 +126,18 @@ class GraphicalSliderToolModule(XModule):
 
         # substitute inputs if we have them
         input_el = '<input class="{element_class}_input" \
-                                  id="{element_id}_input_{var}" \
+                                  id="{element_id}_input_{var}_{input_index}" \
                                    data-var="{var}" style="{style}" \
                                    data-el_readonly="{readonly}"/>'
 
-        input_index = 0  # make multiple inputs for same variable have
-        # different id
-
         for var in variables:
-            input_index = +1
+            input_index = 0  # make multiple inputs for same variable have
+                # different id
             instances = re.findall(r'\$\s*input\s+(?=.*var\=[\"\']' + var + '[\"\'])' \
                           + r'[^\$]*\$', html_string)
             # import ipdb; ipdb.set_trace()
             for input_def in instances:  # for multiple inputs per var
+                input_index += 1
                 # extract var and readonly before style!
                 var_substring = re.search(r'(var\=[\"\']' + var + r'[\"\'])',
                                           input_def).group()
@@ -154,10 +153,11 @@ class GraphicalSliderToolModule(XModule):
                     style = style.groups()[0]
                 else:
                     style = ''
-
+                # import ipdb; ipdb.set_trace()
                 replacement = input_el.format(element_class=self.html_class,
-                        element_id=self.html_id + '_' + str(input_index),
-                        var=var, readonly=readonly, style=style)
+                        element_id=self.html_id,
+                        var=var, readonly=readonly, style=style,
+                        input_index=input_index)
                 # import ipdb; ipdb.set_trace()
                 html_string = re.sub(r'\$\s*input\s+(?=.*var\=[\"\'](' + \
                                      var + ')[\"\'])' + r'[^\$]*\$',

From b457bc6f4af900261e0bf2ce08d18b3faada8ed5 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Tue, 18 Dec 2012 13:58:06 +0200
Subject: [PATCH 272/541] Fixed input bug. Now if they are nested within DIVs,
 they are also included.

---
 .../lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
index 7ec132b370..e48174ddb5 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
@@ -11,7 +11,7 @@ define('Inputs', ['logme'], function (logme) {
         allParamNames = state.getAllParameterNames();
 
         for (c1 = 0; c1 < allParamNames.length; c1 += 1) {
-            $('#' + gstId).children('.' + gstClass + '_input').each(function (index, value) {
+            $('#' + gstId).find('.' + gstClass + '_input').each(function (index, value) {
                 var inputDiv, paramName;
 
                 paramName = allParamNames[c1];

From 96fd48f4a6c365e432b36613752a4f128daddd0c Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Tue, 18 Dec 2012 14:10:44 +0200
Subject: [PATCH 273/541] Added check for disabling of multiple processing of
 the same GST.

---
 .../xmodule/js/src/graphical_slider_tool/gst_main.js      | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
index 0d7c27c4b1..3c06cf9544 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
@@ -16,6 +16,14 @@ define(
     function GstMain(gstId) {
         var config, gstClass, state;
 
+        if ($('#' + gstId).attr('data-processed') !== 'processed') {
+            $('#' + gstId).attr('data-processed', 'processed');
+        } else {
+            logme('MESSAGE: Already processed GST with ID ' + gstId + '. Skipping.');
+
+            return;
+        }
+
         // Get the JSON configuration, parse it, and store as an object.
         try {
             config = JSON.parse($('#' + gstId + '_json').html()).root;

From b79be15c17b88e6db8fa8c3aa800681c6e524af9 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Tue, 18 Dec 2012 14:46:19 +0200
Subject: [PATCH 274/541] directives now without starting space

---
 common/lib/xmodule/xmodule/gst_module.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index 21842054bb..4366acc91f 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -72,7 +72,7 @@ class GraphicalSliderToolModule(XModule):
         plot_div = '<div class="{element_class}_plot" id="{element_id}_plot" \
                     style="{style}"></div>'
         # extract css style from plot
-        plot_def = re.search(r'\$\s*plot[^\$]*\$', html_string).group()
+        plot_def = re.search(r'\$plot[^\$]*\$', html_string).group()
         style = re.search(r'(?=.*style\=[\"\'](.*)[\"\'])', plot_def)
         if style:
             style = style.groups()[0]
@@ -81,8 +81,8 @@ class GraphicalSliderToolModule(XModule):
         replacement = plot_div.format(element_class=self.html_class,
                                       element_id=self.html_id,
                                             style=style)
-        html_string = re.sub(r'\$\s*plot[^\$]*\$', replacement, html_string,
-                        flags=re.IGNORECASE | re.UNICODE)
+        html_string = re.sub(r'\$plot[^\$]*\$', replacement, html_string,
+                        flags=re.UNICODE)
 
         # get variables
         if json.loads(self.configuration_json)['root'].get('parameters'):
@@ -92,7 +92,8 @@ class GraphicalSliderToolModule(XModule):
             variables = [x['@var'] for x in variables]
         else:
             return html_string
-
+        # if variables[0] == 'v':
+        #     import ipdb; ipdb.set_trace()
         #substitute sliders
         slider_div = '<div class="{element_class}_slider" \
                                    id="{element_id}_slider_{var}" \
@@ -100,7 +101,7 @@ class GraphicalSliderToolModule(XModule):
                      </div>'
         for var in variables:
             # find $slider var='var' ... $
-            instances = re.findall(r'\$\s*slider\s+(?=.*var\=[\"\']' + var + '[\"\'])' \
+            instances = re.findall(r'\$slider\s+(?=.*var\=[\"\']' + var + '[\"\'])' \
                           + r'[^\$]*\$', html_string)
             if instances:  # if presented, only one slider per var
                 slider_def = instances[0]  # get $slider var='var' ... $ string
@@ -120,9 +121,9 @@ class GraphicalSliderToolModule(XModule):
                                             var=var, style=style)
                 # subsitute $slider var='var' ... $ in html_srting to proper
                 # html div element
-                html_string = re.sub(r'\$\s*slider\s+(?=.*var\=[\"\'](' + \
+                html_string = re.sub(r'\$slider\s+(?=.*var\=[\"\'](' + \
                     var + ')[\"\'])' + r'[^\$]*\$',
-                replacement, html_string, flags=re.IGNORECASE | re.UNICODE)
+                replacement, html_string, flags=re.UNICODE)
 
         # substitute inputs if we have them
         input_el = '<input class="{element_class}_input" \
@@ -133,7 +134,7 @@ class GraphicalSliderToolModule(XModule):
         for var in variables:
             input_index = 0  # make multiple inputs for same variable have
                 # different id
-            instances = re.findall(r'\$\s*input\s+(?=.*var\=[\"\']' + var + '[\"\'])' \
+            instances = re.findall(r'\$input\s+(?=.*var\=[\"\']' + var + '[\"\'])' \
                           + r'[^\$]*\$', html_string)
             # import ipdb; ipdb.set_trace()
             for input_def in instances:  # for multiple inputs per var
@@ -159,9 +160,9 @@ class GraphicalSliderToolModule(XModule):
                         var=var, readonly=readonly, style=style,
                         input_index=input_index)
                 # import ipdb; ipdb.set_trace()
-                html_string = re.sub(r'\$\s*input\s+(?=.*var\=[\"\'](' + \
+                html_string = re.sub(r'\$input\s+(?=.*var\=[\"\'](' + \
                                      var + ')[\"\'])' + r'[^\$]*\$',
-                replacement, html_string, count=1, flags=re.IGNORECASE | re.UNICODE)
+                replacement, html_string, count=1, flags=re.UNICODE)
         return html_string
 
     def get_configuration(self):

From 51db556efe9d3c2c3cdd062eff54de81c0593190 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Tue, 18 Dec 2012 15:58:26 +0200
Subject: [PATCH 275/541] now converts gt to > in function body

---
 .../lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 2357b706d5..05ff88e0f0 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -266,7 +266,7 @@ define('Graph', ['logme'], function (logme) {
                 if (typeof funcString !== 'string') {
                     return;
                 }
-
+                funcString = $('<div>').html(funcString).text();
                 // Some defaults. If no options are set for the graph, we will
                 // make sure that at least a line is drawn for a function.
                 newFunctionObject = {

From c2dd8800b0f280d12a5ed3c7745add72cc19a4e7 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Tue, 18 Dec 2012 15:59:44 +0200
Subject: [PATCH 276/541] Dynamic range part 1.

---
 .../js/src/graphical_slider_tool/graph.js     | 34 ++++++++++++++-----
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 05ff88e0f0..6dbac2aea8 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -27,8 +27,8 @@ define('Graph', ['logme'], function (logme) {
         }
 
         // Configure some settings for the graph.
-        setGraphAxes();
         setGraphXRange();
+        setGraphAxes();
 
         // Get the user defined functions. If there aren't any, don't do
         // anything else.
@@ -135,15 +135,29 @@ define('Graph', ['logme'], function (logme) {
         function setGraphXRange() {
             var xRangeStr, xRangeBlobs, tempNum;
 
-            xrange = {
-                'start': 0,
-                'end': 10,
-                'step': 0.1
-            };
+            xrange = {};
+
+            if ($.isPlainObject(config.plot.xrange) === false) {
+                logme('ERROR: Expected config.plot.xrange to be an object. It is not.');
+                logme('config.plot.xrange = ', config.plot.xrange);
+
+                return false;
+            }
+
+            if (typeof config.plot.xrange.min !== 'string') {
+                logme('ERROR: Expected config.plot.xrange.min to be a string. It is not.');
+                logme('config.plot.xrange.min = ', config.plot.xrange.min);
+
+                return false;
+            }
+
+            if (typeof config.plot.xrange.max !== 'string') {
+                logme('ERROR: Expected config.plot.xrange.max to be a string. It is not.');
+                logme('config.plot.xrange.max = ', config.plot.xrange.max);
+
+                return false;
+            }
 
-            // The 'xrange' is a string containing two floating point numbers
-            // separated by a comma. The first number is the starting
-            // x-coordinate , the second number is the ending x-coordinate
             if (typeof config.plot['xrange'] === 'string') {
                 xRangeStr = config.plot['xrange'];
                 xRangeBlobs = xRangeStr.split(',');
@@ -193,6 +207,8 @@ define('Graph', ['logme'], function (logme) {
             } else {
                 logme('ERROR: num_points is not a string.');
             }
+
+            return true;
         }
 
         function createFunctions() {

From 315cc7c7e41c677232ba4412a469f1c162df6834 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Tue, 18 Dec 2012 18:04:38 +0200
Subject: [PATCH 277/541] Dynamic xrange finished.

---
 .../js/src/graphical_slider_tool/graph.js     | 123 +++++++++++-------
 1 file changed, 79 insertions(+), 44 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 6dbac2aea8..28edf873c7 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -27,7 +27,12 @@ define('Graph', ['logme'], function (logme) {
         }
 
         // Configure some settings for the graph.
-        setGraphXRange();
+        if (setGraphXRange() === false) {
+            logme('ERROR: could not configure the xrange. Will not continue.');
+
+            return;
+        }
+
         setGraphAxes();
 
         // Get the user defined functions. If there aren't any, don't do
@@ -133,7 +138,7 @@ define('Graph', ['logme'], function (logme) {
         }
 
         function setGraphXRange() {
-            var xRangeStr, xRangeBlobs, tempNum;
+            var xRangeStr, xRangeBlobs, tempNum, allParamNames;
 
             xrange = {};
 
@@ -158,54 +163,60 @@ define('Graph', ['logme'], function (logme) {
                 return false;
             }
 
-            if (typeof config.plot['xrange'] === 'string') {
-                xRangeStr = config.plot['xrange'];
-                xRangeBlobs = xRangeStr.split(',');
+            allParamNames = state.getAllParameterNames();
 
-                if (xRangeBlobs.length === 2) {
-                    tempNum = parseFloat(xRangeBlobs[0]);
-                    if (isNaN(tempNum) === false) {
-                        xrange.start = tempNum;
-                    } else {
-                        logme('ERROR: First blob was parsed as a NaN.');
-                    }
+            allParamNames.push(config.plot.xrange.min);
+            try {
+                xrange.min = Function.apply(null, allParamNames);
+            } catch (err) {
+                logme('ERROR: could not create a function from the string "' + config.plot.xrange.min + '" for xrange.min.');
 
-                    tempNum = parseFloat(xRangeBlobs[1]);
-                    if (isNaN(tempNum) === false) {
-                        xrange.end = tempNum;
-                    } else {
-                        logme('ERROR: Second blob was parsed as a NaN.');
-                    }
-
-                    if (xrange.start >= xrange.end) {
-                        xrange.start = 0;
-                        xrange.end = 10;
-                    }
-
-                } else {
-                    logme('ERROR: xrange does not contain 2 blobs. xRangeBlobs.length = ' + xRangeBlobs.length);
-                }
-            } else {
-                logme('ERROR: xrange is not a string. config.plot["xrange"] = ', config.plot['xrange']);
+                return false;
             }
+            allParamNames.pop();
+
+            allParamNames.push(config.plot.xrange.max);
+            try {
+                xrange.max = Function.apply(null, allParamNames);
+            } catch (err) {
+                logme('ERROR: could not create a function from the string "' + config.plot.xrange.min + '" for xrange.min.');
+
+                return false;
+            }
+            allParamNames.pop();
+
+            logme('xrange = ', xrange);
 
             // The user can specify the number of points. However, internally
             // we will use it to generate a 'step' - i.e. the distance (on
             // x-axis) between two adjacent points.
-            if (typeof config.plot['num_points'] === 'string') {
-                tempNum = parseInt(config.plot['num_points'], 10);
-                if (
-                    (isNaN(tempNum) === false) ||
-                    (tempNum >= 2) &&
-                    (tempNum <= 1000)
-                ) {
-                    numPoints = tempNum;
-                    xrange.step = (xrange.end - xrange.start) / (numPoints - 1);
-                } else {
-                    logme('ERROR: num_points was not parsed as a number, or num_points < 2, or num_points > 500.');
+            if (typeof config.plot.num_points === 'string') {
+                tempNum = parseInt(config.plot.num_points, 10);
+                if (isNaN(tempNum) === true) {
+                    logme('ERROR: Could not parse the number of points.');
+                    logme('config.plot.num_points = ', config.plot.num_points);
+
+                    return false;
                 }
+
+                if (
+                    (tempNum < 2) &&
+                    (tempNum > 1000)
+                ) {
+                    logme('ERROR: Number of points is outside the allowed range [2, 1000]');
+                    logme('config.plot.num_points = ' + tempNum);
+
+                    return false;
+                }
+
+                numPoints = tempNum;
             } else {
-                logme('ERROR: num_points is not a string.');
+                logme('MESSAGE: config.plot.num_points is not a string.');
+                logme('Will set number of points to {width of graph} / 10.');
+
+                numPoints = plotDiv.width() / 10.0;
+
+                logme('numPoints = ' + numPoints);
             }
 
             return true;
@@ -282,7 +293,15 @@ define('Graph', ['logme'], function (logme) {
                 if (typeof funcString !== 'string') {
                     return;
                 }
+
+                // Make sure that any HTML entities that were escaped will be
+                // unescaped. This is done because if a string with escaped
+                // HTML entities is passed to the Function() constructor, it
+                // will break.
                 funcString = $('<div>').html(funcString).text();
+
+                logme('funcString = ' + funcString);
+
                 // Some defaults. If no options are set for the graph, we will
                 // make sure that at least a line is drawn for a function.
                 newFunctionObject = {
@@ -294,6 +313,8 @@ define('Graph', ['logme'], function (logme) {
                 // XML.
                 paramNames = state.getAllParameterNames();
 
+                logme('allParamNames = ', paramNames);
+
                 // The 'x' is always one of the function parameters.
                 paramNames.push('x');
 
@@ -301,6 +322,8 @@ define('Graph', ['logme'], function (logme) {
                 // the Function constructor.
                 paramNames.push(funcString);
 
+                console.log('paramNames = ', paramNames);
+
                 // Create the function from the function string, and all of the
                 // available parameters AND the 'x' variable as it's parameters.
                 // For this we will use the built-in Function object
@@ -323,6 +346,11 @@ define('Graph', ['logme'], function (logme) {
                     return;
                 }
 
+                // Return the array back to original state. Remember that it is
+                // a pointer to original array which is stored in state object.
+                paramNames.pop();
+                paramNames.pop();
+
                 newFunctionObject['func'] = func;
 
                 if (typeof color === 'string') {
@@ -370,7 +398,8 @@ define('Graph', ['logme'], function (logme) {
         }
 
         function generateData() {
-            var c0, c1, functionObj, seriesObj, dataPoints, paramValues, x, y;
+            var c0, c1, functionObj, seriesObj, dataPoints, paramValues, x, y,
+                start, end, step;
 
             paramValues = state.getAllParameterValues();
 
@@ -387,8 +416,14 @@ define('Graph', ['logme'], function (logme) {
                 // JSON.
                 c1 = 0;
 
+                start = xrange.min.apply(window, paramValues);
+                end = xrange.max.apply(window, paramValues);
+                step = (end - start) / (numPoints - 1);
+
+                logme('start = ' + start + ', end = ' + end + ', step = ' + step);
+
                 // Generate the data points.
-                for (x = xrange.start; x <= xrange.end; x += xrange.step) {
+                for (x = start; x <= end; x += step) {
 
                     // Push the 'x' variable to the end of the parameter array.
                     paramValues.push(x);
@@ -413,7 +448,7 @@ define('Graph', ['logme'], function (logme) {
                 // of floating-point number addition, then we will include it
                 // manually.
                 if (c1 != numPoints) {
-                    x = xrange.end;
+                    x = end;
                     paramValues.push(x);
                     y = functionObj.func.apply(window, paramValues);
                     paramValues.pop();

From 3eb3d7db139f61cb637ec4f8b54ee79fb5e21da3 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Tue, 18 Dec 2012 18:11:19 +0200
Subject: [PATCH 278/541] units implemented

---
 .../js/src/graphical_slider_tool/graph.js       | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 28edf873c7..452f6ecb92 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -63,7 +63,7 @@ define('Graph', ['logme'], function (logme) {
                 'max': 10
             };
             if (typeof config.plot['xticks'] === 'string') {
-                processTicks(config.plot['xticks'], xaxis);
+                processTicks(config.plot['xticks'], xaxis, 'xunits');
             } else {
                 logme('MESSAGE: "xticks" were not specified. Using defaults.');
             }
@@ -76,14 +76,14 @@ define('Graph', ['logme'], function (logme) {
                 'max': 10
             };
             if (typeof config.plot['yticks'] === 'string') {
-                processTicks(config.plot['yticks'], yaxis);
+                processTicks(config.plot['yticks'], yaxis, 'yunits');
             } else {
                 logme('MESSAGE: "yticks" were not specified. Using defaults.');
             }
 
             return;
 
-            function processTicks(ticksStr, ticksObj) {
+            function processTicks(ticksStr, ticksObj, unitsType) {
                 var ticksBlobs, tempFloat;
 
                 // The 'ticks' setting is a string containing 3 floating-point
@@ -134,6 +134,17 @@ define('Graph', ['logme'], function (logme) {
 
                     ticksObj.tickSize = (ticksObj.max - ticksObj.min) / 10.0;
                 }
+
+                //  units: change last tick to units
+                if (typeof config.plot[unitsType] === 'string') {
+                    var ticks =  _.map(_.range(ticksObj.min,
+                        ticksObj.max + ticksObj.tickSize, ticksObj.tickSize),
+                        function(x){  return [x,
+                        x > ticksObj.max - ticksObj.tickSize ? config.plot[unitsType] : x];
+                                    });
+                    ticksObj.tickSize = null;
+                    ticksObj.ticks = ticks;
+                }
             }
         }
 

From 1ffb091139f29d10afe7496b2b198124d5dd73f9 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Wed, 19 Dec 2012 07:47:36 +0200
Subject: [PATCH 279/541] GST work in progress.

---
 .../js/src/graphical_slider_tool/graph.js     | 153 ++++++++++++------
 1 file changed, 106 insertions(+), 47 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 452f6ecb92..0df84c35e2 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -22,6 +22,10 @@ define('Graph', ['logme'], function (logme) {
             plotDiv.width(300);
         }
 
+        // Sometimes, when height is not explicitly set via CSS (or by some
+        // other means), it is 0 pixels by default. When Flot will try to plot
+        // a graph in this DIV with 0 height, then it will raise an error. To
+        // prevent this, we will set it to be equal to the width.
         if (plotDiv.height() === 0) {
             plotDiv.height(plotDiv.width());
         }
@@ -84,7 +88,7 @@ define('Graph', ['logme'], function (logme) {
             return;
 
             function processTicks(ticksStr, ticksObj, unitsType) {
-                var ticksBlobs, tempFloat;
+                var ticksBlobs, tempFloat, tempTicks, c1, c2;
 
                 // The 'ticks' setting is a string containing 3 floating-point
                 // numbers.
@@ -137,13 +141,83 @@ define('Graph', ['logme'], function (logme) {
 
                 //  units: change last tick to units
                 if (typeof config.plot[unitsType] === 'string') {
-                    var ticks =  _.map(_.range(ticksObj.min,
-                        ticksObj.max + ticksObj.tickSize, ticksObj.tickSize),
-                        function(x){  return [x,
-                        x > ticksObj.max - ticksObj.tickSize ? config.plot[unitsType] : x];
-                                    });
+                    tempTicks = [];
+
+                    for (c1 = ticksObj.min; c1 <= ticksObj.max; c1 += ticksObj.tickSize) {
+                        c2 = roundToPrec(c1, ticksObj.tickSize);
+                        tempTicks.push([c2, c2]);
+                    }
+
+                    tempTicks.pop();
+                    tempTicks.push([
+                        roundToPrec(ticksObj.max, ticksObj.tickSize),
+                        config.plot[unitsType]
+                    ]);
+
                     ticksObj.tickSize = null;
-                    ticksObj.ticks = ticks;
+                    ticksObj.ticks = tempTicks;
+                }
+
+                return;
+
+                function roundToPrec(num, prec) {
+                    var c1, tn1, tn2, digitsBefore, digitsAfter;
+
+                    tn1 = Math.abs(num);
+                    tn2 = Math.abs(prec);
+
+                    // Find out number of digits BEFORE the decimal point.
+                    c1 = 0;
+                    tn1 = Math.abs(num);
+                    while (tn1 >= 1) {
+                        c1 += 1;
+
+                        tn1 /= 10;
+                    }
+                    digitsBefore = c1;
+
+                    // Find out number of digits AFTER the decimal point.
+                    c1 = 0;
+                    tn1 = Math.abs(num);
+                    while (Math.round(tn1) !== tn1) {
+                        c1 += 1;
+
+                        tn1 *= 10;
+                    }
+                    digitsAfter = c1;
+
+                    // For precision, find out number of digits AFTER the
+                    // decimal point.
+                    c1 = 0;
+                    while (Math.round(tn2) !== tn2) {
+                        c1 += 1;
+
+                        tn2 *= 10;
+                    }
+
+                    // If precision is more than 1 (no digits after decimal
+                    // points).
+                    if (c1 === 0) {
+                        return num;
+                    }
+
+                    // If the precision contains digits after the decimal
+                    // point, we apply special rules.
+                    else {
+                        tn1 = Math.abs(num);
+
+                        if (digitsAfter > c1) {
+                            tn1 = tn1.toPrecision(digitsBefore + c1);
+                        } else {
+                            tn1 = tn1.toPrecision(digitsBefore + digitsAfter);
+                        }
+                    }
+
+                    if (num < 0) {
+                        return -tn1;
+                    }
+
+                    return tn1;
                 }
             }
         }
@@ -190,46 +264,39 @@ define('Graph', ['logme'], function (logme) {
             try {
                 xrange.max = Function.apply(null, allParamNames);
             } catch (err) {
-                logme('ERROR: could not create a function from the string "' + config.plot.xrange.min + '" for xrange.min.');
+                logme('ERROR: could not create a function from the string "' + config.plot.xrange.max + '" for xrange.max.');
 
                 return false;
             }
             allParamNames.pop();
 
-            logme('xrange = ', xrange);
+            if (typeof config.plot.num_points !== 'string') {
+                logme('ERROR: config.plot.num_points is not a string.');
+                logme('config.plot.num_points = ', config.plot.num_points);
 
-            // The user can specify the number of points. However, internally
-            // we will use it to generate a 'step' - i.e. the distance (on
-            // x-axis) between two adjacent points.
-            if (typeof config.plot.num_points === 'string') {
-                tempNum = parseInt(config.plot.num_points, 10);
-                if (isNaN(tempNum) === true) {
-                    logme('ERROR: Could not parse the number of points.');
-                    logme('config.plot.num_points = ', config.plot.num_points);
-
-                    return false;
-                }
-
-                if (
-                    (tempNum < 2) &&
-                    (tempNum > 1000)
-                ) {
-                    logme('ERROR: Number of points is outside the allowed range [2, 1000]');
-                    logme('config.plot.num_points = ' + tempNum);
-
-                    return false;
-                }
-
-                numPoints = tempNum;
-            } else {
-                logme('MESSAGE: config.plot.num_points is not a string.');
-                logme('Will set number of points to {width of graph} / 10.');
-
-                numPoints = plotDiv.width() / 10.0;
-
-                logme('numPoints = ' + numPoints);
+                return false;
             }
 
+            tempNum = parseInt(config.plot.num_points, 10);
+            if (isFinite(tempNum) === false) {
+                logme('ERROR: Expected config.plot.num_points to be a a valid integer. It is not.');
+                logme('config.plot.num_points = ', config.plot.num_points);
+
+                return false;
+            }
+
+            if (
+                (tempNum < 2) &&
+                (tempNum > 1000)
+            ) {
+                logme('ERROR: Number of points is outside the allowed range [2, 1000]');
+                logme('config.plot.num_points = ' + tempNum);
+
+                return false;
+            }
+
+            numPoints = tempNum;
+
             return true;
         }
 
@@ -311,8 +378,6 @@ define('Graph', ['logme'], function (logme) {
                 // will break.
                 funcString = $('<div>').html(funcString).text();
 
-                logme('funcString = ' + funcString);
-
                 // Some defaults. If no options are set for the graph, we will
                 // make sure that at least a line is drawn for a function.
                 newFunctionObject = {
@@ -324,8 +389,6 @@ define('Graph', ['logme'], function (logme) {
                 // XML.
                 paramNames = state.getAllParameterNames();
 
-                logme('allParamNames = ', paramNames);
-
                 // The 'x' is always one of the function parameters.
                 paramNames.push('x');
 
@@ -333,8 +396,6 @@ define('Graph', ['logme'], function (logme) {
                 // the Function constructor.
                 paramNames.push(funcString);
 
-                console.log('paramNames = ', paramNames);
-
                 // Create the function from the function string, and all of the
                 // available parameters AND the 'x' variable as it's parameters.
                 // For this we will use the built-in Function object
@@ -431,8 +492,6 @@ define('Graph', ['logme'], function (logme) {
                 end = xrange.max.apply(window, paramValues);
                 step = (end - start) / (numPoints - 1);
 
-                logme('start = ' + start + ', end = ' + end + ', step = ' + step);
-
                 // Generate the data points.
                 for (x = start; x <= end; x += step) {
 

From b8ea29c0d2d5e14a1a402df1c9e73ae806683aeb Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Wed, 19 Dec 2012 12:00:58 +0200
Subject: [PATCH 280/541] GST work in progress. Added point size. Added ability
 to redirect function output to element. Updated some example demos.
 Refactoring code.

---
 common/lib/xmodule/xmodule/gst_module.py      |   1 +
 .../js/src/graphical_slider_tool/el_output.js |  97 +++++++++++++
 .../js/src/graphical_slider_tool/graph.js     | 137 ++++++++++++------
 .../js/src/graphical_slider_tool/gst_main.js  |   7 +-
 .../js/src/graphical_slider_tool/state.js     |  18 ++-
 5 files changed, 215 insertions(+), 45 deletions(-)
 create mode 100644 common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index 4366acc91f..0058c827d0 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -32,6 +32,7 @@ class GraphicalSliderToolModule(XModule):
         resource_string(__name__, 'js/src/graphical_slider_tool/sliders.js'),
         resource_string(__name__, 'js/src/graphical_slider_tool/inputs.js'),
         resource_string(__name__, 'js/src/graphical_slider_tool/graph.js'),
+        resource_string(__name__, 'js/src/graphical_slider_tool/el_output.js'),
 
         resource_string(__name__, 'js/src/graphical_slider_tool/gst.js')
       ]
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
new file mode 100644
index 0000000000..e1cac3156e
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
@@ -0,0 +1,97 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+(function (requirejs, require, define) {
+
+define('ElOutput', ['logme'], function (logme) {
+
+    return ElOutput;
+
+    function ElOutput(config, state) {
+
+        if ($.isPlainObject(config.plot.function)) {
+            processFuncObj(config.plot.function);
+        } else if ($.isArray(config.plot.function)) {
+            (function (c1) {
+                while (c1 < config.plot.function.length) {
+                    if ($.isPlainObject(config.plot.function[c1])) {
+                        processFuncObj(config.plot.function[c1]);
+                    }
+
+                    c1 += 1;
+                }
+            }(0));
+        }
+
+        return;
+
+        function processFuncObj(obj) {
+            var outputEl, paramNames, funcString, func;
+
+            // We are only interested in functions that are meant for output to an
+            // element.
+            if (typeof obj['@output'] !== 'string') {
+                return;
+            }
+
+            if (obj['@output'].toLowerCase() !== 'element') {
+                return;
+            }
+
+            if (typeof obj['@el_id'] !== 'string') {
+                logme('ERROR: You specified "output" as "element", but did not spify "el_id".');
+
+                return;
+            }
+
+            if (typeof obj['#text'] !== 'string') {
+                logme('ERROR: Function body is not defined.');
+
+                return;
+            }
+
+            funcString = obj['#text'];
+
+            // Make sure that all HTML entities are converted to their proper
+            // ASCII text equivalents.
+            funcString = $('<div>').html(funcString).text();
+
+            outputEl = $('#' + obj['@el_id']);
+
+            if (outputEl.length !== 1) {
+                logme('ERROR: The element with id "' + obj['@el_id'] + '" was not found.');
+
+                return;
+            }
+
+            paramNames = state.getAllParameterNames();
+            paramNames.push(funcString);
+
+            try {
+                func = Function.apply(null, paramNames);
+            } catch (err) {
+                logme(
+                    'ERROR: The function body "' +
+                        funcString +
+                        '" was not converted by the Function constructor.'
+                );
+
+                paramNames.pop();
+
+                return;
+            }
+
+            paramNames.pop();
+
+            outputEl.html(func.apply(window, state.getAllParameterValues()));
+
+            state.addDynamicEl(outputEl, func);
+        }
+
+    }
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 0df84c35e2..7911496639 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -32,16 +32,21 @@ define('Graph', ['logme'], function (logme) {
 
         // Configure some settings for the graph.
         if (setGraphXRange() === false) {
-            logme('ERROR: could not configure the xrange. Will not continue.');
+            logme('ERROR: Could not configure the xrange. Will not continue.');
 
             return;
         }
 
-        setGraphAxes();
+        if (setGraphAxes() === false) {
+            logme('ERROR: Could not process configuration for the axes.');
+
+            return;
+        }
 
         // Get the user defined functions. If there aren't any, don't do
         // anything else.
         createFunctions();
+
         if (functions.length === 0) {
             logme('ERROR: No functions were specified, or something went wrong.');
 
@@ -49,8 +54,9 @@ define('Graph', ['logme'], function (logme) {
         }
 
         // Create the initial graph and plot it for the user to see.
-        generateData();
-        updatePlot();
+        if (generateData() === true) {
+            updatePlot();
+        }
 
         // Bind an event. Whenever some constant changes, the graph will be
         // redrawn
@@ -59,33 +65,33 @@ define('Graph', ['logme'], function (logme) {
         return;
 
         function setGraphAxes() {
-            // Define the xaxis Flot configuration, and then see if the user
-            // supplied custom values.
-            xaxis = {
-                'min': 0,
-                'tickSize': 1,
-                'max': 10
-            };
+            xaxis = {};
             if (typeof config.plot['xticks'] === 'string') {
-                processTicks(config.plot['xticks'], xaxis, 'xunits');
+                if (processTicks(config.plot['xticks'], xaxis, 'xunits') === false) {
+                    logme('ERROR: Could not process the ticks for x-axis.');
+
+                    return false;
+                }
             } else {
                 logme('MESSAGE: "xticks" were not specified. Using defaults.');
+
+                return false;
             }
 
-            // Define the yaxis Flot configuration, and then see if the user
-            // supplied custom values.
-            yaxis = {
-                'min': 0,
-                'tickSize': 1,
-                'max': 10
-            };
+            yaxis = {};
             if (typeof config.plot['yticks'] === 'string') {
-                processTicks(config.plot['yticks'], yaxis, 'yunits');
+                if (processTicks(config.plot['yticks'], yaxis, 'yunits') === false) {
+                    logme('ERROR: Could not process the ticks for y-axis.');
+
+                    return false;
+                }
             } else {
                 logme('MESSAGE: "yticks" were not specified. Using defaults.');
+
+                return false;
             }
 
-            return;
+            return true;
 
             function processTicks(ticksStr, ticksObj, unitsType) {
                 var ticksBlobs, tempFloat, tempTicks, c1, c2;
@@ -97,7 +103,7 @@ define('Graph', ['logme'], function (logme) {
                 if (ticksBlobs.length !== 3) {
                     logme('ERROR: Did not get 3 blobs from ticksStr = "' + ticksStr + '".');
 
-                    return;
+                    return false;
                 }
 
                 tempFloat = parseFloat(ticksBlobs[0]);
@@ -105,6 +111,8 @@ define('Graph', ['logme'], function (logme) {
                     ticksObj.min = tempFloat;
                 } else {
                     logme('ERROR: Invalid "min". ticksBlobs[0] = ', ticksBlobs[0]);
+
+                    return false;
                 }
 
                 tempFloat = parseFloat(ticksBlobs[1]);
@@ -112,6 +120,8 @@ define('Graph', ['logme'], function (logme) {
                     ticksObj.tickSize = tempFloat;
                 } else {
                     logme('ERROR: Invalid "tickSize". ticksBlobs[1] = ', ticksBlobs[1]);
+
+                    return false;
                 }
 
                 tempFloat = parseFloat(ticksBlobs[2]);
@@ -119,24 +129,25 @@ define('Graph', ['logme'], function (logme) {
                     ticksObj.max = tempFloat;
                 } else {
                     logme('ERROR: Invalid "max". ticksBlobs[2] = ', ticksBlobs[2]);
+
+                    return false;
                 }
 
                 // Is the starting tick to the left of the ending tick (on the
                 // x-axis)? If not, set default starting and ending tick.
                 if (ticksObj.min >= ticksObj.max) {
-                    logme('ERROR: min >= max. Setting defaults.');
+                    logme('ERROR: Ticks min >= max.');
 
-                    ticksObj.min = 0;
-                    ticksObj.max = 10;
+                    return false;
                 }
 
                 // Make sure the range makes sense - i.e. that there are at
                 // least 3 ticks. If not, set a tickSize which will produce
                 // 11 ticks. tickSize is the spacing between the ticks.
-                if (ticksObj.tickSize * 2 >= ticksObj.max - ticksObj.min) {
-                    logme('ERROR: tickSize * 2 >= max - min. Setting defaults.');
+                if (ticksObj.tickSize > ticksObj.max - ticksObj.min) {
+                    logme('ERROR: tickSize > max - min.');
 
-                    ticksObj.tickSize = (ticksObj.max - ticksObj.min) / 10.0;
+                    return false;
                 }
 
                 //  units: change last tick to units
@@ -158,7 +169,11 @@ define('Graph', ['logme'], function (logme) {
                     ticksObj.ticks = tempTicks;
                 }
 
-                return;
+                // ticksObj.font = {
+                //     'size': '16px'
+                // };
+
+                return true;
 
                 function roundToPrec(num, prec) {
                     var c1, tn1, tn2, digitsBefore, digitsAfter;
@@ -354,16 +369,36 @@ define('Graph', ['logme'], function (logme) {
             // properties as parameters. Rather than writing them out every
             // time, we will have a single place where it is done.
             function callAddFunction(obj) {
+                if (typeof obj['@output'] === 'string') {
+
+                    // If this function is meant to be calculated for an
+                    // element then skip it.
+                    if (obj['@output'].toLowerCase() === 'element') {
+                        return;
+                    }
+
+                    // It is an error if "output" is not "element" or "graph".
+                    // Though you can ommit the "output" attribute.
+                    else if (obj['@output'].toLowerCase() !== 'graph') {
+                        logme('ERROR: Function "output" attribute can be either "div" or "graph".');
+
+                        return;
+                    }
+                }
+
+                // The user did not specify an "output" attribute, or it is
+                // "graph".
                 addFunction(
                     obj['#text'],
                     obj['@color'],
                     obj['@line'],
                     obj['@dot'],
-                    obj['@label']
+                    obj['@label'],
+                    obj['@point_size']
                 );
             }
 
-            function addFunction(funcString, color, line, dot, label) {
+            function addFunction(funcString, color, line, dot, label, pointSize) {
                 var newFunctionObject, func, paramNames;
 
                 // The main requirement is function string. Without it we can't
@@ -407,14 +442,15 @@ define('Graph', ['logme'], function (logme) {
                 try {
                     func = Function.apply(null, paramNames);
                 } catch (err) {
-                    // Let's tell the user. He will see a nice red error
-                    // message instead of a graph.
-                    plotDiv.html(
-                        '<span style="color: red;">' +
-                            'Error while parsing JavaScript function body string!' +
-                        '</span>'
+                    logme(
+                        'ERROR: The function body "' +
+                        funcString +
+                        '" was not converted by the Function constructor.'
                     );
 
+                    paramNames.pop();
+                    paramNames.pop();
+
                     return;
                 }
 
@@ -445,6 +481,10 @@ define('Graph', ['logme'], function (logme) {
                     }
                 }
 
+                if (typeof pointSize === 'string') {
+                    newFunctionObject['pointSize'] = pointSize;
+                }
+
                 // If the preference is conflicting (we must have either line
                 // or dot, none is not an option), we will show line.
                 if (
@@ -465,8 +505,9 @@ define('Graph', ['logme'], function (logme) {
         // The callback that will be called whenever a constant changes (gets
         // updated via a slider or a text input).
         function onUpdatePlot(event) {
-            generateData();
-            updatePlot();
+            if (generateData() === true) {
+                updatePlot();
+            }
         }
 
         function generateData() {
@@ -501,7 +542,14 @@ define('Graph', ['logme'], function (logme) {
                     // We call the user defined function, passing all of the
                     // available parameter values. Inside this function they
                     // will be accessible by their names.
-                    y = functionObj.func.apply(window, paramValues);
+                    try {
+                        y = functionObj.func.apply(window, paramValues);
+                    } catch (err) {
+                        logme('ERROR: Could not generate data.');
+                        logme('Error message: "' + err.message + '".');
+
+                        return false;
+                    }
 
                     // Return the paramValues array to how it was before we
                     // added 'x' variable to the end of it.
@@ -549,14 +597,21 @@ define('Graph', ['logme'], function (logme) {
                     'show': functionObj.dot
                 };
 
+                if (functionObj.hasOwnProperty('pointSize')) {
+                    seriesObj.points.radius = functionObj.pointSize;
+                }
+
                 // Add the newly created series object to the series set which
                 // will be plotted by Flot.
                 dataSeries.push(seriesObj);
             }
-        }
+
+            return true;
+        } // End-of: function generateData
 
         function updatePlot() {
             // Tell Flot to draw the graph to our specification.
+
             $.plot(
                 plotDiv,
                 dataSeries,
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
index 3c06cf9544..bdbe317f36 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
@@ -8,8 +8,8 @@ define(
     // Even though it is not explicitly in this module, we have to specify
     // 'GeneralMethods' as a dependency. It expands some of the core JS objects
     // with additional useful methods that are used in other modules.
-    ['State', 'GeneralMethods', 'Sliders', 'Inputs', 'Graph', 'logme'],
-    function (State, GeneralMethods, Sliders, Inputs, Graph, logme) {
+    ['State', 'GeneralMethods', 'Sliders', 'Inputs', 'Graph', 'ElOutput', 'logme'],
+    function (State, GeneralMethods, Sliders, Inputs, Graph, ElOutput, logme) {
 
     return GstMain;
 
@@ -67,6 +67,9 @@ define(
         // Configure and display the graph. Attach event for the graph to be
         // updated on any change of a slider or a text input.
         Graph(gstId, config, state);
+
+        // Configure functions that output to an element instead of the graph.
+        ElOutput(config, state);
     }
 });
 
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
index 19bb557b24..04c0b0a60e 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
@@ -18,7 +18,9 @@ define('State', ['logme'], function (logme) {
 
     function State(gstId, config) {
         var parameters, allParameterNames, allParameterValues,
-            plotDiv;
+            plotDiv, dynamicEl;
+
+        dynamicEl = [];
 
         stateInst += 1;
         logme('MESSAGE: Creating state instance # ' + stateInst + '.');
@@ -92,7 +94,8 @@ define('State', ['logme'], function (logme) {
             'getAllParameterNames': getAllParameterNames,
             'getAllParameterValues': getAllParameterValues,
 
-            'bindUpdatePlotEvent': bindUpdatePlotEvent
+            'bindUpdatePlotEvent': bindUpdatePlotEvent,
+            'addDynamicEl': addDynamicEl
         };
 
         function getAllParameterNames() {
@@ -119,6 +122,13 @@ define('State', ['logme'], function (logme) {
             plotDiv.bind('update_plot', callback);
         }
 
+        function addDynamicEl(outputEl, func) {
+            dynamicEl.push({
+                'outputEl': outputEl,
+                'func': func
+            });
+        }
+
         function getParameterValue(paramName) {
 
             // If the name of the constant is not tracked by state, return an
@@ -238,6 +248,10 @@ define('State', ['logme'], function (logme) {
             // Update the helper array with the new parameter's value.
             allParameterValues[parameters[paramName].helperArrayIndex] = paramValueNum;
 
+            for (c1 = 0; c1 < dynamicEl.length; c1++) {
+                dynamicEl[c1].outputEl.html(dynamicEl[c1].func.apply(window, allParameterValues));
+            }
+
             return true;
         } // End-of: function setParameterValue
 

From 9b500a157cbce4b09336eef000b9399cc5cb8f26 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Wed, 19 Dec 2012 12:32:01 +0200
Subject: [PATCH 281/541] Added extra test checks for GST.

---
 .../js/src/graphical_slider_tool/graph.js     | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 7911496639..ee1123a8d4 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -270,6 +270,7 @@ define('Graph', ['logme'], function (logme) {
                 xrange.min = Function.apply(null, allParamNames);
             } catch (err) {
                 logme('ERROR: could not create a function from the string "' + config.plot.xrange.min + '" for xrange.min.');
+                logme('Error message: "' + err.message + '"');
 
                 return false;
             }
@@ -280,6 +281,7 @@ define('Graph', ['logme'], function (logme) {
                 xrange.max = Function.apply(null, allParamNames);
             } catch (err) {
                 logme('ERROR: could not create a function from the string "' + config.plot.xrange.max + '" for xrange.max.');
+                logme('Error message: "' + err.message + '"');
 
                 return false;
             }
@@ -447,6 +449,7 @@ define('Graph', ['logme'], function (logme) {
                         funcString +
                         '" was not converted by the Function constructor.'
                     );
+                    logme('Error message: "' + err.message + '"');
 
                     paramNames.pop();
                     paramNames.pop();
@@ -529,8 +532,22 @@ define('Graph', ['logme'], function (logme) {
                 // JSON.
                 c1 = 0;
 
-                start = xrange.min.apply(window, paramValues);
-                end = xrange.max.apply(window, paramValues);
+                try {
+                    start = xrange.min.apply(window, paramValues);
+                } catch (err) {
+                    logme('ERROR: Could not determine xrange start.');
+                    logme('Error message: "' + err.message + '".');
+
+                    return false;
+                }
+                try {
+                    end = xrange.max.apply(window, paramValues);
+                } catch (err) {
+                    logme('ERROR: Could not determine xrange end.');
+                    logme('Error message: "' + err.message + '".');
+
+                    return false;
+                }
                 step = (end - start) / (numPoints - 1);
 
                 // Generate the data points.
@@ -568,7 +585,14 @@ define('Graph', ['logme'], function (logme) {
                 if (c1 != numPoints) {
                     x = end;
                     paramValues.push(x);
-                    y = functionObj.func.apply(window, paramValues);
+                    try {
+                        y = functionObj.func.apply(window, paramValues);
+                    } catch (err) {
+                        logme('ERROR: Could not generate data.');
+                        logme('Error message: "' + err.message + '".');
+
+                        return false;
+                    }
                     paramValues.pop();
                     dataPoints.push([x, y]);
                 }

From d45c490bf065833898f569d42c1de9009ddc9907 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 19 Dec 2012 12:40:21 +0200
Subject: [PATCH 282/541] plot now not required

---
 common/lib/xmodule/xmodule/gst_module.py | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index 0058c827d0..3bedd6dc9f 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -73,17 +73,19 @@ class GraphicalSliderToolModule(XModule):
         plot_div = '<div class="{element_class}_plot" id="{element_id}_plot" \
                     style="{style}"></div>'
         # extract css style from plot
-        plot_def = re.search(r'\$plot[^\$]*\$', html_string).group()
-        style = re.search(r'(?=.*style\=[\"\'](.*)[\"\'])', plot_def)
-        if style:
-            style = style.groups()[0]
-        else:  # no style parameter
-            style = ''
-        replacement = plot_div.format(element_class=self.html_class,
-                                      element_id=self.html_id,
-                                            style=style)
-        html_string = re.sub(r'\$plot[^\$]*\$', replacement, html_string,
-                        flags=re.UNICODE)
+        plot_def = re.search(r'\$plot[^\$]*\$', html_string)
+        if plot_def:
+            plot_def = plot_def.group()
+            style = re.search(r'(?=.*style\=[\"\'](.*)[\"\'])', plot_def)
+            if style:
+                style = style.groups()[0]
+            else:  # no style parameter
+                style = ''
+            replacement = plot_div.format(element_class=self.html_class,
+                                          element_id=self.html_id,
+                                                style=style)
+            html_string = re.sub(r'\$plot[^\$]*\$', replacement, html_string,
+                            flags=re.UNICODE)
 
         # get variables
         if json.loads(self.configuration_json)['root'].get('parameters'):

From 12452f1020765ee5a26a0df7d5f5c24f50928527 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Wed, 19 Dec 2012 12:53:11 +0200
Subject: [PATCH 283/541] Removed functions from plot.

---
 .../js/src/graphical_slider_tool/el_output.js | 12 ++++----
 .../js/src/graphical_slider_tool/graph.js     | 28 ++++++++++---------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
index e1cac3156e..98795b5d32 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
@@ -8,13 +8,13 @@ define('ElOutput', ['logme'], function (logme) {
 
     function ElOutput(config, state) {
 
-        if ($.isPlainObject(config.plot.function)) {
-            processFuncObj(config.plot.function);
-        } else if ($.isArray(config.plot.function)) {
+        if ($.isPlainObject(config.functions.function)) {
+            processFuncObj(config.functions.function);
+        } else if ($.isArray(config.functions.function)) {
             (function (c1) {
-                while (c1 < config.plot.function.length) {
-                    if ($.isPlainObject(config.plot.function[c1])) {
-                        processFuncObj(config.plot.function[c1]);
+                while (c1 < config.functions.function.length) {
+                    if ($.isPlainObject(config.functions.function[c1])) {
+                        processFuncObj(config.functions.function[c1]);
                     }
 
                     c1 += 1;
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index ee1123a8d4..fa976d4412 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -9,6 +9,8 @@ define('Graph', ['logme'], function (logme) {
     function Graph(gstId, config, state) {
         var plotDiv, dataSeries, functions, xaxis, yaxis, numPoints, xrange;
 
+        logme(config);
+
         // We must have a graph container DIV element available in order to
         // proceed.
         plotDiv = $('#' + gstId + '_plot');
@@ -322,44 +324,44 @@ define('Graph', ['logme'], function (logme) {
 
             functions = [];
 
-            if (typeof config.plot['function'] === 'undefined') {
-                logme('ERROR: config.plot["function"] is undefined.');
+            if (typeof config.functions === 'undefined') {
+                logme('ERROR: config.functions is undefined.');
 
                 return;
             }
 
-            if (typeof config.plot['function'] === 'string') {
+            if (typeof config.functions.function === 'string') {
 
                 // If just one function string is present.
-                addFunction(config.plot['function']);
+                addFunction(config.functions.function);
 
-            } else if ($.isPlainObject(config.plot['function']) === true) {
+            } else if ($.isPlainObject(config.functions.function) === true) {
 
                 // If a function is present, but it also has properties
                 // defined.
-                callAddFunction(config.plot['function']);
+                callAddFunction(config.functions.function);
 
-            } else if ($.isArray(config.plot['function'])) {
+            } else if ($.isArray(config.functions.function)) {
 
                 // If more than one function is defined.
-                for (c1 = 0; c1 < config.plot['function'].length; c1++) {
+                for (c1 = 0; c1 < config.functions.function.length; c1++) {
 
                     // For each definition, we must check if it is a simple
                     // string definition, or a complex one with properties.
-                    if (typeof config.plot['function'][c1] === 'string') {
+                    if (typeof config.functions.function[c1] === 'string') {
 
                         // Simple string.
-                        addFunction(config.plot['function'][c1]);
+                        addFunction(config.functions.function[c1]);
 
-                    } else if ($.isPlainObject(config.plot['function'][c1])) {
+                    } else if ($.isPlainObject(config.functions.function[c1])) {
 
                         // Properties are present.
-                        callAddFunction(config.plot['function'][c1]);
+                        callAddFunction(config.functions.function[c1]);
 
                     }
                 }
             } else {
-                logme('ERROR: config.plot["function"] is of an unsupported type.');
+                logme('ERROR: config.functions.function is of an unsupported type.');
 
                 return;
             }

From ac23c7c630bd9149e8242e554a781a081154599c Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 19 Dec 2012 13:10:12 +0200
Subject: [PATCH 284/541] fix typo

---
 common/lib/xmodule/xmodule/gst_module.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index 3bedd6dc9f..b1e30bd7a1 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -173,6 +173,7 @@ class GraphicalSliderToolModule(XModule):
         via json.
         """
         # root added for interface compatibility with xmltodict.parse
+        # import ipdb; ipdb.set_trace()
         self.configuration_json = json.dumps(
                 xmltodict.parse('<root class="' + self.location.category + '">' +
                 stringify_children(self.definition['configuration'])
@@ -199,13 +200,13 @@ class GraphicalSliderToolDescriptor(MakoModuleDescriptor, XmlDescriptor):
         expected_children_level_0 = ['render', 'configuration']
         for child in expected_children_level_0:
             if len(xml_object.xpath(child)) != 1:
-                raise ValueError("Self a\ssessment definition must include \
+                raise ValueError("Graphical Slider Tool definition must include \
                     exactly one '{0}' tag".format(child))
 
-        expected_children_level_1 = ['plot']
+        expected_children_level_1 = ['functions']
         for child in expected_children_level_1:
             if len(xml_object.xpath('configuration')[0].xpath(child)) != 1:
-                raise ValueError("Self a\ssessment definition must include \
+                raise ValueError("Graphical Slider Tool definition must include \
                     exactly one '{0}' tag".format(child))
         # finished
 

From 4e368f7d7405479d7c24daac752da8785b18fbe3 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Wed, 19 Dec 2012 13:14:46 +0200
Subject: [PATCH 285/541] Fixed bug where config.plot was causing error if not
 present.

---
 .../xmodule/xmodule/js/src/graphical_slider_tool/graph.js    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index fa976d4412..b87d6fccd7 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -11,6 +11,11 @@ define('Graph', ['logme'], function (logme) {
 
         logme(config);
 
+        // We need plot configuration settings. Without them we can't continue.
+        if ($.isPlainObject(config.plot) === false) {
+            return;
+        }
+
         // We must have a graph container DIV element available in order to
         // proceed.
         plotDiv = $('#' + gstId + '_plot');

From 54c0c36e645b12005bafd292748c921560dc1314 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 19 Dec 2012 13:17:39 +0200
Subject: [PATCH 286/541] fix \n in regext

---
 common/lib/xmodule/xmodule/gst_module.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index b1e30bd7a1..f8f296e97e 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -76,7 +76,8 @@ class GraphicalSliderToolModule(XModule):
         plot_def = re.search(r'\$plot[^\$]*\$', html_string)
         if plot_def:
             plot_def = plot_def.group()
-            style = re.search(r'(?=.*style\=[\"\'](.*)[\"\'])', plot_def)
+            style = re.search(r'(?=.*style\=[\"\'](.*)[\"\'])', plot_def,
+                flags=re.UNICODE | re.DOTALL)
             if style:
                 style = style.groups()[0]
             else:  # no style parameter
@@ -105,7 +106,7 @@ class GraphicalSliderToolModule(XModule):
         for var in variables:
             # find $slider var='var' ... $
             instances = re.findall(r'\$slider\s+(?=.*var\=[\"\']' + var + '[\"\'])' \
-                          + r'[^\$]*\$', html_string)
+                          + r'[^\$]*\$', html_string, flags=re.UNICODE | re.DOTALL)
             if instances:  # if presented, only one slider per var
                 slider_def = instances[0]  # get $slider var='var' ... $ string
                 # extract var for proper style extraction further
@@ -113,7 +114,8 @@ class GraphicalSliderToolModule(XModule):
                                           slider_def).group()
                 slider_def = slider_def.replace(var_substring, '')
                 # get style
-                style = re.search(r'(?=.*style\=[\"\'](.*)[\"\'])', slider_def)
+                style = re.search(r'(?=.*style\=[\"\'](.*)[\"\'])', slider_def,
+                    flags=re.UNICODE | re.DOTALL)
                 if style:
                     style = style.groups()[0]
                 else:  # no style parameter
@@ -126,7 +128,7 @@ class GraphicalSliderToolModule(XModule):
                 # html div element
                 html_string = re.sub(r'\$slider\s+(?=.*var\=[\"\'](' + \
                     var + ')[\"\'])' + r'[^\$]*\$',
-                replacement, html_string, flags=re.UNICODE)
+                replacement, html_string, flags=re.UNICODE | re.DOTALL)
 
         # substitute inputs if we have them
         input_el = '<input class="{element_class}_input" \
@@ -138,7 +140,7 @@ class GraphicalSliderToolModule(XModule):
             input_index = 0  # make multiple inputs for same variable have
                 # different id
             instances = re.findall(r'\$input\s+(?=.*var\=[\"\']' + var + '[\"\'])' \
-                          + r'[^\$]*\$', html_string)
+                          + r'[^\$]*\$', html_string, flags=re.UNICODE | re.DOTALL)
             # import ipdb; ipdb.set_trace()
             for input_def in instances:  # for multiple inputs per var
                 input_index += 1
@@ -146,13 +148,15 @@ class GraphicalSliderToolModule(XModule):
                 var_substring = re.search(r'(var\=[\"\']' + var + r'[\"\'])',
                                           input_def).group()
                 input_def = input_def.replace(var_substring, '')
-                readonly = re.search(r'(?=.*(readonly\=[\"\'](\w+)[\"\']))', input_def)
+                readonly = re.search(r'(?=.*(readonly\=[\"\'](\w+)[\"\']))', 
+                    input_def, flags=re.UNICODE | re.DOTALL)
                 if readonly:
                     input_def = input_def.replace(readonly.groups()[0], '')
                     readonly = readonly.groups()[1]
                 else:
                     readonly = ''
-                style = re.search(r'(?=.*style\=[\"\'](.*)[\"\'])', input_def)
+                style = re.search(r'(?=.*style\=[\"\'](.*)[\"\'])', input_def,
+                    flags=re.UNICODE | re.DOTALL)
                 if style:
                     style = style.groups()[0]
                 else:
@@ -165,7 +169,7 @@ class GraphicalSliderToolModule(XModule):
                 # import ipdb; ipdb.set_trace()
                 html_string = re.sub(r'\$input\s+(?=.*var\=[\"\'](' + \
                                      var + ')[\"\'])' + r'[^\$]*\$',
-                replacement, html_string, count=1, flags=re.UNICODE)
+                replacement, html_string, count=1, flags=re.UNICODE | re.DOTALL)
         return html_string
 
     def get_configuration(self):

From e1588ff903d258cea0047e4187149b34a71c701e Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 19 Dec 2012 13:51:31 +0200
Subject: [PATCH 287/541] fix regexp

---
 common/lib/xmodule/xmodule/gst_module.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index f8f296e97e..b5d1c69368 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -73,10 +73,10 @@ class GraphicalSliderToolModule(XModule):
         plot_div = '<div class="{element_class}_plot" id="{element_id}_plot" \
                     style="{style}"></div>'
         # extract css style from plot
-        plot_def = re.search(r'\$plot[^\$]*\$', html_string)
+        plot_def = re.search(r'\<plot[^\$]*\>', html_string)
         if plot_def:
             plot_def = plot_def.group()
-            style = re.search(r'(?=.*style\=[\"\'](.*)[\"\'])', plot_def,
+            style = re.search(r'(?=[^\$]*style\=[\"\'](.*)[\"\'])', plot_def,
                 flags=re.UNICODE | re.DOTALL)
             if style:
                 style = style.groups()[0]
@@ -105,7 +105,7 @@ class GraphicalSliderToolModule(XModule):
                      </div>'
         for var in variables:
             # find $slider var='var' ... $
-            instances = re.findall(r'\$slider\s+(?=.*var\=[\"\']' + var + '[\"\'])' \
+            instances = re.findall(r'\$slider\s+(?=[^\$]*var\=[\"\']' + var + '[\"\'])' \
                           + r'[^\$]*\$', html_string, flags=re.UNICODE | re.DOTALL)
             if instances:  # if presented, only one slider per var
                 slider_def = instances[0]  # get $slider var='var' ... $ string
@@ -114,7 +114,7 @@ class GraphicalSliderToolModule(XModule):
                                           slider_def).group()
                 slider_def = slider_def.replace(var_substring, '')
                 # get style
-                style = re.search(r'(?=.*style\=[\"\'](.*)[\"\'])', slider_def,
+                style = re.search(r'(?=[^\$]*style\=[\"\'](.*)[\"\'])', slider_def,
                     flags=re.UNICODE | re.DOTALL)
                 if style:
                     style = style.groups()[0]
@@ -126,7 +126,7 @@ class GraphicalSliderToolModule(XModule):
                                             var=var, style=style)
                 # subsitute $slider var='var' ... $ in html_srting to proper
                 # html div element
-                html_string = re.sub(r'\$slider\s+(?=.*var\=[\"\'](' + \
+                html_string = re.sub(r'\$slider\s+(?=[^\$]*var\=[\"\'](' + \
                     var + ')[\"\'])' + r'[^\$]*\$',
                 replacement, html_string, flags=re.UNICODE | re.DOTALL)
 
@@ -139,23 +139,24 @@ class GraphicalSliderToolModule(XModule):
         for var in variables:
             input_index = 0  # make multiple inputs for same variable have
                 # different id
-            instances = re.findall(r'\$input\s+(?=.*var\=[\"\']' + var + '[\"\'])' \
+            instances = re.findall(r'\$input\s+(?=[^\$]*var\=[\"\']' + var + '[\"\'])' \
                           + r'[^\$]*\$', html_string, flags=re.UNICODE | re.DOTALL)
             # import ipdb; ipdb.set_trace()
             for input_def in instances:  # for multiple inputs per var
                 input_index += 1
                 # extract var and readonly before style!
+                # import ipdb; ipdb.set_trace()
                 var_substring = re.search(r'(var\=[\"\']' + var + r'[\"\'])',
                                           input_def).group()
                 input_def = input_def.replace(var_substring, '')
-                readonly = re.search(r'(?=.*(readonly\=[\"\'](\w+)[\"\']))', 
+                readonly = re.search(r'(?=[^\$]*(readonly\=[\"\'](\w+)[\"\']))', 
                     input_def, flags=re.UNICODE | re.DOTALL)
                 if readonly:
                     input_def = input_def.replace(readonly.groups()[0], '')
                     readonly = readonly.groups()[1]
                 else:
                     readonly = ''
-                style = re.search(r'(?=.*style\=[\"\'](.*)[\"\'])', input_def,
+                style = re.search(r'(?=[^\$]*style\=[\"\'](.*)[\"\'])', input_def,
                     flags=re.UNICODE | re.DOTALL)
                 if style:
                     style = style.groups()[0]
@@ -167,7 +168,7 @@ class GraphicalSliderToolModule(XModule):
                         var=var, readonly=readonly, style=style,
                         input_index=input_index)
                 # import ipdb; ipdb.set_trace()
-                html_string = re.sub(r'\$input\s+(?=.*var\=[\"\'](' + \
+                html_string = re.sub(r'\$input\s+(?=[^\$]*var\=[\"\'](' + \
                                      var + ')[\"\'])' + r'[^\$]*\$',
                 replacement, html_string, count=1, flags=re.UNICODE | re.DOTALL)
         return html_string

From e755ade10caea8e43b09db70f07dc626435c7a83 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 19 Dec 2012 13:51:40 +0200
Subject: [PATCH 288/541] fix precision

---
 .../xmodule/js/src/graphical_slider_tool/graph.js      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index b87d6fccd7..ce4d714cce 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -228,11 +228,11 @@ define('Graph', ['logme'], function (logme) {
                     else {
                         tn1 = Math.abs(num);
 
-                        if (digitsAfter > c1) {
-                            tn1 = tn1.toPrecision(digitsBefore + c1);
-                        } else {
-                            tn1 = tn1.toPrecision(digitsBefore + digitsAfter);
-                        }
+                        // if (digitsAfter > c1) {
+                            tn1 = tn1.toFixed(c1);
+                        // } else {
+                        //     tn1 = tn1.toPrecision(digitsBefore + digitsAfter);
+                        // }
                     }
 
                     if (num < 0) {

From 0f330f61189803a7fb40fc9049cd829e6a9f0e6b Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 19 Dec 2012 13:58:55 +0200
Subject: [PATCH 289/541] fix

---
 common/lib/xmodule/xmodule/gst_module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index b5d1c69368..33449dece6 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -73,7 +73,7 @@ class GraphicalSliderToolModule(XModule):
         plot_div = '<div class="{element_class}_plot" id="{element_id}_plot" \
                     style="{style}"></div>'
         # extract css style from plot
-        plot_def = re.search(r'\<plot[^\$]*\>', html_string)
+        plot_def = re.search(r'\$plot[^\$]*\$', html_string)
         if plot_def:
             plot_def = plot_def.group()
             style = re.search(r'(?=[^\$]*style\=[\"\'](.*)[\"\'])', plot_def,

From aa470639611d2b9486530a15512adc4180377735 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 19 Dec 2012 17:37:44 +0200
Subject: [PATCH 290/541] changed to xml syntax

---
 common/lib/xmodule/xmodule/gst_module.py | 34 ++++++++++++------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index 33449dece6..aaa6e11198 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -73,10 +73,10 @@ class GraphicalSliderToolModule(XModule):
         plot_div = '<div class="{element_class}_plot" id="{element_id}_plot" \
                     style="{style}"></div>'
         # extract css style from plot
-        plot_def = re.search(r'\$plot[^\$]*\$', html_string)
+        plot_def = re.search(r'<plot[^<>]*/>', html_string)
         if plot_def:
             plot_def = plot_def.group()
-            style = re.search(r'(?=[^\$]*style\=[\"\'](.*)[\"\'])', plot_def,
+            style = re.search(r'(?=.*style\=[\"\'](.*)[\"\'])', plot_def,
                 flags=re.UNICODE | re.DOTALL)
             if style:
                 style = style.groups()[0]
@@ -85,7 +85,7 @@ class GraphicalSliderToolModule(XModule):
             replacement = plot_div.format(element_class=self.html_class,
                                           element_id=self.html_id,
                                                 style=style)
-            html_string = re.sub(r'\$plot[^\$]*\$', replacement, html_string,
+            html_string = re.sub(r'<plot[^<>]*/>', replacement, html_string,
                             flags=re.UNICODE)
 
         # get variables
@@ -104,17 +104,17 @@ class GraphicalSliderToolModule(XModule):
                                    data-var="{var}" style="{style}">\
                      </div>'
         for var in variables:
-            # find $slider var='var' ... $
-            instances = re.findall(r'\$slider\s+(?=[^\$]*var\=[\"\']' + var + '[\"\'])' \
-                          + r'[^\$]*\$', html_string, flags=re.UNICODE | re.DOTALL)
+            # find <slider var='var' ... >
+            instances = re.findall(r'<slider\s+(?=[^<>]*var\=[\"\']' + var + '[\"\'])' \
+                          + r'[^<>]*/>', html_string, flags=re.UNICODE | re.DOTALL)
             if instances:  # if presented, only one slider per var
-                slider_def = instances[0]  # get $slider var='var' ... $ string
+                slider_def = instances[0]  # get <slider var='var' ... > string
                 # extract var for proper style extraction further
                 var_substring = re.search(r'(var\=[\"\']' + var + r'[\"\'])',
                                           slider_def).group()
                 slider_def = slider_def.replace(var_substring, '')
                 # get style
-                style = re.search(r'(?=[^\$]*style\=[\"\'](.*)[\"\'])', slider_def,
+                style = re.search(r'(?=[^<>]*style\=[\"\'](.*)[\"\'])', slider_def,
                     flags=re.UNICODE | re.DOTALL)
                 if style:
                     style = style.groups()[0]
@@ -124,10 +124,10 @@ class GraphicalSliderToolModule(XModule):
                 replacement = slider_div.format(element_class=self.html_class,
                                             element_id=self.html_id,
                                             var=var, style=style)
-                # subsitute $slider var='var' ... $ in html_srting to proper
+                # subsitute <slider var='var' ... > in html_srting to proper
                 # html div element
-                html_string = re.sub(r'\$slider\s+(?=[^\$]*var\=[\"\'](' + \
-                    var + ')[\"\'])' + r'[^\$]*\$',
+                html_string = re.sub(r'<slider\s+(?=[^<>]*var\=[\"\'](' + \
+                    var + ')[\"\'])' + r'[^<>]*/>',
                 replacement, html_string, flags=re.UNICODE | re.DOTALL)
 
         # substitute inputs if we have them
@@ -139,8 +139,8 @@ class GraphicalSliderToolModule(XModule):
         for var in variables:
             input_index = 0  # make multiple inputs for same variable have
                 # different id
-            instances = re.findall(r'\$input\s+(?=[^\$]*var\=[\"\']' + var + '[\"\'])' \
-                          + r'[^\$]*\$', html_string, flags=re.UNICODE | re.DOTALL)
+            instances = re.findall(r'<textbox\s+(?=[^<>]*var\=[\"\']' + var + '[\"\'])' \
+                          + r'[^<>]*/>', html_string, flags=re.UNICODE | re.DOTALL)
             # import ipdb; ipdb.set_trace()
             for input_def in instances:  # for multiple inputs per var
                 input_index += 1
@@ -149,14 +149,14 @@ class GraphicalSliderToolModule(XModule):
                 var_substring = re.search(r'(var\=[\"\']' + var + r'[\"\'])',
                                           input_def).group()
                 input_def = input_def.replace(var_substring, '')
-                readonly = re.search(r'(?=[^\$]*(readonly\=[\"\'](\w+)[\"\']))', 
+                readonly = re.search(r'(?=[^<>]*(readonly\=[\"\'](\w+)[\"\']))', 
                     input_def, flags=re.UNICODE | re.DOTALL)
                 if readonly:
                     input_def = input_def.replace(readonly.groups()[0], '')
                     readonly = readonly.groups()[1]
                 else:
                     readonly = ''
-                style = re.search(r'(?=[^\$]*style\=[\"\'](.*)[\"\'])', input_def,
+                style = re.search(r'(?=[^<>]*style\=[\"\'](.*)[\"\'])', input_def,
                     flags=re.UNICODE | re.DOTALL)
                 if style:
                     style = style.groups()[0]
@@ -168,8 +168,8 @@ class GraphicalSliderToolModule(XModule):
                         var=var, readonly=readonly, style=style,
                         input_index=input_index)
                 # import ipdb; ipdb.set_trace()
-                html_string = re.sub(r'\$input\s+(?=[^\$]*var\=[\"\'](' + \
-                                     var + ')[\"\'])' + r'[^\$]*\$',
+                html_string = re.sub(r'<textbox\s+(?=[^<>]*var\=[\"\'](' + \
+                                     var + ')[\"\'])' + r'[^<>]*/>',
                 replacement, html_string, count=1, flags=re.UNICODE | re.DOTALL)
         return html_string
 

From 0eeabc6896021ac9788062dd6a3c4e0afad9f97f Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Wed, 19 Dec 2012 18:25:15 +0200
Subject: [PATCH 291/541] Added exmple with normal distribution.

---
 common/lib/xmodule/xmodule/gst_module.py      |   2 +
 .../js/src/graphical_slider_tool/graph.js     |  34 ++-
 .../graphical_slider_tool/jstat-1.0.0.min.js  | 236 ++++++++++++++++++
 3 files changed, 266 insertions(+), 6 deletions(-)
 create mode 100644 common/lib/xmodule/xmodule/js/src/graphical_slider_tool/jstat-1.0.0.min.js

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index aaa6e11198..7e61264929 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -25,6 +25,8 @@ class GraphicalSliderToolModule(XModule):
 
     js = {
       'js': [
+        resource_string(__name__, 'js/src/graphical_slider_tool/jstat-1.0.0.min.js'),
+
         resource_string(__name__, 'js/src/graphical_slider_tool/gst_main.js'),
         resource_string(__name__, 'js/src/graphical_slider_tool/state.js'),
         resource_string(__name__, 'js/src/graphical_slider_tool/logme.js'),
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index ce4d714cce..39bc1bd9bf 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -403,11 +403,12 @@ define('Graph', ['logme'], function (logme) {
                     obj['@line'],
                     obj['@dot'],
                     obj['@label'],
-                    obj['@point_size']
+                    obj['@point_size'],
+                    obj['@fill_area']
                 );
             }
 
-            function addFunction(funcString, color, line, dot, label, pointSize) {
+            function addFunction(funcString, color, line, dot, label, pointSize, fillArea) {
                 var newFunctionObject, func, paramNames;
 
                 // The main requirement is function string. Without it we can't
@@ -422,6 +423,8 @@ define('Graph', ['logme'], function (logme) {
                 // will break.
                 funcString = $('<div>').html(funcString).text();
 
+                logme('graph: funcstr = "' + funcString + '"');
+
                 // Some defaults. If no options are set for the graph, we will
                 // make sure that at least a line is drawn for a function.
                 newFunctionObject = {
@@ -476,17 +479,17 @@ define('Graph', ['logme'], function (logme) {
                 }
 
                 if (typeof line === 'string') {
-                    if (line === 'true') {
+                    if (line.toLowerCase() === 'true') {
                         newFunctionObject['line'] = true;
-                    } else if (line === 'false') {
+                    } else if (line.toLowerCase() === 'false') {
                         newFunctionObject['line'] = false;
                     }
                 }
 
                 if (typeof dot === 'string') {
-                    if (dot === 'true') {
+                    if (dot.toLowerCase() === 'true') {
                         newFunctionObject['dot'] = true;
-                    } else if (dot === 'false') {
+                    } else if (dot.toLowerCase() === 'false') {
                         newFunctionObject['dot'] = false;
                     }
                 }
@@ -504,6 +507,21 @@ define('Graph', ['logme'], function (logme) {
                     newFunctionObject['line'] = true;
                 }
 
+                if (newFunctionObject['line'] === true) {
+                    if (typeof fillArea === 'string') {
+                        if (fillArea.toLowerCase() === 'true') {
+                            newFunctionObject['fillArea'] = true;
+                        } else if (fillArea.toLowerCase() === 'false') {
+                            newFunctionObject['fillArea'] = false;
+                        } else {
+                            logme('ERROR: The attribute fill_area should be either "true" or "false".');
+                            logme('fill_area = "' + fillArea + '".');
+
+                            return;
+                        }
+                    }
+                }
+
                 if (typeof label === 'string') {
                     newFunctionObject['label'] = label;
                 }
@@ -622,6 +640,10 @@ define('Graph', ['logme'], function (logme) {
                     'show': functionObj.line
                 };
 
+                if (functionObj.hasOwnProperty('fillArea') === true) {
+                    seriesObj.lines.fill = functionObj.fillArea;
+                }
+
                 // Should each data point be represented by a point on the
                 // graph?
                 seriesObj.points = {
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/jstat-1.0.0.min.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/jstat-1.0.0.min.js
new file mode 100644
index 0000000000..7f9cd4a124
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/jstat-1.0.0.min.js
@@ -0,0 +1,236 @@
+function jstat(){}
+j=jstat;(function(){var initializing=false,fnTest=/xyz/.test(function(){xyz;})?/\b_super\b/:/.*/;this.Class=function(){};Class.extend=function(prop){var _super=this.prototype;initializing=true;var prototype=new this();initializing=false;for(var name in prop){prototype[name]=typeof prop[name]=="function"&&typeof _super[name]=="function"&&fnTest.test(prop[name])?(function(name,fn){return function(){var tmp=this._super;this._super=_super[name];var ret=fn.apply(this,arguments);this._super=tmp;return ret;};})(name,prop[name]):prop[name];}
+function Class(){if(!initializing&&this.init)
+this.init.apply(this,arguments);}
+Class.prototype=prototype;Class.constructor=Class;Class.extend=arguments.callee;return Class;};})();jstat.ONE_SQRT_2PI=0.3989422804014327;jstat.LN_SQRT_2PI=0.9189385332046727417803297;jstat.LN_SQRT_PId2=0.225791352644727432363097614947;jstat.DBL_MIN=2.22507e-308;jstat.DBL_EPSILON=2.220446049250313e-16;jstat.SQRT_32=5.656854249492380195206754896838;jstat.TWO_PI=6.283185307179586;jstat.DBL_MIN_EXP=-999;jstat.SQRT_2dPI=0.79788456080287;jstat.LN_SQRT_PI=0.5723649429247;jstat.seq=function(min,max,length){var r=new Range(min,max,length);return r.getPoints();}
+jstat.dnorm=function(x,mean,sd,log){if(mean==null)mean=0;if(sd==null)sd=1;if(log==null)log=false;var n=new NormalDistribution(mean,sd);if(!isNaN(x)){return n._pdf(x,log);}else if(x.length){var res=[];for(var i=0;i<x.length;i++){res.push(n._pdf(x[i],log));}
+return res;}else{throw"Illegal argument: x";}}
+jstat.pnorm=function(q,mean,sd,lower_tail,log){if(mean==null)mean=0;if(sd==null)sd=1;if(lower_tail==null)lower_tail=true;if(log==null)log=false;var n=new NormalDistribution(mean,sd);if(!isNaN(q)){return n._cdf(q,lower_tail,log);}else if(q.length){var res=[];for(var i=0;i<q.length;i++){res.push(n._cdf(q[i],lower_tail,log));}
+return res;}else{throw"Illegal argument: x";}}
+jstat.dlnorm=function(x,meanlog,sdlog,log){if(meanlog==null)meanlog=0;if(sdlog==null)sdlog=1;if(log==null)log=false;var n=new LogNormalDistribution(meanlog,sdlog);if(!isNaN(x)){return n._pdf(x,log);}else if(x.length){var res=[];for(var i=0;i<x.length;i++){res.push(n._pdf(x[i],log));}
+return res;}else{throw"Illegal argument: x";}}
+jstat.plnorm=function(q,meanlog,sdlog,lower_tail,log){if(meanlog==null)meanlog=0;if(sdlog==null)sdlog=1;if(lower_tail==null)lower_tail=true;if(log==null)log=false;var n=new LogNormalDistribution(meanlog,sdlog);if(!isNaN(q)){return n._cdf(q,lower_tail,log);}
+else if(q.length){var res=[];for(var i=0;i<q.length;i++){res.push(n._cdf(q[i],lower_tail,log));}
+return res;}else{throw"Illegal argument: x";}}
+jstat.dbeta=function(x,alpha,beta,ncp,log){if(ncp==null)ncp=0;if(log==null)log=false;var b=new BetaDistribution(alpha,beta);if(!isNaN(x)){return b._pdf(x,log);}
+else if(x.length){var res=[];for(var i=0;i<x.length;i++){res.push(b._pdf(x[i],log));}
+return res;}else{throw"Illegal argument: x";}}
+jstat.pbeta=function(q,alpha,beta,ncp,lower_tail,log){if(ncp==null)ncp=0;if(log==null)log=false;if(lower_tail==null)lower_tail=true;var b=new BetaDistribution(alpha,beta);if(!isNaN(q)){return b._cdf(q,lower_tail,log);}else if(q.length){var res=[];for(var i=0;i<q.length;i++){res.push(b._cdf(q[i],lower_tail,log));}
+return res;}
+else{throw"Illegal argument: x";}}
+jstat.dgamma=function(x,shape,rate,scale,log){if(rate==null)rate=1;if(scale==null)scale=1/rate;if(log==null)log=false;var g=new GammaDistribution(shape,scale);if(!isNaN(x)){return g._pdf(x,log);}else if(x.length){var res=[];for(var i=0;i<x.length;i++){res.push(g._pdf(x[i],log));}
+return res;}else{throw"Illegal argument: x";}}
+jstat.pgamma=function(q,shape,rate,scale,lower_tail,log){if(rate==null)rate=1;if(scale==null)scale=1/rate;if(lower_tail==null)lower_tail=true;if(log==null)log=false;var g=new GammaDistribution(shape,scale);if(!isNaN(q)){return g._cdf(q,lower_tail,log);}else if(q.length){var res=[];for(var i=0;i<q.length;i++){res.push(g._cdf(q[i],lower_tail,log));}
+return res;}else{throw"Illegal argument: x";}}
+jstat.dt=function(x,df,ncp,log){if(log==null)log=false;var t=new StudentTDistribution(df,ncp);if(!isNaN(x)){return t._pdf(x,log);}else if(x.length){var res=[];for(var i=0;i<x.length;i++){res.push(t._pdf(x[i],log));}
+return res;}else{throw"Illegal argument: x";}}
+jstat.pt=function(q,df,ncp,lower_tail,log){if(lower_tail==null)lower_tail=true;if(log==null)log=false;var t=new StudentTDistribution(df,ncp);if(!isNaN(q)){return t._cdf(q,lower_tail,log);}else if(q.length){var res=[];for(var i=0;i<q.length;i++){res.push(t._cdf(q[i],lower_tail,log));}
+return res;}else{throw"Illegal argument: x";}}
+jstat.plot=function(x,y,options){if(x==null){throw"x is undefined in jstat.plot";}
+if(y==null){throw"y is undefined in jstat.plot";}
+if(x.length!=y.length){throw"x and y lengths differ in jstat.plot";}
+var flotOpt={series:{lines:{},points:{}}};var series=[];if(x.length==undefined){series.push([x,y]);flotOpt.series.points.show=true;}else{for(var i=0;i<x.length;i++){series.push([x[i],y[i]]);}}
+var title='jstat graph';if(options!=null){if(options.type!=null){if(options.type=='l'){flotOpt.series.lines.show=true;}else if(options.type=='p'){flotOpt.series.lines.show=false;flotOpt.series.points.show=true;}}
+if(options.hover!=null){flotOpt.grid={hoverable:options.hover}}
+if(options.main!=null){title=options.main;}}
+var now=new Date();var hash=now.getMilliseconds()*now.getMinutes()+now.getSeconds();$('body').append('<div title="'+title+'" style="display: none;" id="'+hash+'"><div id="graph-'+hash+'" style="width:95%; height: 95%"></div></div>');$('#'+hash).dialog({modal:false,width:475,height:475,resizable:true,resize:function(){$.plot($('#graph-'+hash),[series],flotOpt);},open:function(event,ui){var id='#graph-'+hash;$.plot($('#graph-'+hash),[series],flotOpt);}})}
+jstat.log10=function(arg){return Math.log(arg)/Math.LN10;}
+jstat.toSigFig=function(num,n){if(num==0){return 0;}
+var d=Math.ceil(jstat.log10(num<0?-num:num));var power=n-parseInt(d);var magnitude=Math.pow(10,power);var shifted=Math.round(num*magnitude);return shifted/magnitude;}
+jstat.trunc=function(x){return(x>0)?Math.floor(x):Math.ceil(x);}
+jstat.isFinite=function(x){return(!isNaN(x)&&(x!=Number.POSITIVE_INFINITY)&&(x!=Number.NEGATIVE_INFINITY));}
+jstat.dopois_raw=function(x,lambda,give_log){if(lambda==0){if(x==0){return(give_log)?0.0:1.0;}
+return(give_log)?Number.NEGATIVE_INFINITY:0.0;}
+if(!jstat.isFinite(lambda))return(give_log)?Number.NEGATIVE_INFINITY:0.0;if(x<0)return(give_log)?Number.NEGATIVE_INFINITY:0.0;if(x<=lambda*jstat.DBL_MIN){return(give_log)?-lambda:Math.exp(-lambda);}
+if(lambda<x*jstat.DBL_MIN){var param=-lambda+x*Math.log(lambda)-jstat.lgamma(x+1);return(give_log)?param:Math.exp(param);}
+var param1=jstat.TWO_PI*x;var param2=-jstat.stirlerr(x)-jstat.bd0(x,lambda);return(give_log)?-0.5*Math.log(param1)+param2:Math.exp(param2)/Math.sqrt(param1);}
+jstat.bd0=function(x,np){var ej,s,s1,v,j;if(!jstat.isFinite(x)||!jstat.isFinite(np)||np==0.0)throw"illegal parameter in jstat.bd0";if(Math.abs(x-np)>0.1*(x+np)){v=(x-np)/(x+np);s=(x-np)*v;ej=2*x*v;v=v*v;for(j=1;;j++){ej*=v;s1=s+ej/((j<<1)+1);if(s1==s)
+return(s1);s=s1;}}
+return(x*Math.log(x/np)+np-x);}
+jstat.stirlerr=function(n){var S0=0.083333333333333333333;var S1=0.00277777777777777777778;var S2=0.00079365079365079365079365;var S3=0.000595238095238095238095238;var S4=0.0008417508417508417508417508;var sferr_halves=[0.0,0.1534264097200273452913848,0.0810614667953272582196702,0.0548141210519176538961390,0.0413406959554092940938221,0.03316287351993628748511048,0.02767792568499833914878929,0.02374616365629749597132920,0.02079067210376509311152277,0.01848845053267318523077934,0.01664469118982119216319487,0.01513497322191737887351255,0.01387612882307074799874573,0.01281046524292022692424986,0.01189670994589177009505572,0.01110455975820691732662991,0.010411265261972096497478567,0.009799416126158803298389475,0.009255462182712732917728637,0.008768700134139385462952823,0.008330563433362871256469318,0.007934114564314020547248100,0.007573675487951840794972024,0.007244554301320383179543912,0.006942840107209529865664152,0.006665247032707682442354394,0.006408994188004207068439631,0.006171712263039457647532867,0.005951370112758847735624416,0.005746216513010115682023589,0.005554733551962801371038690];var nn;if(n<=15.0){nn=n+n;if(nn==parseInt(nn))return(sferr_halves[parseInt(nn)]);return(jstat.lgamma(n+1.0)-(n+0.5)*Math.log(n)+n-jstat.LN_SQRT_2PI);}
+nn=n*n;if(n>500)return((S0-S1/nn)/n);if(n>80)return((S0-(S1-S2/nn)/nn)/n);if(n>35)return((S0-(S1-(S2-S3/nn)/nn)/nn)/n);return((S0-(S1-(S2-(S3-S4/nn)/nn)/nn)/nn)/n);}
+jstat.lgamma=function(x){function lgammafn_sign(x,sgn){var ans,y,sinpiy;var xmax=2.5327372760800758e+305;var dxrel=1.490116119384765696e-8;if(sgn!=null)sgn=1;if(isNaN(x))return x;if(x<0&&(Math.floor(-x)%2.0)==0)
+if(sgn!=null)sgn=-1;if(x<=0&&x==jstat.trunc(x)){console.warn("Negative integer argument in lgammafn_sign");return Number.POSITIVE_INFINITY;}
+y=Math.abs(x);if(y<=10)return Math.log(Math.abs(jstat.gamma(x)));if(y>xmax){console.warn("Illegal arguement passed to lgammafn_sign");return Number.POSITIVE_INFINITY;}
+if(x>0){if(x>1e17){return(x*(Math.log(x)-1.0));}else if(x>4934720.0){return(jstat.LN_SQRT_2PI+(x-0.5)*Math.log(x)-x);}else{return jstat.LN_SQRT_2PI+(x-0.5)*Math.log(x)-x+jstat.lgammacor(x);}}
+sinpiy=Math.abs(Math.sin(Math.PI*y));if(sinpiy==0){throw"Should never happen!!";}
+ans=jstat.LN_SQRT_PId2+(x-0.5)*Math.log(y)-x-Math.log(sinpiy)-jstat.lgammacor(y);if(Math.abs((x-jstat.trunc(x-0.5))*ans/x)<dxrel){throw"The answer is less than half the precision argument too close to a negative integer";}
+return ans;}
+return lgammafn_sign(x,null);}
+jstat.gamma=function(x){var xbig=171.624;var p=[-1.71618513886549492533811,24.7656508055759199108314,-379.804256470945635097577,629.331155312818442661052,866.966202790413211295064,-31451.2729688483675254357,-36144.4134186911729807069,66456.1438202405440627855];var q=[-30.8402300119738975254353,315.350626979604161529144,-1015.15636749021914166146,-3107.77167157231109440444,22538.1184209801510330112,4755.84627752788110767815,-134659.959864969306392456,-115132.259675553483497211];var c=[-.001910444077728,8.4171387781295e-4,-5.952379913043012e-4,7.93650793500350248e-4,-.002777777777777681622553,.08333333333333333331554247,.0057083835261];var i,n,parity,fact,xden,xnum,y,z,yi,res,sum,ysq;parity=(0);fact=1.0;n=0;y=x;if(y<=0.0){y=-x;yi=jstat.trunc(y);res=y-yi;if(res!=0.0){if(yi!=jstat.trunc(yi*0.5)*2.0)
+parity=(1);fact=-Math.PI/Math.sin(Math.PI*res);y+=1.0;}else{return(Number.POSITIVE_INFINITY);}}
+if(y<jstat.DBL_EPSILON){if(y>=jstat.DBL_MIN){res=1.0/y;}else{return(Number.POSITIVE_INFINITY);}}else if(y<12.0){yi=y;if(y<1.0){z=y;y+=1.0;}else{n=parseInt(y)-1;y-=parseFloat(n);z=y-1.0;}
+xnum=0.0;xden=1.0;for(i=0;i<8;++i){xnum=(xnum+p[i])*z;xden=xden*z+q[i];}
+res=xnum/xden+1.0;if(yi<y){res/=yi;}else if(yi>y){for(i=0;i<n;++i){res*=y;y+=1.0;}}}else{if(y<=xbig){ysq=y*y;sum=c[6];for(i=0;i<6;++i){sum=sum/ysq+c[i];}
+sum=sum/y-y+jstat.LN_SQRT_2PI;sum+=(y-0.5)*Math.log(y);res=Math.exp(sum);}else{return(Number.POSITIVE_INFINITY);}}
+if(parity)
+res=-res;if(fact!=1.0)
+res=fact/res;return res;}
+jstat.lgammacor=function(x){var algmcs=[+.1666389480451863247205729650822e+0,-.1384948176067563840732986059135e-4,+.9810825646924729426157171547487e-8,-.1809129475572494194263306266719e-10,+.6221098041892605227126015543416e-13,-.3399615005417721944303330599666e-15,+.2683181998482698748957538846666e-17,-.2868042435334643284144622399999e-19,+.3962837061046434803679306666666e-21,-.6831888753985766870111999999999e-23,+.1429227355942498147573333333333e-24,-.3547598158101070547199999999999e-26,+.1025680058010470912000000000000e-27,-.3401102254316748799999999999999e-29,+.1276642195630062933333333333333e-30];var tmp;var nalgm=5;var xbig=94906265.62425156;var xmax=3.745194030963158e306;if(x<10){return Number.NaN;}else if(x>=xmax){throw"Underflow error in lgammacor";}else if(x<xbig){tmp=10/x;return jstat.chebyshev(tmp*tmp*2-1,algmcs,nalgm)/x;}
+return 1/(x*12);}
+jstat.incompleteBeta=function(a,b,x){function betacf(a,b,x){var MAXIT=100;var EPS=3.0e-12;var FPMIN=1.0e-30;var m,m2,aa,c,d,del,h,qab,qam,qap;qab=a+b;qap=a+1.0;qam=a-1.0;c=1.0;d=1.0-qab*x/qap;if(Math.abs(d)<FPMIN){d=FPMIN;}
+d=1.0/d;h=d;for(m=1;m<=MAXIT;m++){m2=2*m;aa=m*(b-m)*x/((qam+m2)*(a+m2));d=1.0+aa*d;if(Math.abs(d)<FPMIN){d=FPMIN;}
+c=1.0+aa/c;if(Math.abs(c)<FPMIN){c=FPMIN;}
+d=1.0/d;h*=d*c;aa=-(a+m)*(qab+m)*x/((a+m2)*(qap+m2));d=1.0+aa*d;if(Math.abs(d)<FPMIN){d=FPMIN;}
+c=1.0+aa/c;if(Math.abs(c)<FPMIN){c=FPMIN;}
+d=1.0/d;del=d*c;h*=del;if(Math.abs(del-1.0)<EPS){break;}}
+if(m>MAXIT){console.warn("a or b too big, or MAXIT too small in betacf: "+a+", "+b+", "+x+", "+h);return h;}
+if(isNaN(h)){console.warn(a+", "+b+", "+x);}
+return h;}
+var bt;if(x<0.0||x>1.0){throw"bad x in routine incompleteBeta";}
+if(x==0.0||x==1.0){bt=0.0;}else{bt=Math.exp(jstat.lgamma(a+b)-jstat.lgamma(a)-jstat.lgamma(b)+a*Math.log(x)+b*Math.log(1.0-x));}
+if(x<(a+1.0)/(a+b+2.0)){return bt*betacf(a,b,x)/a;}else{return 1.0-bt*betacf(b,a,1.0-x)/b;}}
+jstat.chebyshev=function(x,a,n){var b0,b1,b2,twox;var i;if(n<1||n>1000)return Number.NaN;if(x<-1.1||x>1.1)return Number.NaN;twox=x*2;b2=b1=0;b0=0;for(i=1;i<=n;i++){b2=b1;b1=b0;b0=twox*b1-b2+a[n-i];}
+return(b0-b2)*0.5;}
+jstat.fmin2=function(x,y){return(x<y)?x:y;}
+jstat.log1p=function(x){var ret=0,n=50;if(x<=-1){return Number.NEGATIVE_INFINITY;}
+if(x<0||x>1){return Math.log(1+x);}
+for(var i=1;i<n;i++){if((i%2)===0){ret-=Math.pow(x,i)/i;}else{ret+=Math.pow(x,i)/i;}}
+return ret;}
+jstat.expm1=function(x){var y,a=Math.abs(x);if(a<jstat.DBL_EPSILON)return x;if(a>0.697)return Math.exp(x)-1;if(a>1e-8){y=Math.exp(x)-1;}else{y=(x/2+1)*x;}
+y-=(1+y)*(jstat.log1p(y)-x);return y;}
+jstat.logBeta=function(a,b){var corr,p,q;p=q=a;if(b<p)p=b;if(b>q)q=b;if(p<0){console.warn('Both arguements must be >= 0');return Number.NaN;}
+else if(p==0){return Number.POSITIVE_INFINITY;}
+else if(!jstat.isFinite(q)){return Number.NEGATIVE_INFINITY;}
+if(p>=10){corr=jstat.lgammacor(p)+jstat.lgammacor(q)-jstat.lgammacor(p+q);return Math.log(q)*-0.5+jstat.LN_SQRT_2PI+corr
++(p-0.5)*Math.log(p/(p+q))+q*jstat.log1p(-p/(p+q));}
+else if(q>=10){corr=jstat.lgammacor(q)-jstat.lgammacor(p+q);return jstat.lgamma(p)+corr+p-p*Math.log(p+q)
++(q-0.5)*jstat.log1p(-p/(p+q));}
+else
+return Math.log(jstat.gamma(p)*(jstat.gamma(q)/jstat.gamma(p+q)));}
+jstat.dbinom_raw=function(x,n,p,q,give_log){if(give_log==null)give_log=false;var lf,lc;if(p==0){if(x==0){return(give_log)?0.0:1.0;}else{return(give_log)?Number.NEGATIVE_INFINITY:0.0;}}
+if(q==0){if(x==n){return(give_log)?0.0:1.0;}else{return(give_log)?Number.NEGATIVE_INFINITY:0.0;}}
+if(x==0){if(n==0)return(give_log)?0.0:1.0;lc=(p<0.1)?-jstat.bd0(n,n*q)-n*p:n*Math.log(q);return(give_log)?lc:Math.exp(lc);}
+if(x==n){lc=(q<0.1)?-jstat.bd0(n,n*p)-n*q:n*Math.log(p);return(give_log)?lc:Math.exp(lc);}
+if(x<0||x>n)return(give_log)?Number.NEGATIVE_INFINITY:0.0;lc=jstat.stirlerr(n)-jstat.stirlerr(x)-jstat.stirlerr(n-x)-jstat.bd0(x,n*p)-jstat.bd0(n-x,n*q);lf=Math.log(jstat.TWO_PI)+Math.log(x)+jstat.log1p(-x/n);return(give_log)?lc-0.5*lf:Math.exp(lc-0.5*lf);}
+jstat.max=function(values){var max=Number.NEGATIVE_INFINITY;for(var i=0;i<values.length;i++){if(values[i]>max){max=values[i];}}
+return max;}
+var Range=Class.extend({init:function(min,max,numPoints){this._minimum=parseFloat(min);this._maximum=parseFloat(max);this._numPoints=parseFloat(numPoints);},getMinimum:function(){return this._minimum;},getMaximum:function(){return this._maximum;},getNumPoints:function(){return this._numPoints;},getPoints:function(){var results=[];var x=this._minimum;var step=(this._maximum-this._minimum)/(this._numPoints-1);for(var i=0;i<this._numPoints;i++){results[i]=parseFloat(x.toFixed(6));x+=step;}
+return results;}});Range.validate=function(range){if(!range instanceof Range){return false;}
+if(isNaN(range.getMinimum())||isNaN(range.getMaximum())||isNaN(range.getNumPoints())||range.getMaximum()<range.getMinimum()||range.getNumPoints()<=0){return false;}
+return true;}
+var ContinuousDistribution=Class.extend({init:function(name){this._name=name;},toString:function(){return this._string;},getName:function(){return this._name;},getClassName:function(){return this._name+'Distribution';},density:function(valueOrRange){if(!isNaN(valueOrRange)){return parseFloat(this._pdf(valueOrRange).toFixed(15));}else if(Range.validate(valueOrRange)){var points=valueOrRange.getPoints();var result=[];for(var i=0;i<points.length;i++){result[i]=parseFloat(this._pdf(points[i]));}
+return result;}else{throw"Invalid parameter supplied to "+this.getClassName()+".density()";}},cumulativeDensity:function(valueOrRange){if(!isNaN(valueOrRange)){return parseFloat(this._cdf(valueOrRange).toFixed(15));}else if(Range.validate(valueOrRange)){var points=valueOrRange.getPoints();var result=[];for(var i=0;i<points.length;i++){result[i]=parseFloat(this._cdf(points[i]));}
+return result;}else{throw"Invalid parameter supplied to "+this.getClassName()+".cumulativeDensity()";}},getRange:function(standardDeviations,numPoints){if(standardDeviations==null){standardDeviations=5;}
+if(numPoints==null){numPoints=100;}
+var min=this.getMean()-standardDeviations*Math.sqrt(this.getVariance());var max=this.getMean()+standardDeviations*Math.sqrt(this.getVariance());if(this.getClassName()=='GammaDistribution'||this.getClassName()=='LogNormalDistribution'){min=0.0;max=this.getMean()+standardDeviations*Math.sqrt(this.getVariance());}else if(this.getClassName()=='BetaDistribution'){min=0.0;max=1.0;}
+var range=new Range(min,max,numPoints);return range;},getVariance:function(){},getMean:function(){},getQuantile:function(p){var self=this;function findClosestMatch(range,p){var ERR=1.0e-5;var xs=range.getPoints();var closestIndex=0;var closestDistance=999;for(var i=0;i<xs.length;i++){var pp=self.cumulativeDensity(xs[i]);var distance=Math.abs(pp-p);if(distance<closestDistance){closestIndex=i;closestDistance=distance;}}
+if(closestDistance<=ERR){return xs[closestIndex];}else{var newRange=new Range(xs[closestIndex-1],xs[closestIndex+1],20);return findClosestMatch(newRange,p);}}
+var range=this.getRange(5,20);return findClosestMatch(range,p);}});var NormalDistribution=ContinuousDistribution.extend({init:function(mean,sigma){this._super('Normal');this._mean=parseFloat(mean);this._sigma=parseFloat(sigma);this._string="Normal ("+this._mean.toFixed(2)+", "+this._sigma.toFixed(2)+")";},_pdf:function(x,give_log){if(give_log==null){give_log=false;}
+var sigma=this._sigma;var mu=this._mean;if(!jstat.isFinite(sigma)){return(give_log)?Number.NEGATIVE_INFINITY:0.0}
+if(!jstat.isFinite(x)&&mu==x){return Number.NaN;}
+if(sigma<=0){if(sigma<0){throw"invalid sigma in _pdf";}
+return(x==mu)?Number.POSITIVE_INFINITY:(give_log)?Number.NEGATIVE_INFINITY:0.0;}
+x=(x-mu)/sigma;if(!jstat.isFinite(x)){return(give_log)?Number.NEGATIVE_INFINITY:0.0;}
+return(give_log?-(jstat.LN_SQRT_2PI+0.5*x*x+Math.log(sigma)):jstat.ONE_SQRT_2PI*Math.exp(-0.5*x*x)/sigma);},_cdf:function(x,lower_tail,log_p){if(lower_tail==null)lower_tail=true;if(log_p==null)log_p=false;function pnorm_both(x,cum,ccum,i_tail,log_p){var a=[2.2352520354606839287,161.02823106855587881,1067.6894854603709582,18154.981253343561249,0.065682337918207449113];var b=[47.20258190468824187,976.09855173777669322,10260.932208618978205,45507.789335026729956];var c=[0.39894151208813466764,8.8831497943883759412,93.506656132177855979,597.27027639480026226,2494.5375852903726711,6848.1904505362823326,11602.651437647350124,9842.7148383839780218,1.0765576773720192317e-8];var d=[22.266688044328115691,235.38790178262499861,1519.377599407554805,6485.558298266760755,18615.571640885098091,34900.952721145977266,38912.003286093271411,19685.429676859990727];var p=[0.21589853405795699,0.1274011611602473639,0.022235277870649807,0.001421619193227893466,2.9112874951168792e-5,0.02307344176494017303];var q=[1.28426009614491121,0.468238212480865118,0.0659881378689285515,0.00378239633202758244,7.29751555083966205e-5];var xden,xnum,temp,del,eps,xsq,y,i,lower,upper;eps=jstat.DBL_EPSILON*0.5;lower=i_tail!=1;upper=i_tail!=0;y=Math.abs(x);if(y<=0.67448975){if(y>eps){xsq=x*x;xnum=a[4]*xsq;xden=xsq;for(i=0;i<3;++i){xnum=(xnum+a[i])*xsq;xden=(xden+b[i])*xsq;}}else{xnum=xden=0.0;}
+temp=x*(xnum+a[3])/(xden+b[3]);if(lower)cum=0.5+temp;if(upper)ccum=0.5-temp;if(log_p){if(lower)cum=Math.log(cum);if(upper)ccum=Math.log(ccum);}}else if(y<=jstat.SQRT_32){xnum=c[8]*y;xden=y;for(i=0;i<7;++i){xnum=(xnum+c[i])*y;xden=(xden+d[i])*y;}
+temp=(xnum+c[7])/(xden+d[7]);xsq=jstat.trunc(x*16)/16;del=(x-xsq)*(x+xsq);if(log_p){cum=(-xsq*xsq*0.5)+(-del*0.5)+Math.log(temp);if((lower&&x>0.)||(upper&&x<=0.))
+ccum=jstat.log1p(-Math.exp(-xsq*xsq*0.5)*Math.exp(-del*0.5)*temp);}
+else{cum=Math.exp(-xsq*xsq*0.5)*Math.exp(-del*0.5)*temp;ccum=1.0-cum;}
+if(x>0.0){temp=cum;if(lower){cum=ccum;}
+ccum=temp;}}
+else if((log_p&&y<1e170)||(lower&&-37.5193<x&&x<8.2924)||(upper&&-8.2924<x&&x<37.5193)){xsq=1.0/(x*x);xnum=p[5]*xsq;xden=xsq;for(i=0;i<4;++i){xnum=(xnum+p[i])*xsq;xden=(xden+q[i])*xsq;}
+temp=xsq*(xnum+p[4])/(xden+q[4]);temp=(jstat.ONE_SQRT_2PI-temp)/y;xsq=jstat.trunc(x*16)/16;del=(x-xsq)*(x+xsq);if(log_p){cum=(-xsq*xsq*0.5)+(-del*0.5)+Math.log(temp);if((lower&&x>0.)||(upper&&x<=0.))
+ccum=jstat.log1p(-Math.exp(-xsq*xsq*0.5)*Math.exp(-del*0.5)*temp);}
+else{cum=Math.exp(-xsq*xsq*0.5)*Math.exp(-del*0.5)*temp;ccum=1.0-cum;}
+if(x>0.0){temp=cum;if(lower){cum=ccum;}
+ccum=temp;}}else{if(x>0){cum=(log_p)?0.0:1.0;ccum=(log_p)?Number.NEGATIVE_INFINITY:0.0;}else{cum=(log_p)?Number.NEGATIVE_INFINITY:0.0;ccum=(log_p)?0.0:1.0;}}
+return[cum,ccum];}
+var p,cp;var mu=this._mean;var sigma=this._sigma;var R_DT_0,R_DT_1;if(lower_tail){if(log_p){R_DT_0=Number.NEGATIVE_INFINITY;R_DT_1=0.0;}else{R_DT_0=0.0;R_DT_1=1.0;}}else{if(log_p){R_DT_0=0.0;R_DT_1=Number.NEGATIVE_INFINITY;}else{R_DT_0=1.0;R_DT_1=0.0;}}
+if(!jstat.isFinite(x)&&mu==x)return Number.NaN;if(sigma<=0){if(sigma<0){console.warn("Sigma is less than 0");return Number.NaN;}
+return(x<mu)?R_DT_0:R_DT_1;}
+p=(x-mu)/sigma;if(!jstat.isFinite(p)){return(x<mu)?R_DT_0:R_DT_1;}
+x=p;var result=pnorm_both(x,p,cp,(lower_tail?false:true),log_p);return(lower_tail?result[0]:result[1]);},getMean:function(){return this._mean;},getSigma:function(){return this._sigma;},getVariance:function(){return this._sigma*this._sigma;}});var LogNormalDistribution=ContinuousDistribution.extend({init:function(location,scale){this._super('LogNormal')
+this._location=parseFloat(location);this._scale=parseFloat(scale);this._string="LogNormal ("+this._location.toFixed(2)+", "+this._scale.toFixed(2)+")";},_pdf:function(x,give_log){var y;var sdlog=this._scale;var meanlog=this._location;if(give_log==null){give_log=false;}
+if(sdlog<=0)throw"Illegal parameter in _pdf";if(x<=0){return(give_log)?Number.NEGATIVE_INFINITY:0.0;}
+y=(Math.log(x)-meanlog)/sdlog;return(give_log?-(jstat.LN_SQRT_2PI+0.5*y*y+Math.log(x*sdlog)):jstat.ONE_SQRT_2PI*Math.exp(-0.5*y*y)/(x*sdlog));},_cdf:function(x,lower_tail,log_p){var sdlog=this._scale;var meanlog=this._location;if(lower_tail==null){lower_tail=true;}
+if(log_p==null){log_p=false;}
+if(sdlog<=0){throw"illegal std in _cdf";}
+if(x>0){var nd=new NormalDistribution(meanlog,sdlog);return nd._cdf(Math.log(x),lower_tail,log_p);}
+if(lower_tail){return(log_p)?Number.NEGATIVE_INFINITY:0.0;}else{return(log_p)?0.0:1.0;}},getLocation:function(){return this._location;},getScale:function(){return this._scale;},getMean:function(){return Math.exp((this._location+this._scale)/2);},getVariance:function(){var ans=(Math.exp(this._scale)-1)*Math.exp(2*this._location+this._scale);return ans;}});var GammaDistribution=ContinuousDistribution.extend({init:function(shape,scale){this._super('Gamma');this._shape=parseFloat(shape);this._scale=parseFloat(scale);this._string="Gamma ("+this._shape.toFixed(2)+", "+this._scale.toFixed(2)+")";},_pdf:function(x,give_log){var pr;var shape=this._shape;var scale=this._scale;if(give_log==null){give_log=false;}
+if(shape<0||scale<=0){throw"Illegal argument in _pdf";}
+if(x<0){return(give_log)?Number.NEGATIVE_INFINITY:0.0;}
+if(shape==0){return(x==0)?Number.POSITIVE_INFINITY:(give_log)?Number.NEGATIVE_INFINITY:0.0;}
+if(x==0){if(shape<1)return Number.POSITIVE_INFINITY;if(shape>1)return(give_log)?Number.NEGATIVE_INFINITY:0.0;return(give_log)?-Math.log(scale):1/scale;}
+if(shape<1){pr=jstat.dopois_raw(shape,x/scale,give_log);return give_log?pr+Math.log(shape/x):pr*shape/x;}
+pr=jstat.dopois_raw(shape-1,x/scale,give_log);return give_log?pr-Math.log(scale):pr/scale;},_cdf:function(x,lower_tail,log_p){function USE_PNORM(){pn1=Math.sqrt(alph)*3.0*(Math.pow(x/alph,1.0/3.0)+1.0/(9.0*alph)-1.0);var norm_dist=new NormalDistribution(0.0,1.0);return norm_dist._cdf(pn1,lower_tail,log_p);}
+if(lower_tail==null)lower_tail=true;if(log_p==null)log_p=false;var alph=this._shape;var scale=this._scale;var xbig=1.0e+8;var xlarge=1.0e+37;var alphlimit=1e5;var pn1,pn2,pn3,pn4,pn5,pn6,arg,a,b,c,an,osum,sum,n,pearson;if(alph<=0.||scale<=0.){console.warn('Invalid gamma params in _cdf');return Number.NaN;}
+x/=scale;if(isNaN(x))return x;if(x<=0.0){if(lower_tail){return(log_p)?Number.NEGATIVE_INFINITY:0.0;}else{return(log_p)?0.0:1.0;}}
+if(alph>alphlimit){return USE_PNORM();}
+if(x>xbig*alph){if(x>jstat.DBL_MAX*alph){if(lower_tail){return(log_p)?0.0:1.0;}else{return(log_p)?Number.NEGATIVE_INFINITY:0.0;}}else{return USE_PNORM();}}
+if(x<=1.0||x<alph){pearson=1;arg=alph*Math.log(x)-x-jstat.lgamma(alph+1.0);c=1.0;sum=1.0;a=alph;do{a+=1.0;c*=x/a;sum+=c;}while(c>jstat.DBL_EPSILON*sum);}else{pearson=0;arg=alph*Math.log(x)-x-jstat.lgamma(alph);a=1.-alph;b=a+x+1.;pn1=1.;pn2=x;pn3=x+1.;pn4=x*b;sum=pn3/pn4;for(n=1;;n++){a+=1.;b+=2.;an=a*n;pn5=b*pn3-an*pn1;pn6=b*pn4-an*pn2;if(Math.abs(pn6)>0.){osum=sum;sum=pn5/pn6;if(Math.abs(osum-sum)<=jstat.DBL_EPSILON*jstat.fmin2(1.0,sum))
+break;}
+pn1=pn3;pn2=pn4;pn3=pn5;pn4=pn6;if(Math.abs(pn5)>=xlarge){pn1/=xlarge;pn2/=xlarge;pn3/=xlarge;pn4/=xlarge;}}}
+arg+=Math.log(sum);lower_tail=(lower_tail==pearson);if(log_p&&lower_tail)
+return(arg);if(lower_tail){return Math.exp(arg);}else{if(log_p){return(arg>-Math.LN2)?Math.log(-jstat.expm1(arg)):jstat.log1p(-Math.exp(arg));}else{return-jstat.expm1(arg);}}},getShape:function(){return this._shape;},getScale:function(){return this._scale;},getMean:function(){return this._shape*this._scale;},getVariance:function(){return this._shape*Math.pow(this._scale,2);}});var BetaDistribution=ContinuousDistribution.extend({init:function(alpha,beta){this._super('Beta');this._alpha=parseFloat(alpha);this._beta=parseFloat(beta);this._string="Beta ("+this._alpha.toFixed(2)+", "+this._beta.toFixed(2)+")";},_pdf:function(x,give_log){if(give_log==null)give_log=false;var a=this._alpha;var b=this._beta;var lval;if(a<=0||b<=0){console.warn('Illegal arguments in _pdf');return Number.NaN;}
+if(x<0||x>1){return(give_log)?Number.NEGATIVE_INFINITY:0.0;}
+if(x==0){if(a>1){return(give_log)?Number.NEGATIVE_INFINITY:0.0;}
+if(a<1){return Number.POSITIVE_INFINITY;}
+return(give_log)?Math.log(b):b;}
+if(x==1){if(b>1){return(give_log)?Number.NEGATIVE_INFINITY:0.0;}
+if(b<1){return Number.POSITIVE_INFINITY;}
+return(give_log)?Math.log(a):a;}
+if(a<=2||b<=2){lval=(a-1)*Math.log(x)+(b-1)*jstat.log1p(-x)-jstat.logBeta(a,b);}else{lval=Math.log(a+b-1)+jstat.dbinom_raw(a-1,a+b-2,x,1-x,true);}
+return(give_log)?lval:Math.exp(lval);},_cdf:function(x,lower_tail,log_p){if(lower_tail==null)lower_tail=true;if(log_p==null)log_p=false;var pin=this._alpha;var qin=this._beta;if(pin<=0||qin<=0){console.warn('Invalid argument in _cdf');return Number.NaN;}
+if(x<=0){if(lower_tail){return(log_p)?Number.NEGATIVE_INFINITY:0.0;}else{return(log_p)?0.1:1.0;}}
+if(x>=1){if(lower_tail){return(log_p)?0.1:1.0;}else{return(log_p)?Number.NEGATIVE_INFINITY:0.0;}}
+return jstat.incompleteBeta(pin,qin,x);},getAlpha:function(){return this._alpha;},getBeta:function(){return this._beta;},getMean:function(){return this._alpha/(this._alpha+this._beta);},getVariance:function(){var ans=(this._alpha*this._beta)/(Math.pow(this._alpha+this._beta,2)*(this._alpha+this._beta+1));return ans;}});var StudentTDistribution=ContinuousDistribution.extend({init:function(degreesOfFreedom,mu){this._super('StudentT');this._dof=parseFloat(degreesOfFreedom);if(mu!=null){this._mu=parseFloat(mu);this._string="StudentT ("+this._dof.toFixed(2)+", "+this._mu.toFixed(2)+")";}else{this._mu=0.0;this._string="StudentT ("+this._dof.toFixed(2)+")";}},_pdf:function(x,give_log){if(give_log==null)give_log=false;if(this._mu==null){return this._dt(x,give_log);}else{var y=this._dnt(x,give_log);if(y>1){console.warn('x:'+x+', y: '+y);}
+return y;}},_cdf:function(x,lower_tail,give_log){if(lower_tail==null)lower_tail=true;if(give_log==null)give_log=false;if(this._mu==null){return this._pt(x,lower_tail,give_log);}else{return this._pnt(x,lower_tail,give_log);}},_dt:function(x,give_log){var t,u;var n=this._dof;if(n<=0){console.warn('Invalid parameters in _dt');return Number.NaN;}
+if(!jstat.isFinite(x)){return(give_log)?Number.NEGATIVE_INFINITY:0.0;}
+if(!jstat.isFinite(n)){var norm=new NormalDistribution(0.0,1.0);return norm.density(x,give_log);}
+t=-jstat.bd0(n/2.0,(n+1)/2.0)+jstat.stirlerr((n+1)/2.0)-jstat.stirlerr(n/2.0);if(x*x>0.2*n)
+u=Math.log(1+x*x/n)*n/2;else
+u=-jstat.bd0(n/2.0,(n+x*x)/2.0)+x*x/2.0;var p1=jstat.TWO_PI*(1+x*x/n);var p2=t-u;return(give_log)?-0.5*Math.log(p1)+p2:Math.exp(p2)/Math.sqrt(p1);},_dnt:function(x,give_log){if(give_log==null)give_log=false;var df=this._dof;var ncp=this._mu;var u;if(df<=0.0){console.warn("Illegal arguments _dnf");return Number.NaN;}
+if(ncp==0.0){return this._dt(x,give_log);}
+if(!jstat.isFinite(x)){if(give_log){return Number.NEGATIVE_INFINITY;}else{return 0.0;}}
+if(!isFinite(df)||df>1e8){var dist=new NormalDistribution(ncp,1.);return dist.density(x,give_log);}
+if(Math.abs(x)>Math.sqrt(df*jstat.DBL_EPSILON)){var newT=new StudentTDistribution(df+2,ncp);u=Math.log(df)-Math.log(Math.abs(x))+
+Math.log(Math.abs(newT._pnt(x*Math.sqrt((df+2)/df),true,false)-
+this._pnt(x,true,false)));}
+else{u=jstat.lgamma((df+1)/2)-jstat.lgamma(df/2)
+-.5*(Math.log(Math.PI)+Math.log(df)+ncp*ncp);}
+return(give_log?u:Math.exp(u));},_pt:function(x,lower_tail,log_p){if(lower_tail==null)lower_tail=true;if(log_p==null)log_p=false;var val,nx;var n=this._dof;var DT_0,DT_1;if(lower_tail){if(log_p){DT_0=Number.NEGATIVE_INFINITY;DT_1=1.;}else{DT_0=0.;DT_1=1.;}}else{if(log_p){DT_0=0.;DT_1=Number.NEGATIVE_INFINITY;}else{DT_0=1.;DT_1=0.;}}
+if(n<=0.0){console.warn("Invalid T distribution _pt");return Number.NaN;}
+var norm=new NormalDistribution(0,1);if(!jstat.isFinite(x)){return(x<0)?DT_0:DT_1;}
+if(!jstat.isFinite(n)){return norm._cdf(x,lower_tail,log_p);}
+if(n>4e5){val=1./(4.*n);return norm._cdf(x*(1.-val)/sqrt(1.+x*x*2.*val),lower_tail,log_p);}
+nx=1+(x/n)*x;if(nx>1e100){var lval;lval=-0.5*n*(2*Math.log(Math.abs(x))-Math.log(n))
+-jstat.logBeta(0.5*n,0.5)-Math.log(0.5*n);val=log_p?lval:Math.exp(lval);}else{if(n>x*x){var beta=new BetaDistribution(0.5,n/2.);return beta._cdf(x*x/(n+x*x),false,log_p);}else{beta=new BetaDistribution(n/2.,0.5);return beta._cdf(1./nx,true,log_p);}}
+if(x<=0.)
+lower_tail=!lower_tail;if(log_p){if(lower_tail)return jstat.log1p(-0.5*Math.exp(val));else return val-M_LN2;}
+else{val/=2.;if(lower_tail){return(0.5-val+0.5);}else{return val;}}},_pnt:function(t,lower_tail,log_p){var dof=this._dof;var ncp=this._mu;var DT_0,DT_1;if(lower_tail){if(log_p){DT_0=Number.NEGATIVE_INFINITY;DT_1=1.;}else{DT_0=0.;DT_1=1.;}}else{if(log_p){DT_0=0.;DT_1=Number.NEGATIVE_INFINITY;}else{DT_0=1.;DT_1=0.;}}
+var albeta,a,b,del,errbd,lambda,rxb,tt,x;var geven,godd,p,q,s,tnc,xeven,xodd;var it,negdel;var ITRMAX=1000;var ERRMAX=1.e-7;if(dof<=0.0){return Number.NaN;}else if(dof==0.0){return this._pt(t);}
+if(!jstat.isFinite(t)){return(t<0)?DT_0:DT_1;}
+if(t>=0.){negdel=false;tt=t;del=ncp;}else{if(ncp>=40&&(!log_p||!lower_tail)){return DT_0;}
+negdel=true;tt=-t;del=-ncp;}
+if(dof>4e5||del*del>2*Math.LN2*(-(jstat.DBL_MIN_EXP))){s=1./(4.*dof);var norm=new NormalDistribution(del,Math.sqrt(1.+tt*tt*2.*s));var result=norm._cdf(tt*(1.-s),lower_tail!=negdel,log_p);return result;}
+x=t*t;rxb=dof/(x+dof);x=x/(x+dof);if(x>0.){lambda=del*del;p=.5*Math.exp(-.5*lambda);if(p==0.){console.warn("underflow in _pnt");return DT_0;}
+q=jstat.SQRT_2dPI*p*del;s=.5-p;if(s<1e-7){s=-0.5*jstat.expm1(-0.5*lambda);}
+a=.5;b=.5*dof;rxb=Math.pow(rxb,b);albeta=jstat.LN_SQRT_PI+jstat.lgamma(b)-jstat.lgamma(.5+b);xodd=jstat.incompleteBeta(a,b,x);godd=2.*rxb*Math.exp(a*Math.log(x)-albeta);tnc=b*x;xeven=(tnc<jstat.DBL_EPSILON)?tnc:1.-rxb;geven=tnc*rxb;tnc=p*xodd+q*xeven;for(it=1;it<=ITRMAX;it++){a+=1.;xodd-=godd;xeven-=geven;godd*=x*(a+b-1.)/a;geven*=x*(a+b-.5)/(a+.5);p*=lambda/(2*it);q*=lambda/(2*it+1);tnc+=p*xodd+q*xeven;s-=p;if(s<-1.e-10){console.write("precision error _pnt");break;}
+if(s<=0&&it>1)break;errbd=2.*s*(xodd-godd);if(Math.abs(errbd)<ERRMAX)break;}
+if(it==ITRMAX){throw"Non-convergence _pnt";}}else{tnc=0.;}
+norm=new NormalDistribution(0,1);tnc+=norm._cdf(-del,true,false);lower_tail=lower_tail!=negdel;if(tnc>1-1e-10&&lower_tail){console.warn("precision error _pnt");}
+var res=jstat.fmin2(tnc,1.);if(lower_tail){if(log_p){return Math.log(res);}else{return res;}}else{if(log_p){return jstat.log1p(-(res));}else{return(0.5-(res)+0.5);}}},getDegreesOfFreedom:function(){return this._dof;},getNonCentralityParameter:function(){return this._mu;},getMean:function(){if(this._dof>1){var ans=(1/2)*Math.log(this._dof/2)+jstat.lgamma((this._dof-1)/2)-jstat.lgamma(this._dof/2)
+return Math.exp(ans)*this._mu;}else{return Number.NaN;}},getVariance:function(){if(this._dof>2){var ans=this._dof*(1+this._mu*this._mu)/(this._dof-2)-(((this._mu*this._mu*this._dof)/2)*Math.pow(Math.exp(jstat.lgamma((this._dof-1)/2)-jstat.lgamma(this._dof/2)),2));return ans;}else{return Number.NaN;}}});var Plot=Class.extend({init:function(id,options){this._container='#'+String(id);this._plots=[];this._flotObj=null;this._locked=false;if(options!=null){this._options=options;}else{this._options={};}},getContainer:function(){return this._container;},getGraph:function(){return this._flotObj;},setData:function(data){this._plots=data;},clear:function(){this._plots=[];},showLegend:function(){this._options.legend={show:true}
+this.render();},hideLegend:function(){this._options.legend={show:false}
+this.render();},render:function(){this._flotObj=null;this._flotObj=$.plot($(this._container),this._plots,this._options);}});var DistributionPlot=Plot.extend({init:function(id,distribution,range,options){this._super(id,options);this._showPDF=true;this._showCDF=false;this._pdfValues=[];this._cdfValues=[];this._maxY=1;this._plotType='line';this._fill=false;this._distribution=distribution;if(range!=null&&Range.validate(range)){this._range=range;}else{this._range=this._distribution.getRange();}
+if(this._distribution!=null){this._maxY=this._generateValues();}else{this._options.xaxis={min:range.getMinimum(),max:range.getMaximum()}
+this._options.yaxis={max:1}}
+this.render();},setHover:function(bool){if(bool){if(this._options.grid==null){this._options.grid={hoverable:true,mouseActiveRadius:25}}else{this._options.grid.hoverable=true,this._options.grid.mouseActiveRadius=25}
+function showTooltip(x,y,contents,color){$('<div id="jstat_tooltip">'+contents+'</div>').css({position:'absolute',display:'none',top:y+15,'font-size':'small',left:x+5,border:'1px solid '+color[1],color:color[2],padding:'5px','background-color':color[0],opacity:0.80}).appendTo("body").show();}
+var previousPoint=null;$(this._container).bind("plothover",function(event,pos,item){$("#x").text(pos.x.toFixed(2));$("#y").text(pos.y.toFixed(2));if(item){if(previousPoint!=item.datapoint){previousPoint=item.datapoint;$("#jstat_tooltip").remove();var x=jstat.toSigFig(item.datapoint[0],2),y=jstat.toSigFig(item.datapoint[1],2);var text=null;var color=item.series.color;if(item.series.label=='PDF'){text="P("+x+") = "+y;color=["#fee","#fdd","#C05F5F"];}else{text="F("+x+") = "+y;color=["#eef","#ddf","#4A4AC0"];}
+showTooltip(item.pageX,item.pageY,text,color);}}
+else{$("#jstat_tooltip").remove();previousPoint=null;}});$(this._container).bind("mouseleave",function(){if($('#jstat_tooltip').is(':visible')){$('#jstat_tooltip').remove();previousPoint=null;}});}else{if(this._options.grid==null){this._options.grid={hoverable:false}}else{this._options.grid.hoverable=false}
+$(this._container).unbind("plothover");}
+this.render();},setType:function(type){this._plotType=type;var lines={};var points={};if(this._plotType=='line'){lines.show=true;points.show=false;}else if(this._plotType=='points'){lines.show=false;points.show=true;}else if(this._plotType=='both'){lines.show=true;points.show=true;}
+if(this._options.series==null){this._options.series={lines:lines,points:points}}else{if(this._options.series.lines==null){this._options.series.lines=lines;}else{this._options.series.lines.show=lines.show;}
+if(this._options.series.points==null){this._options.series.points=points;}else{this._options.series.points.show=points.show;}}
+this.render();},setFill:function(bool){this._fill=bool;if(this._options.series==null){this._options.series={lines:{fill:bool}}}else{if(this._options.series.lines==null){this._options.series.lines={fill:bool}}else{this._options.series.lines.fill=bool;}}
+this.render();},clear:function(){this._super();this._distribution=null;this._pdfValues=[];this._cdfValues=[];this.render();},_generateValues:function(){this._cdfValues=[];this._pdfValues=[];var xs=this._range.getPoints();this._options.xaxis={min:xs[0],max:xs[xs.length-1]}
+var pdfs=this._distribution.density(this._range);var cdfs=this._distribution.cumulativeDensity(this._range);for(var i=0;i<xs.length;i++){if(pdfs[i]==Number.POSITIVE_INFINITY||pdfs[i]==Number.NEGATIVE_INFINITY){pdfs[i]=null;}
+if(cdfs[i]==Number.POSITIVE_INFINITY||cdfs[i]==Number.NEGATIVE_INFINITY){cdfs[i]=null;}
+this._pdfValues.push([xs[i],pdfs[i]]);this._cdfValues.push([xs[i],cdfs[i]]);}
+return jstat.max(pdfs);},showPDF:function(){this._showPDF=true;this.render();},hidePDF:function(){this._showPDF=false;this.render();},showCDF:function(){this._showCDF=true;this.render();},hideCDF:function(){this._showCDF=false;this.render();},setDistribution:function(distribution,range){this._distribution=distribution;if(range!=null){this._range=range;}else{this._range=distribution.getRange();}
+this._maxY=this._generateValues();this._options.yaxis={max:this._maxY*1.1}
+this.render();},getDistribution:function(){return this._distribution;},getRange:function(){return this._range;},setRange:function(range){this._range=range;this._generateValues();this.render();},render:function(){if(this._distribution!=null){if(this._showPDF&&this._showCDF){this.setData([{yaxis:1,data:this._pdfValues,color:'rgb(237,194,64)',clickable:false,hoverable:true,label:"PDF"},{yaxis:2,data:this._cdfValues,clickable:false,color:'rgb(175,216,248)',hoverable:true,label:"CDF"}]);this._options.yaxis={max:this._maxY*1.1}}else if(this._showPDF){this.setData([{data:this._pdfValues,hoverable:true,color:'rgb(237,194,64)',clickable:false,label:"PDF"}]);this._options.yaxis={max:this._maxY*1.1}}else if(this._showCDF){this.setData([{data:this._cdfValues,hoverable:true,color:'rgb(175,216,248)',clickable:false,label:"CDF"}]);this._options.yaxis={max:1.1}}}else{this.setData([]);}
+this._super();}});var DistributionFactory={};DistributionFactory.build=function(json){if(json.NormalDistribution){if(json.NormalDistribution.mean!=null&&json.NormalDistribution.standardDeviation!=null){return new NormalDistribution(json.NormalDistribution.mean[0],json.NormalDistribution.standardDeviation[0]);}else{throw"Malformed JSON provided to DistributionBuilder "+json;}}else if(json.LogNormalDistribution){if(json.LogNormalDistribution.location!=null&&json.LogNormalDistribution.scale!=null){return new LogNormalDistribution(json.LogNormalDistribution.location[0],json.LogNormalDistribution.scale[0]);}else{throw"Malformed JSON provided to DistributionBuilder "+json;}}else if(json.BetaDistribution){if(json.BetaDistribution.alpha!=null&&json.BetaDistribution.beta!=null){return new BetaDistribution(json.BetaDistribution.alpha[0],json.BetaDistribution.beta[0]);}else{throw"Malformed JSON provided to DistributionBuilder "+json;}}else if(json.GammaDistribution){if(json.GammaDistribution.shape!=null&&json.GammaDistribution.scale!=null){return new GammaDistribution(json.GammaDistribution.shape[0],json.GammaDistribution.scale[0]);}else{throw"Malformed JSON provided to DistributionBuilder "+json;}}else if(json.StudentTDistribution){if(json.StudentTDistribution.degreesOfFreedom!=null&&json.StudentTDistribution.nonCentralityParameter!=null){return new StudentTDistribution(json.StudentTDistribution.degreesOfFreedom[0],json.StudentTDistribution.nonCentralityParameter[0]);}else if(json.StudentTDistribution.degreesOfFreedom!=null){return new StudentTDistribution(json.StudentTDistribution.degreesOfFreedom[0]);}else{throw"Malformed JSON provided to DistributionBuilder "+json;}}else{throw"Malformed JSON provided to DistributionBuilder "+json;}}
\ No newline at end of file

From be418be6d223c3eb2d392c6933c9b34604309e9e Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Wed, 19 Dec 2012 18:29:57 +0200
Subject: [PATCH 292/541] Added default number of points to be width / 5.

---
 .../xmodule/xmodule/js/src/graphical_slider_tool/graph.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 39bc1bd9bf..49e5789025 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -303,10 +303,12 @@ define('Graph', ['logme'], function (logme) {
 
             tempNum = parseInt(config.plot.num_points, 10);
             if (isFinite(tempNum) === false) {
-                logme('ERROR: Expected config.plot.num_points to be a a valid integer. It is not.');
-                logme('config.plot.num_points = ', config.plot.num_points);
+                // logme('ERROR: Expected config.plot.num_points to be a a valid integer. It is not.');
+                // logme('config.plot.num_points = ', config.plot.num_points);
 
-                return false;
+                // return false;
+
+                tempNum = plotDiv.width() / 5.0;
             }
 
             if (

From 426f44e09a4a6607e5314a681da22f3d6f483d67 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Wed, 19 Dec 2012 19:10:55 +0200
Subject: [PATCH 293/541] Refined error messaging.

---
 .../js/src/graphical_slider_tool/el_output.js |  4 ++++
 .../js/src/graphical_slider_tool/graph.js     | 21 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
index 98795b5d32..f79a93b822 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
@@ -74,6 +74,10 @@ define('ElOutput', ['logme'], function (logme) {
                         funcString +
                         '" was not converted by the Function constructor.'
                 );
+                logme('Error message: "' + err.message + '".');
+
+                $('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not create a function from string "' + funcString + '".' + '</div>');
+                $('#' + gstId).html('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
 
                 paramNames.pop();
 
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 49e5789025..ccb8411e90 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -279,6 +279,9 @@ define('Graph', ['logme'], function (logme) {
                 logme('ERROR: could not create a function from the string "' + config.plot.xrange.min + '" for xrange.min.');
                 logme('Error message: "' + err.message + '"');
 
+                $('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not create a function from the string "' + config.plot.xrange.min + '" for xrange.min.' + '</div>');
+                $('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
+
                 return false;
             }
             allParamNames.pop();
@@ -290,6 +293,9 @@ define('Graph', ['logme'], function (logme) {
                 logme('ERROR: could not create a function from the string "' + config.plot.xrange.max + '" for xrange.max.');
                 logme('Error message: "' + err.message + '"');
 
+                $('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not create a function from the string "' + config.plot.xrange.max + '" for xrange.max.' + '</div>');
+                $('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
+
                 return false;
             }
             allParamNames.pop();
@@ -463,6 +469,9 @@ define('Graph', ['logme'], function (logme) {
                     );
                     logme('Error message: "' + err.message + '"');
 
+                    $('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not create a function from the string "' + funcString + '".' + '</div>');
+                    $('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
+
                     paramNames.pop();
                     paramNames.pop();
 
@@ -565,6 +574,9 @@ define('Graph', ['logme'], function (logme) {
                     logme('ERROR: Could not determine xrange start.');
                     logme('Error message: "' + err.message + '".');
 
+                    $('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not determine xrange start from defined function.' + '</div>');
+                    $('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
+
                     return false;
                 }
                 try {
@@ -573,6 +585,9 @@ define('Graph', ['logme'], function (logme) {
                     logme('ERROR: Could not determine xrange end.');
                     logme('Error message: "' + err.message + '".');
 
+                    $('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not determine xrange end from defined function.' + '</div>');
+                    $('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
+
                     return false;
                 }
                 step = (end - start) / (numPoints - 1);
@@ -592,6 +607,9 @@ define('Graph', ['logme'], function (logme) {
                         logme('ERROR: Could not generate data.');
                         logme('Error message: "' + err.message + '".');
 
+                        $('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not generate data from defined function.' + '</div>');
+                        $('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
+
                         return false;
                     }
 
@@ -618,6 +636,9 @@ define('Graph', ['logme'], function (logme) {
                         logme('ERROR: Could not generate data.');
                         logme('Error message: "' + err.message + '".');
 
+                        $('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not generate data from function.' + '</div>');
+                        $('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');g
+
                         return false;
                     }
                     paramValues.pop();

From 6b9ace46146249345fa27852b1eb1d4a26bc5170 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Wed, 19 Dec 2012 19:12:10 +0200
Subject: [PATCH 294/541] Refined error messaging.

---
 .../xmodule/xmodule/js/src/graphical_slider_tool/el_output.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
index f79a93b822..901989b2af 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
@@ -77,7 +77,7 @@ define('ElOutput', ['logme'], function (logme) {
                 logme('Error message: "' + err.message + '".');
 
                 $('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not create a function from string "' + funcString + '".' + '</div>');
-                $('#' + gstId).html('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
+                $('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
 
                 paramNames.pop();
 

From ad16c6c6f5f188defae0fc5b02546dc146daf114 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Wed, 19 Dec 2012 19:41:08 +0200
Subject: [PATCH 295/541] Minor fix.

---
 .../lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index ccb8411e90..e69fa0e5bd 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -9,8 +9,6 @@ define('Graph', ['logme'], function (logme) {
     function Graph(gstId, config, state) {
         var plotDiv, dataSeries, functions, xaxis, yaxis, numPoints, xrange;
 
-        logme(config);
-
         // We need plot configuration settings. Without them we can't continue.
         if ($.isPlainObject(config.plot) === false) {
             return;
@@ -431,8 +429,6 @@ define('Graph', ['logme'], function (logme) {
                 // will break.
                 funcString = $('<div>').html(funcString).text();
 
-                logme('graph: funcstr = "' + funcString + '"');
-
                 // Some defaults. If no options are set for the graph, we will
                 // make sure that at least a line is drawn for a function.
                 newFunctionObject = {

From ef1328bc6a1c44ac466318ecf880131e535537bf Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 19 Dec 2012 20:02:39 +0200
Subject: [PATCH 296/541] fix

---
 .../xmodule/xmodule/js/src/graphical_slider_tool/graph.js   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index e69fa0e5bd..35c75c8adc 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -299,10 +299,10 @@ define('Graph', ['logme'], function (logme) {
             allParamNames.pop();
 
             if (typeof config.plot.num_points !== 'string') {
-                logme('ERROR: config.plot.num_points is not a string.');
-                logme('config.plot.num_points = ', config.plot.num_points);
+                // logme('ERROR: config.plot.num_points is not a string.');
+                // logme('config.plot.num_points = ', config.plot.num_points);
 
-                return false;
+                tempNum = plotDiv.width() / 5.0;
             }
 
             tempNum = parseInt(config.plot.num_points, 10);

From b0b4a90bd311c4e8dbabf4fc5bd1381be0076aa4 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 20 Dec 2012 11:12:37 +0200
Subject: [PATCH 297/541] added gst tests for export

---
 .../lib/xmodule/xmodule/tests/test_export.py  |  7 +++-
 .../test/data/graphic_slider_tool/README.md   |  2 +
 .../test/data/graphic_slider_tool/course.xml  |  1 +
 .../graphic_slider_tool/course/2012_Fall.xml  |  5 +++
 .../graphic_slider_tool/gst/sample_gst.xml    | 41 +++++++++++++++++++
 .../policies/2012_Fall.json                   | 14 +++++++
 .../graphic_slider_tool/roots/2012_Fall.xml   |  1 +
 common/test/data/self_assessment/course.xml   |  2 +-
 8 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 common/test/data/graphic_slider_tool/README.md
 create mode 120000 common/test/data/graphic_slider_tool/course.xml
 create mode 100644 common/test/data/graphic_slider_tool/course/2012_Fall.xml
 create mode 100644 common/test/data/graphic_slider_tool/gst/sample_gst.xml
 create mode 100644 common/test/data/graphic_slider_tool/policies/2012_Fall.json
 create mode 100644 common/test/data/graphic_slider_tool/roots/2012_Fall.xml
 mode change 120000 => 100644 common/test/data/self_assessment/course.xml

diff --git a/common/lib/xmodule/xmodule/tests/test_export.py b/common/lib/xmodule/xmodule/tests/test_export.py
index aeebc6da6b..d172409c18 100644
--- a/common/lib/xmodule/xmodule/tests/test_export.py
+++ b/common/lib/xmodule/xmodule/tests/test_export.py
@@ -41,7 +41,7 @@ def strip_filenames(descriptor):
 class RoundTripTestCase(unittest.TestCase):
     '''Check that our test courses roundtrip properly'''
     def check_export_roundtrip(self, data_dir, course_dir):
-
+        # import ipdb; ipdb.set_trace()
         root_dir = path(mkdtemp())
         print "Copying test course to temp dir {0}".format(root_dir)
 
@@ -117,3 +117,8 @@ class RoundTripTestCase(unittest.TestCase):
     def test_selfassessment_roundtrip(self):
         #Test selfassessment xmodule to see if it exports correctly
         self.check_export_roundtrip(DATA_DIR,"self_assessment")
+
+    def test_graphicslidertool_roundtrip(self):
+        #Test graphicslidertool xmodule to see if it exports correctly
+        # import ipdb; ipdb.set_trace()
+        self.check_export_roundtrip(DATA_DIR,"graphic_slider_tool")
diff --git a/common/test/data/graphic_slider_tool/README.md b/common/test/data/graphic_slider_tool/README.md
new file mode 100644
index 0000000000..ec4f121ad8
--- /dev/null
+++ b/common/test/data/graphic_slider_tool/README.md
@@ -0,0 +1,2 @@
+This is a very very simple course, useful for debugging graphical slider tool
+code.
diff --git a/common/test/data/graphic_slider_tool/course.xml b/common/test/data/graphic_slider_tool/course.xml
new file mode 120000
index 0000000000..49041310f6
--- /dev/null
+++ b/common/test/data/graphic_slider_tool/course.xml
@@ -0,0 +1 @@
+roots/2012_Fall.xml
\ No newline at end of file
diff --git a/common/test/data/graphic_slider_tool/course/2012_Fall.xml b/common/test/data/graphic_slider_tool/course/2012_Fall.xml
new file mode 100644
index 0000000000..a51e027c2e
--- /dev/null
+++ b/common/test/data/graphic_slider_tool/course/2012_Fall.xml
@@ -0,0 +1,5 @@
+<course>
+  <chapter url_name="Overview">
+    <gst url_name="sample_gst"/>
+  </chapter>
+</course>
diff --git a/common/test/data/graphic_slider_tool/gst/sample_gst.xml b/common/test/data/graphic_slider_tool/gst/sample_gst.xml
new file mode 100644
index 0000000000..21b6483efe
--- /dev/null
+++ b/common/test/data/graphic_slider_tool/gst/sample_gst.xml
@@ -0,0 +1,41 @@
+<vertical>
+    <graphical_slider_tool>
+      <render>
+        <h2>Graphic slider tool: Dynamic range and implicit functions.</h2>
+
+        <p>You can make x range (not ticks of x axis) of functions to depend on
+          parameter value. This can be useful when function domain depends
+          on parameter.</p>
+        <p>Also implicit functons like circle can be plotted as 2 separate
+            functions of same color.</p>
+         <div style="height:50px;">
+         <slider var='a' style="width:400px;float:left;"/>
+         <textbox var='a' style="float:left;width:60px;margin-left:15px;"/>
+       </div>
+        <plot style="margin-top:15px;margin-bottom:15px;"/>
+      </render>
+      <configuration>
+        <parameters>
+            <param var="a" min="5" max="25" step="0.5" initial="12.5" />
+        </parameters>
+        <functions>
+          <function color="red">return Math.sqrt(a * a - x * x);</function>
+          <function color="red">return -Math.sqrt(a * a - x * x);</function>
+        </functions>
+        <plot>
+          <xrange>
+            <!-- dynamic range -->
+              <min>
+                  return -a;
+              </min>
+              <max>
+                  return a;
+              </max>
+          </xrange>
+          <num_points>1000</num_points>
+          <xticks>-30, 6, 30</xticks>
+          <yticks>-30, 6, 30</yticks>
+        </plot>
+      </configuration>
+    </graphical_slider_tool>
+</vertical>
diff --git a/common/test/data/graphic_slider_tool/policies/2012_Fall.json b/common/test/data/graphic_slider_tool/policies/2012_Fall.json
new file mode 100644
index 0000000000..640c1a9114
--- /dev/null
+++ b/common/test/data/graphic_slider_tool/policies/2012_Fall.json
@@ -0,0 +1,14 @@
+{
+    "course/2012_Fall": {
+        "graceperiod": "2 days 5 hours 59 minutes 59 seconds",
+        "start": "2015-07-17T12:00",
+        "display_name": "GST Test",
+        "graded": "false"
+    },
+    "chapter/Overview": {
+        "display_name": "Overview"
+    },
+    "gst/sample_gst": {
+        "display_name": "Sample GST",
+    },
+}
diff --git a/common/test/data/graphic_slider_tool/roots/2012_Fall.xml b/common/test/data/graphic_slider_tool/roots/2012_Fall.xml
new file mode 100644
index 0000000000..1dc86c4afc
--- /dev/null
+++ b/common/test/data/graphic_slider_tool/roots/2012_Fall.xml
@@ -0,0 +1 @@
+<course org="edX" course="gst_test" url_name="2012_Fall"/>
diff --git a/common/test/data/self_assessment/course.xml b/common/test/data/self_assessment/course.xml
deleted file mode 120000
index 49041310f6..0000000000
--- a/common/test/data/self_assessment/course.xml
+++ /dev/null
@@ -1 +0,0 @@
-roots/2012_Fall.xml
\ No newline at end of file
diff --git a/common/test/data/self_assessment/course.xml b/common/test/data/self_assessment/course.xml
new file mode 100644
index 0000000000..ea7d5c420d
--- /dev/null
+++ b/common/test/data/self_assessment/course.xml
@@ -0,0 +1 @@
+<course org="edX" course="sa_test" url_name="2012_Fall"/>

From 100da2aef99a2f9c465b78b9c8cc72a67ea869ba Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 20 Dec 2012 11:47:20 +0200
Subject: [PATCH 298/541] added gst tests for import

---
 common/lib/xmodule/xmodule/tests/test_import.py | 17 +++++++++++++++++
 .../graphic_slider_tool/course/2012_Fall.xml    |  2 +-
 .../sample_gst.xml                              | 17 +++--------------
 .../graphic_slider_tool/policies/2012_Fall.json |  2 +-
 4 files changed, 22 insertions(+), 16 deletions(-)
 rename common/test/data/graphic_slider_tool/{gst => graphical_slider_tool}/sample_gst.xml (55%)

diff --git a/common/lib/xmodule/xmodule/tests/test_import.py b/common/lib/xmodule/xmodule/tests/test_import.py
index 77532959d7..3f2c005268 100644
--- a/common/lib/xmodule/xmodule/tests/test_import.py
+++ b/common/lib/xmodule/xmodule/tests/test_import.py
@@ -349,6 +349,23 @@ class ImportTestCase(unittest.TestCase):
 
         sa_id = "edX/sa_test/2012_Fall"
         location = Location(["i4x", "edX", "sa_test", "selfassessment", "SampleQuestion"])
+        # import ipdb; ipdb.set_trace()
         sa_sample = modulestore.get_instance(sa_id, location)
         #10 attempts is hard coded into SampleQuestion, which is the url_name of a selfassessment xml tag
         self.assertEqual(sa_sample.metadata['attempts'], '10')
+
+    def test_graphicslidertool_import(self):
+        '''
+        Check to see if definition_from_xml in gst_module.py
+        works properly.  Pulls data from the graphic_slider_tool directory
+        in the test data directory.
+        '''
+        modulestore = XMLModuleStore(DATA_DIR, course_dirs=['graphic_slider_tool'])
+
+        sa_id = "edX/gst_test/2012_Fall"
+        location = Location(["i4x", "edX", "gst_test", "graphical_slider_tool", "sample_gst"])
+        gst_sample = modulestore.get_instance(sa_id, location)
+        render_string_from_sample_gst_xml = """
+        <slider var="a" style="width:400px;float:left;"/>\
+<plot style="margin-top:15px;margin-bottom:15px;"/>""".strip()
+        self.assertEqual(gst_sample.definition['render'], render_string_from_sample_gst_xml)
diff --git a/common/test/data/graphic_slider_tool/course/2012_Fall.xml b/common/test/data/graphic_slider_tool/course/2012_Fall.xml
index a51e027c2e..2983c85dd5 100644
--- a/common/test/data/graphic_slider_tool/course/2012_Fall.xml
+++ b/common/test/data/graphic_slider_tool/course/2012_Fall.xml
@@ -1,5 +1,5 @@
 <course>
   <chapter url_name="Overview">
-    <gst url_name="sample_gst"/>
+    <graphical_slider_tool url_name="sample_gst"/>
   </chapter>
 </course>
diff --git a/common/test/data/graphic_slider_tool/gst/sample_gst.xml b/common/test/data/graphic_slider_tool/graphical_slider_tool/sample_gst.xml
similarity index 55%
rename from common/test/data/graphic_slider_tool/gst/sample_gst.xml
rename to common/test/data/graphic_slider_tool/graphical_slider_tool/sample_gst.xml
index 21b6483efe..bd0360fde8 100644
--- a/common/test/data/graphic_slider_tool/gst/sample_gst.xml
+++ b/common/test/data/graphic_slider_tool/graphical_slider_tool/sample_gst.xml
@@ -1,18 +1,7 @@
-<vertical>
+
     <graphical_slider_tool>
       <render>
-        <h2>Graphic slider tool: Dynamic range and implicit functions.</h2>
-
-        <p>You can make x range (not ticks of x axis) of functions to depend on
-          parameter value. This can be useful when function domain depends
-          on parameter.</p>
-        <p>Also implicit functons like circle can be plotted as 2 separate
-            functions of same color.</p>
-         <div style="height:50px;">
-         <slider var='a' style="width:400px;float:left;"/>
-         <textbox var='a' style="float:left;width:60px;margin-left:15px;"/>
-       </div>
-        <plot style="margin-top:15px;margin-bottom:15px;"/>
+<slider var='a' style="width:400px;float:left;"/><plot style="margin-top:15px;margin-bottom:15px;"/>
       </render>
       <configuration>
         <parameters>
@@ -38,4 +27,4 @@
         </plot>
       </configuration>
     </graphical_slider_tool>
-</vertical>
+
diff --git a/common/test/data/graphic_slider_tool/policies/2012_Fall.json b/common/test/data/graphic_slider_tool/policies/2012_Fall.json
index 640c1a9114..6958f8432c 100644
--- a/common/test/data/graphic_slider_tool/policies/2012_Fall.json
+++ b/common/test/data/graphic_slider_tool/policies/2012_Fall.json
@@ -8,7 +8,7 @@
     "chapter/Overview": {
         "display_name": "Overview"
     },
-    "gst/sample_gst": {
+    "graphical_slider_tool/sample_gst": {
         "display_name": "Sample GST",
     },
 }

From 9bf1a6e27186381325feb5d138130377f09de164 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 20 Dec 2012 13:25:10 +0200
Subject: [PATCH 299/541] add docstring and test for gst

---
 common/lib/xmodule/xmodule/tests/test_export.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/common/lib/xmodule/xmodule/tests/test_export.py b/common/lib/xmodule/xmodule/tests/test_export.py
index d172409c18..7605155a6c 100644
--- a/common/lib/xmodule/xmodule/tests/test_export.py
+++ b/common/lib/xmodule/xmodule/tests/test_export.py
@@ -39,9 +39,12 @@ def strip_filenames(descriptor):
 
 
 class RoundTripTestCase(unittest.TestCase):
-    '''Check that our test courses roundtrip properly'''
+    ''' Check that our test courses roundtrip properly.
+        Same course imported , than exported, then imported again.
+        And we compare original import with second import (after export).
+        Thus we make sure that export and import work properly.
+    '''
     def check_export_roundtrip(self, data_dir, course_dir):
-        # import ipdb; ipdb.set_trace()
         root_dir = path(mkdtemp())
         print "Copying test course to temp dir {0}".format(root_dir)
 
@@ -120,5 +123,4 @@ class RoundTripTestCase(unittest.TestCase):
 
     def test_graphicslidertool_roundtrip(self):
         #Test graphicslidertool xmodule to see if it exports correctly
-        # import ipdb; ipdb.set_trace()
         self.check_export_roundtrip(DATA_DIR,"graphic_slider_tool")

From d4b8a7bb5466c792d0e42e0deebd3168df5c95ba Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 20 Dec 2012 13:25:24 +0200
Subject: [PATCH 300/541] added export function

---
 common/lib/xmodule/xmodule/gst_module.py | 73 ++++++++++++------------
 1 file changed, 38 insertions(+), 35 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index 7e61264929..34ecd66872 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -25,6 +25,8 @@ class GraphicalSliderToolModule(XModule):
 
     js = {
       'js': [
+        # 3rd party libraries used by graphic slider tool.
+        # TODO - where to store them - outside xmodule?
         resource_string(__name__, 'js/src/graphical_slider_tool/jstat-1.0.0.min.js'),
 
         resource_string(__name__, 'js/src/graphical_slider_tool/gst_main.js'),
@@ -44,32 +46,40 @@ class GraphicalSliderToolModule(XModule):
     def __init__(self, system, location, definition, descriptor, instance_state=None,
                  shared_state=None, **kwargs):
         """
-        For XML file format please look at documentation.
-
+        For XML file format please look at documentation. TODO - receive
+        information where to store XML documentation.
         """
         XModule.__init__(self, system, location, definition, descriptor,
                          instance_state, shared_state, **kwargs)
 
     def get_html(self):
-        self.get_configuration()
+        """ Renders parameters to template. """
+
+        # these both will be used in class methods
         self.html_id = self.location.html_id()
         self.html_class = self.location.category
-        gst_html = self.substitute_controls(self.definition['render'].strip())
-        # import ipdb; ipdb.set_trace()
         params = {
-                  'gst_html': gst_html,
+                  'gst_html': self.substitute_controls(self.definition['render']),
                   'element_id': self.html_id,
                   'element_class': self.html_class,
-                  'configuration_json': self.configuration_json
+                  'configuration_json': self.build_configuration_json()
                   }
         self.content = (self.system.render_template(
                         'graphical_slider_tool.html', params))
-        # import ipdb; ipdb.set_trace()
         return self.content
 
     def substitute_controls(self, html_string):
-        """ Substitue control element via their divs.
-        Simple variant: slider and plot controls are not inside any tag.
+        """ Substitutes control elements via their divs.
+        TODO: change regexps to html parsing via beautiful soup  or something
+        similar (aim : simpler support).
+
+        Args:
+            html_string: rendered html string with controls as xml tags
+            (<slider var="a"/>)
+
+        Returns:
+            html_string with control tags replaced by proper divs
+            (<slider var="a"/> -> <div class="....slider" > </div>)
         """
         #substitute plot
         plot_div = '<div class="{element_class}_plot" id="{element_id}_plot" \
@@ -98,8 +108,7 @@ class GraphicalSliderToolModule(XModule):
             variables = [x['@var'] for x in variables]
         else:
             return html_string
-        # if variables[0] == 'v':
-        #     import ipdb; ipdb.set_trace()
+
         #substitute sliders
         slider_div = '<div class="{element_class}_slider" \
                                    id="{element_id}_slider_{var}" \
@@ -143,11 +152,9 @@ class GraphicalSliderToolModule(XModule):
                 # different id
             instances = re.findall(r'<textbox\s+(?=[^<>]*var\=[\"\']' + var + '[\"\'])' \
                           + r'[^<>]*/>', html_string, flags=re.UNICODE | re.DOTALL)
-            # import ipdb; ipdb.set_trace()
             for input_def in instances:  # for multiple inputs per var
                 input_index += 1
                 # extract var and readonly before style!
-                # import ipdb; ipdb.set_trace()
                 var_substring = re.search(r'(var\=[\"\']' + var + r'[\"\'])',
                                           input_def).group()
                 input_def = input_def.replace(var_substring, '')
@@ -164,28 +171,28 @@ class GraphicalSliderToolModule(XModule):
                     style = style.groups()[0]
                 else:
                     style = ''
-                # import ipdb; ipdb.set_trace()
                 replacement = input_el.format(element_class=self.html_class,
                         element_id=self.html_id,
                         var=var, readonly=readonly, style=style,
                         input_index=input_index)
-                # import ipdb; ipdb.set_trace()
                 html_string = re.sub(r'<textbox\s+(?=[^<>]*var\=[\"\'](' + \
                                      var + ')[\"\'])' + r'[^<>]*/>',
                 replacement, html_string, count=1, flags=re.UNICODE | re.DOTALL)
         return html_string
 
-    def get_configuration(self):
-        """Parse self.definition['configuration'] and transfer it to javascript
-        via json.
+    def build_configuration_json(self):
+        """Creates json element from xml element (with aim to transfer later
+         directly to javascript via hidden field in template). Steps:
+
+            1. Convert xml tree to python dict.
+
+            2. Dump dict to json.
+
         """
-        # root added for interface compatibility with xmltodict.parse
-        # import ipdb; ipdb.set_trace()
-        self.configuration_json = json.dumps(
-                xmltodict.parse('<root class="' + self.location.category + '">' +
-                stringify_children(self.definition['configuration'])
-                             + '</root>'))
-        return self.configuration_json
+        # <root> added for interface compatibility with xmltodict.parse
+        # class added for javascript's part purposes
+        return json.dumps(xmltodict.parse('<root class="' + self.html_class +
+                '">' + self.definition['configuration'] + '</root>'))
 
 
 class GraphicalSliderToolDescriptor(MakoModuleDescriptor, XmlDescriptor):
@@ -220,25 +227,21 @@ class GraphicalSliderToolDescriptor(MakoModuleDescriptor, XmlDescriptor):
         def parse(k):
             """Assumes that xml_object has child k"""
             return stringify_children(xml_object.xpath(k)[0])
-
         return {
                     'render': parse('render'),
-                    'configuration': xml_object.xpath('configuration')[0]
+                    'configuration': parse('configuration')
                 }
 
     def definition_to_xml(self, resource_fs):
-        '''Return an xml element representing this definition.
-        Not implemented'''
-        # import ipdb; ipdb.set_trace()
-        xml_object = etree.Element('gst')
+        '''Return an xml element representing this definition.'''
+        xml_object = etree.Element('graphical_slider_tool')
 
         def add_child(k):
-            # child_str = '<{tag}>{body}</{tag}>'.format(tag=k, body=self.definition[k])
-            child_str = child.export_to_xml(resource_fs)
+            child_str = '<{tag}>{body}</{tag}>'.format(tag=k, body=self.definition[k])
             child_node = etree.fromstring(child_str)
             xml_object.append(child_node)
 
-        for child in self.get_children():
+        for child in ['render', 'configuration']:
             add_child(child)
 
         return xml_object

From efea4f53e0ad08c5b0fe72c4cf500774d7aa1b69 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 20 Dec 2012 13:30:34 +0200
Subject: [PATCH 301/541] bugfix

---
 common/lib/xmodule/xmodule/gst_module.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index 34ecd66872..134d2b1ffa 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -55,14 +55,15 @@ class GraphicalSliderToolModule(XModule):
     def get_html(self):
         """ Renders parameters to template. """
 
-        # these both will be used in class methods
+        # these 3 will be used in class methods
         self.html_id = self.location.html_id()
         self.html_class = self.location.category
+        self.configuration_json = self.build_configuration_json()
         params = {
                   'gst_html': self.substitute_controls(self.definition['render']),
                   'element_id': self.html_id,
                   'element_class': self.html_class,
-                  'configuration_json': self.build_configuration_json()
+                  'configuration_json': self.configuration_json
                   }
         self.content = (self.system.render_template(
                         'graphical_slider_tool.html', params))

From b56d6374f3d85774be4f0339a3fc1ff2a742a834 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Fri, 21 Dec 2012 16:21:19 +0200
Subject: [PATCH 302/541] Fix. Now when user enters a value for a parameter
 greater than the max, it will be reset to the max. The ame for the min.

---
 .../js/src/graphical_slider_tool/state.js     | 31 +++----------------
 1 file changed, 4 insertions(+), 27 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
index 04c0b0a60e..47653a8ae9 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
@@ -199,33 +199,10 @@ define('State', ['logme'], function (logme) {
                 return;
             }
 
-            // If the new parameter's value is valid, but lies outised of
-            // the parameter's allowed range, we will disregard it.
-            //
-            // We will also change the element's value back to the current
-            // parameter's value.
-            if (
-                (paramValueNum < parameters[paramName].min) ||
-                (paramValueNum > parameters[paramName].max)
-            ) {
-                logme('ERROR: New parameter\'s value lies outside of the allowed range.');
-                logme('Range is: min = ' + parameters[paramName].min + ', max = ' + parameters[paramName].max);
-                logme('paramValueNum = ' + paramValueNum);
-
-                // If element is a slider, the value must be set in a special
-                // way.
-                if (slider === true) {
-                    logme('Changing back the slider.');
-                    element.slider('value', parameters[paramName].value);
-                }
-
-                // If element is a text input, standard jQuery val() function
-                // will work.
-                else {
-                    element.val(parameters[paramName].value);
-                }
-
-                return;
+            if (paramValueNum < parameters[paramName].min) {
+                paramValueNum = parameters[paramName].min;
+            } else if (paramValueNum > parameters[paramName].max) {
+                paramValueNum = parameters[paramName].max;
             }
 
             parameters[paramName].value = paramValueNum;

From fd43971602600f1447a1f40af802d7386ff7cac8 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Mon, 24 Dec 2012 15:36:26 +0200
Subject: [PATCH 303/541] __name__ in logger

---
 common/lib/xmodule/xmodule/gst_module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index 134d2b1ffa..d33ecebc7e 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -16,7 +16,7 @@ from xmodule.stringify import stringify_children
 from pkg_resources import resource_string
 
 
-log = logging.getLogger("mitx.common.lib.gst_module")
+log = logging.getLogger(__name__)
 
 
 class GraphicalSliderToolModule(XModule):

From 74be3d0ba99855560025d891915e1fe55da44f6a Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Mon, 24 Dec 2012 15:36:53 +0200
Subject: [PATCH 304/541] removed outer parents

---
 common/lib/xmodule/xmodule/gst_module.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index d33ecebc7e..be90e5f33b 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -65,8 +65,8 @@ class GraphicalSliderToolModule(XModule):
                   'element_class': self.html_class,
                   'configuration_json': self.configuration_json
                   }
-        self.content = (self.system.render_template(
-                        'graphical_slider_tool.html', params))
+        self.content = self.system.render_template(
+                        'graphical_slider_tool.html', params)
         return self.content
 
     def substitute_controls(self, html_string):

From ca4b625e6c5e6d35a04acec7b12fdb3d4b768b43 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Mon, 24 Dec 2012 15:38:36 +0200
Subject: [PATCH 305/541] removed forgotten ipdb line

---
 common/lib/xmodule/xmodule/tests/test_import.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/tests/test_import.py b/common/lib/xmodule/xmodule/tests/test_import.py
index 3f2c005268..90ec112f19 100644
--- a/common/lib/xmodule/xmodule/tests/test_import.py
+++ b/common/lib/xmodule/xmodule/tests/test_import.py
@@ -349,7 +349,6 @@ class ImportTestCase(unittest.TestCase):
 
         sa_id = "edX/sa_test/2012_Fall"
         location = Location(["i4x", "edX", "sa_test", "selfassessment", "SampleQuestion"])
-        # import ipdb; ipdb.set_trace()
         sa_sample = modulestore.get_instance(sa_id, location)
         #10 attempts is hard coded into SampleQuestion, which is the url_name of a selfassessment xml tag
         self.assertEqual(sa_sample.metadata['attempts'], '10')

From 48bf9049445cba5038d1e0bf42776cdbe3678899 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Tue, 25 Dec 2012 14:20:33 +0200
Subject: [PATCH 306/541] converted regexp to lxml

---
 common/lib/xmodule/xmodule/gst_module.py | 114 ++++++-----------------
 1 file changed, 30 insertions(+), 84 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index be90e5f33b..02040274c3 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -6,6 +6,7 @@ understand functional dependencies.
 import json
 import logging
 from lxml import etree
+from lxml import html
 import xmltodict
 import re
 
@@ -82,104 +83,49 @@ class GraphicalSliderToolModule(XModule):
             html_string with control tags replaced by proper divs
             (<slider var="a"/> -> <div class="....slider" > </div>)
         """
-        #substitute plot
+
+        xml = html.fromstring(html_string)
+
+        #substitute plot, if presented
         plot_div = '<div class="{element_class}_plot" id="{element_id}_plot" \
                     style="{style}"></div>'
-        # extract css style from plot
-        plot_def = re.search(r'<plot[^<>]*/>', html_string)
-        if plot_def:
-            plot_def = plot_def.group()
-            style = re.search(r'(?=.*style\=[\"\'](.*)[\"\'])', plot_def,
-                flags=re.UNICODE | re.DOTALL)
-            if style:
-                style = style.groups()[0]
-            else:  # no style parameter
-                style = ''
-            replacement = plot_div.format(element_class=self.html_class,
-                                          element_id=self.html_id,
-                                                style=style)
-            html_string = re.sub(r'<plot[^<>]*/>', replacement, html_string,
-                            flags=re.UNICODE)
-
-        # get variables
-        if json.loads(self.configuration_json)['root'].get('parameters'):
-            variables = json.loads(self.configuration_json)['root']['parameters']['param']
-            if type(variables) == dict:
-                variables = [variables]
-            variables = [x['@var'] for x in variables]
-        else:
-            return html_string
+        plot_el = xml.xpath('//plot')
+        if plot_el:
+            plot_el = plot_el[0]
+            plot_el.getparent().replace(plot_el, html.fromstring(
+                                plot_div.format(element_class=self.html_class,
+                                               element_id=self.html_id,
+                                               style=plot_el.get('style', ""))))
 
         #substitute sliders
         slider_div = '<div class="{element_class}_slider" \
                                    id="{element_id}_slider_{var}" \
                                    data-var="{var}" style="{style}">\
                      </div>'
-        for var in variables:
-            # find <slider var='var' ... >
-            instances = re.findall(r'<slider\s+(?=[^<>]*var\=[\"\']' + var + '[\"\'])' \
-                          + r'[^<>]*/>', html_string, flags=re.UNICODE | re.DOTALL)
-            if instances:  # if presented, only one slider per var
-                slider_def = instances[0]  # get <slider var='var' ... > string
-                # extract var for proper style extraction further
-                var_substring = re.search(r'(var\=[\"\']' + var + r'[\"\'])',
-                                          slider_def).group()
-                slider_def = slider_def.replace(var_substring, '')
-                # get style
-                style = re.search(r'(?=[^<>]*style\=[\"\'](.*)[\"\'])', slider_def,
-                    flags=re.UNICODE | re.DOTALL)
-                if style:
-                    style = style.groups()[0]
-                else:  # no style parameter
-                    style = ''
-                # substitute parameters to slider div
-                replacement = slider_div.format(element_class=self.html_class,
+        slider_els = xml.xpath('//slider')
+        for slider_el in slider_els:
+            slider_el.getparent().replace(slider_el, html.fromstring(
+                                slider_div.format(element_class=self.html_class,
                                             element_id=self.html_id,
-                                            var=var, style=style)
-                # subsitute <slider var='var' ... > in html_srting to proper
-                # html div element
-                html_string = re.sub(r'<slider\s+(?=[^<>]*var\=[\"\'](' + \
-                    var + ')[\"\'])' + r'[^<>]*/>',
-                replacement, html_string, flags=re.UNICODE | re.DOTALL)
+                                            var=slider_el.get('var', ""),
+                                            style=slider_el.get('style', ""))))
 
-        # substitute inputs if we have them
-        input_el = '<input class="{element_class}_input" \
+        # substitute inputs aka textboxes
+        input_div = '<input class="{element_class}_input" \
                                   id="{element_id}_input_{var}_{input_index}" \
                                    data-var="{var}" style="{style}" \
                                    data-el_readonly="{readonly}"/>'
+        input_els = xml.xpath('//textbox')
+        for input_index, input_el in enumerate(input_els):
+            input_el.getparent().replace(input_el, html.fromstring(
+                                input_div.format(element_class=self.html_class,
+                                        element_id=self.html_id,
+                                        var=input_el.get('var', ""),
+                                        readonly=input_el.get('readonly', ''),
+                                        style=input_el.get('style', ""),
+                                        input_index=input_index)))
 
-        for var in variables:
-            input_index = 0  # make multiple inputs for same variable have
-                # different id
-            instances = re.findall(r'<textbox\s+(?=[^<>]*var\=[\"\']' + var + '[\"\'])' \
-                          + r'[^<>]*/>', html_string, flags=re.UNICODE | re.DOTALL)
-            for input_def in instances:  # for multiple inputs per var
-                input_index += 1
-                # extract var and readonly before style!
-                var_substring = re.search(r'(var\=[\"\']' + var + r'[\"\'])',
-                                          input_def).group()
-                input_def = input_def.replace(var_substring, '')
-                readonly = re.search(r'(?=[^<>]*(readonly\=[\"\'](\w+)[\"\']))', 
-                    input_def, flags=re.UNICODE | re.DOTALL)
-                if readonly:
-                    input_def = input_def.replace(readonly.groups()[0], '')
-                    readonly = readonly.groups()[1]
-                else:
-                    readonly = ''
-                style = re.search(r'(?=[^<>]*style\=[\"\'](.*)[\"\'])', input_def,
-                    flags=re.UNICODE | re.DOTALL)
-                if style:
-                    style = style.groups()[0]
-                else:
-                    style = ''
-                replacement = input_el.format(element_class=self.html_class,
-                        element_id=self.html_id,
-                        var=var, readonly=readonly, style=style,
-                        input_index=input_index)
-                html_string = re.sub(r'<textbox\s+(?=[^<>]*var\=[\"\'](' + \
-                                     var + ')[\"\'])' + r'[^<>]*/>',
-                replacement, html_string, count=1, flags=re.UNICODE | re.DOTALL)
-        return html_string
+        return html.tostring(xml)
 
     def build_configuration_json(self):
         """Creates json element from xml element (with aim to transfer later

From f635d19ba6b030f35a92f10f7e561c83a34ba083 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Tue, 25 Dec 2012 17:49:01 +0200
Subject: [PATCH 307/541] sphinx docs of XML format of GST

---
 docs/source/graphical_slider_tool.rst         | 352 ++++++++++++++++++
 docs/source/gst_example_dynamic_range.xml     |  41 ++
 .../gst_example_html_element_output.xml       |  40 ++
 .../source/gst_example_with_documentation.xml |  88 +++++
 docs/source/index.rst                         |   2 +-
 docs/source/xml_formats.rst                   |   8 +
 6 files changed, 530 insertions(+), 1 deletion(-)
 create mode 100644 docs/source/graphical_slider_tool.rst
 create mode 100644 docs/source/gst_example_dynamic_range.xml
 create mode 100644 docs/source/gst_example_html_element_output.xml
 create mode 100644 docs/source/gst_example_with_documentation.xml
 create mode 100644 docs/source/xml_formats.rst

diff --git a/docs/source/graphical_slider_tool.rst b/docs/source/graphical_slider_tool.rst
new file mode 100644
index 0000000000..07d5f058c1
--- /dev/null
+++ b/docs/source/graphical_slider_tool.rst
@@ -0,0 +1,352 @@
+*********************************************
+Xml format of graphical slider tool [xmodule]
+*********************************************
+
+.. module:: xml_format_gst
+
+Format description
+==================
+
+Graphical slider tool (GST) main tag is::
+
+    <graphical_slider_tool> BODY </graphical_slider_tool>
+
+``graphical_slider_tool`` tag must have two children tags: ``render``
+and ``configuration``.
+
+Render tag
+----------
+
+Render tag can contain usual html tags mixed with some GST specific tags::
+
+    <slider/> - represents jQuery slider
+    <textbox/> - represents input
+    <plot/> - represents Flot plot
+
+Also GST will track all elements inside ``<render></render>`` where ``id``
+attribute is set.
+
+The contents of the <render> section will be shown to the user after
+all occurrences of::
+
+    <slider var="{parameter name}" [style="{CSS statements}"]/>
+    <input var="parameter name" [style="{CSS statements}"] [readonly="true" | readonly="false"]/>
+    <plot [style="{CSS statements}"]/>
+
+have been converted to actual sliders, text inputs, and a plot graph.
+Everything in square brackets is optional.
+
+``{parameter name}`` specifies the parameter to which the slider or text
+input will be attached to.
+
+There is a one-to-one relationship between a slider and a parameter.
+I.e. for one parameter you can put only one ``<slider ...<`` in the
+``<render>`` section. However, you don't have to specify a slider - they
+are optional.
+
+There is a many-to-one relationship between text inputs and a
+parameter. I.e. for one parameter you can put many '<input ...<' in
+the ``<render>`` section. However, you don't have to specify a text
+input - they are optional.
+
+You can put only one ``<plot ...<`` in the ``<render>`` section. It is not
+required.
+
+NOTE: MathJax, independently of this module, will render all TeX code
+within the ``<render>`` section into nice mathematical formulas. Just
+remember to wrap it in one of::
+
+    \(  and  \)  -  for inline formulas (formulas surrounded by
+                  standard text)
+    \[  and  \]  -  if you want the formula to be a separate line
+
+Slider tag
+..........
+
+Slider tag must have ``var`` attribute and optional ``style`` attribute::
+
+    <slider var='a' style="width:400px;float:left;"/>
+
+After processing slider tags will be replaced by jQuery UI sliders with applied
+``style`` attribute.
+
+
+``Var`` attribute must correspond to parameter in one of ``function`` tags in
+``functions`` tag. By moving slider, value of parameter ``a`` will change, and so
+result of function, that depends on parameter ``a``, will change.
+
+
+Textbox tag
+...........
+
+
+Texbox tag must have ``var`` attribute and optional ``style`` and ``readonly``
+attributes::
+
+    <textbox var="b" readonly="true" style="width:50px; float:left; margin-left:10px;"/>
+
+After processing tetbox tags will be replaced by html inputs with applied
+``style`` attribute. If ``readonly`` is set to ``true`` input will be
+not-editable, default is ``false``.
+
+``Var`` attribute must correspond to parameter in one of ``function`` tags in
+``functions`` tag. By entering value in input, value of parameter ``b`` will change, and so
+result of function, that depends on parameter ``b``, will change.
+
+Plot tag
+........
+
+Plot tag may have optional ``style`` attribute::
+
+    <plot style="width:50px; float:left; margin-left:10px;"/>
+
+After processing plot tags will be replaced by Flot plot with applied
+``style`` attribute.
+
+HTML tags with id
+.................
+
+Any html tag with id, i.e. ``<span id="answer_span_1">`` will be counted as
+place where result of function can be rendered. To render function result to
+element, element id must be included in ``function`` tag as ``el_id`` attribute
+and ``output`` value must be ``"element"``::
+
+    <function output="element" el_id="answer_span_1">
+                    function add(a, b, precision) {
+                        var x = Math.pow(10, precision || 2);
+                        return (Math.round(a * x) + Math.round(b * x)) / x;
+                    }
+
+                    return add(a, b, 5);
+    </function>
+
+
+
+Configuration tag
+-----------------
+
+The configuration tag contain sparameter settings, graph
+settings, and function definitions which are to be plotted on the
+graph and that use specified parameters.
+
+Configuration tag contains two mandatory tag ``functions`` and ``parameters`` and
+may contain another ``plot`` tag.
+
+Parameters tag
+..............
+
+``Parameters`` tag contains ``parameter`` tags. Each ``parameter`` tag must have
+``var``, ``max``, ``min``, ``step`` and ``initial`` attributes::
+
+        <parameters>
+                <param var="a" min="-10.0" max="10.0" step="0.1" initial="0" />
+                <param var="b" min="-10.0" max="10.0" step="0.1" initial="0" />
+        </parameters>
+
+``Var`` attribute links min, max, step and initial values to parameter name.
+``Min`` attribute is minimal value that parameter can take. Slider and input
+values can not go below it.
+
+``Max`` attribute is maximal value that parameter can take. Slider and input
+values can not go over it.
+
+``Step`` attribute is value of slider step. When a slider increase or decreases
+the specified parameter, it will do so by the amount specified with 'step'
+
+``Initial`` attribute is the initial value that the specified parameter should be
+set to.
+
+The parameter's name is specified by the 'var' property. All occurrences
+of sliders and/or text inputs that specify a 'var' property, will be
+connected to this parameter - i.e. they will reflect the current
+value of the parameter and will be updated when the parameter
+changes.
+
+
+If at lest one of these attributes is not set, then the parameter
+will not be used, slider's and/or text input elements that specify
+this parameter will not be activated, and the specified functions
+which use this parameter will return a non valid value. This means
+that neglecting to specify at least one of the attributes for some
+parameter will have the result of the whole GST instance not working
+properly.
+
+
+Functions tag
+.............
+
+
+For the GST to do something, you must defined at least one
+function, which can use any of the specified parameter values. The
+function expects to take the ``x`` value, do some calculations, and
+return the ``y`` value. I.e. this is a 2D plot in Cartesian
+coordinates.
+
+Each function must be defined inside ``function`` tag in  ``functions`` tag::
+
+    <functions>
+        <function output="element" el_id="answer_span_1">
+            function add(a, b, precision) {
+                var x = Math.pow(10, precision || 2);
+                return (Math.round(a * x) + Math.round(b * x)) / x;
+            }
+
+            return add(a, b, 5);
+        </function>
+    </functions>
+
+The parameter names (along with their values, as provided from text
+inputs and/or sliders), will be available inside all defined
+functions. A defined function body string will be parsed internally
+by the browser's JavaScript engine and converted to a true JS
+function.
+
+The function's parameter list will automatically be created and
+populated, and will include the ``x``, and all of the specified
+parameter values (from sliders and text inputs). This means that
+each of the defined functions will have access to all of the
+parameter values. You don't have to use them, but they will be
+there.
+
+Examples::
+
+    <function>
+        return x;
+    </function>
+
+    <function dot="true" label="\(y_2\)">
+        return (x + a) * Math.sin(x * b);
+    </function>
+
+    <function color="green">
+        function helperFunc(c1) {
+            return c1 * c1 - a;
+        }
+        return helperFunc(x + 10 * a * b) + Math.sin(a - x);
+    </function>
+
+Required parameters::
+
+    function body:
+
+    A string composing a normal JavaScript function
+    except that there is no function declaration
+    (along with parameters), and no closing bracket.
+
+    So if you normally would have written your
+    JavaScript function like this:
+
+        function myFunc(x, a, b) {
+            return x * a + b;
+        }
+
+    here you must specify just the function body
+    (everything that goes between '{' and '}'). So,
+    you would specify the above function like so (the
+    bare-bone minimum):
+
+        <function>
+            return x * a + b;
+        </function>
+
+Optional parameters::
+
+
+    color:  Color name (red, green, etc.) or in the form of
+            '#FFFF00'. If not specified, a default color (different
+            one for each function) will be given by Flot;
+    line:   A string - 'true' or 'false'. Should the data points be
+            connected by a line on the graph? Default is 'true'.
+    dot:    A string - 'true' or 'false'. Should points be shown for
+            each data point on the graph? Default is 'false'.
+    label:  A string. If provided, will be shown in the legend, along
+            with the color that was used to plot the function.
+    output: "element" or "plot". If not defined, function will be plotted.
+            If defined, function will not be plotted, but rendered to element
+            with id set in 'el_id' attribute.
+    el_id:  Id of html element, defined in 'render' section. Value of
+            function will be rendered to content of this element.
+
+With ``output`` and ``el_id`` set together you can update html elements with
+function value, also function will not be plotted.
+
+[note on MathJax and labels]:
+
+It is possible to define a label in standard TeX notation. The JS
+library MathJax will work on these labels also because they are
+inserted on top of the plot as standard HTML (text within a DIV).
+
+Plot tag
+........
+
+``Plot`` tag inside ``configuration`` tag defines settings for plot output.
+
+Required parameters::
+
+    xrange: 2 functions that must return value. Value is constant (3.1415)
+            or depend on parameter from parameters section:
+                <xrange>
+                    <min>return 0;</min>
+                    <max>return 30;</max>
+                </xrange>
+                                        or
+                <xrange>
+                    <min>return -a;</min>
+                    <max>return a;</max>
+                </xrange>
+
+            All functions will be calculated over domain between xrange:min
+            and xrange:max. Xrange depending on parameter is extremely
+            useful when domain(s) of your function(s) depends on parameter
+            (like circle, when parameter is radius and you want to allow
+            to change it).
+
+Optional parameters::
+
+    num_points: Number of data points to generated for the plot. If
+                this is not set, the number of points will be
+                calculated as width / 5.
+    xticks,
+    yticks:    3 floating point numbers separated by commas. This
+               specifies how many ticks are created, what number they
+               start at, and what number they end at. This is different
+               from the 'xrange' setting in that it has nothing to do
+               with the data points - it control what area of the
+               Cartesian space you will see. The first number is the
+               first tick's value, the second number is the step
+               between each tick, the third number is the value of the
+               last tick. If these configurations are not specified,
+               Flot will chose them for you based on the data points
+               set that he is currently plotting. Usually, this results
+               in a nice graph, however, sometimes you need to fine
+               grain the controls. For example, when you want to show
+               a fixed area of the Cartesian space, even when the data
+               set changes. On it's own, Flot will recalculate the
+               ticks, which will result in a different graph each time.
+               By specifying the xticks, yticks configurations, only
+               the plotted data will change - the axes (ticks) will
+               remain as you have defined them.
+
+    xunits,
+    yunits:   Units values to be set on axes. Use MathJax. Example:
+                <xunits>\(cm\)</xunits>
+                <yunits>\(m\)</yunits>
+
+Example
+=======
+
+Plotting, sliders and inputs
+----------------------------
+
+.. literalinclude:: gst_example_with_documentation.xml
+
+Update of html elements, no plotting
+------------------------------------
+
+.. literalinclude:: gst_example_html_element_output.xml
+
+
+Circle with dynamic radius
+--------------------------
+
+.. literalinclude:: gst_example_dynamic_range.xml
diff --git a/docs/source/gst_example_dynamic_range.xml b/docs/source/gst_example_dynamic_range.xml
new file mode 100644
index 0000000000..0938e7b60b
--- /dev/null
+++ b/docs/source/gst_example_dynamic_range.xml
@@ -0,0 +1,41 @@
+<vertical>
+    <graphical_slider_tool>
+      <render>
+        <h2>Graphic slider tool: Dynamic range and implicit functions.</h2>
+
+        <p>You can make x range (not ticks of x axis) of functions to depend on 
+          parameter value. This can be useful when function domain depends
+          on parameter.</p>
+        <p>Also implicit functons like circle can be plotted as 2 separate 
+            functions of same color.</p>
+         <div style="height:50px;">
+         <slider var='a' style="width:400px;float:left;"/>
+         <textbox var='a' style="float:left;width:60px;margin-left:15px;"/>
+       </div>
+        <plot style="margin-top:15px;margin-bottom:15px;"/>
+      </render>
+      <configuration>
+        <parameters>
+            <param var="a" min="5" max="25" step="0.5" initial="12.5" />
+        </parameters>
+        <functions>
+          <function color="red">return Math.sqrt(a * a - x * x);</function>
+          <function color="red">return -Math.sqrt(a * a - x * x);</function>
+        </functions>
+        <plot>
+          <xrange>
+            <!-- dynamic range -->
+              <min>
+                  return -a;
+              </min>
+              <max>
+                  return a;
+              </max>
+          </xrange>
+          <num_points>1000</num_points>
+          <xticks>-30, 6, 30</xticks>
+          <yticks>-30, 6, 30</yticks>
+        </plot>
+      </configuration>
+    </graphical_slider_tool>
+</vertical>
diff --git a/docs/source/gst_example_html_element_output.xml b/docs/source/gst_example_html_element_output.xml
new file mode 100644
index 0000000000..340783871a
--- /dev/null
+++ b/docs/source/gst_example_html_element_output.xml
@@ -0,0 +1,40 @@
+<vertical>
+    <graphical_slider_tool>
+        <render>
+            <h2>Graphic slider tool: Output to DOM element.</h2>
+
+            <p>a + b = <span id="answer_span_1"></span></p>
+
+            <div style="clear:both">
+                <p style="float:left;margin-right:10px;">a</p>
+                <slider var='a' style="width:400px;float:left;"/>
+                <textbox var='a' style="width:50px;float:left;margin-left:15px;"/>
+            </div>
+
+            <div style="clear:both">
+                <p style="float:left;margin-right:10px;">b</p>
+                <slider var='b' style="width:400px;float:left;"/>
+                <textbox var='b' style="width:50px;float:left;margin-left:15px;"/>
+            </div>
+            <br/><br/><br/>
+            <plot/>
+        </render>
+        <configuration>
+            <parameters>
+                <param var="a" min="-10.0" max="10.0" step="0.1" initial="0" />
+                <param var="b" min="-10.0" max="10.0" step="0.1" initial="0" />
+            </parameters>
+
+            <functions>
+                <function output="element" el_id="answer_span_1">
+                    function add(a, b, precision) {
+                        var x = Math.pow(10, precision || 2);
+                        return (Math.round(a * x) + Math.round(b * x)) / x;
+                    }
+
+                    return add(a, b, 5);
+                </function>
+            </functions>
+        </configuration>
+    </graphical_slider_tool>
+</vertical>
diff --git a/docs/source/gst_example_with_documentation.xml b/docs/source/gst_example_with_documentation.xml
new file mode 100644
index 0000000000..a7a646d307
--- /dev/null
+++ b/docs/source/gst_example_with_documentation.xml
@@ -0,0 +1,88 @@
+<vertical>
+    <graphical_slider_tool>
+      <render>
+
+          <h2>Graphic slider tool: full example.</h2>
+            <p>
+                A simple equation
+                    \(
+                        y_1 = 10 \times b \times \frac{sin(a \times x) \times sin(b \times x)}{cos(b \times x) + 10}
+                    \)
+                can be plotted.
+            </p>
+
+            <!-- make text and input or slider at the same line -->
+            <div>
+              <p style="float:left;"> Currently \(a\) is</p>
+              <!-- readonly input for b -->
+              <textbox var="a" style="width:50px; float:left; margin-left:10px;" readonly="false"/>
+            </div>
+            <!-- clear:left will make next text to begin from new line -->
+            <p style="clear:left">   This one
+                  \(
+                      y_2 = sin(a \times x)
+                  \)
+              will be overlayed on top.
+            </p>
+            <div>
+              <p style="float:left;">Currently \(b\) is </p>
+              <textbox var="b" readonly="true" style="width:50px; float:left; margin-left:10px;"/>
+            </div>
+            <div style="clear:left;">
+              <p style="float:left;">To change \(a\) use:</p>
+              <slider var="a" style="width:400px;float:left;margin-left:10px;"/>
+            </div>
+            <div style="clear:left;">
+              <p style="float:left;">To change \(b\) use:</p>
+              <slider var="b" style="width:400px;float:left;margin-left:10px;"/>
+            </div>
+            <plot style='clear:left;width:600px;padding-top:15px;padding-bottom:20px;'/>
+            <div style="clear:left;height:50px;">
+             <p style="float:left;">Second input for b:</p>
+             <!-- editable input for b -->
+              <textbox var="b" style="color:red;width:60px;float:left;margin-left:10px;"/>
+            </div >
+      </render>
+
+      <configuration>
+
+        <parameters>
+            <param var="a" min="90" max="120" step="10" initial="100" />
+            <param var="b" min="120" max="200" step="2.3" initial="120" />
+        </parameters>
+
+        <functions>
+
+          <function color="#0000FF" line="false" dot="true" label="\(y_1\)">
+            return 10.0 * b * Math.sin(a * x) * Math.sin(b * x) / (Math.cos(b * x) + 10);
+          </function>
+          <function color="red" line="true" dot="false" label="\(y_2\)">
+            return Math.sin(a * x);
+          </function>
+          <function color="#FFFF00" line="false" dot="false" label="unknown">
+            function helperFunc(c1) {
+              return c1 * c1 - a;
+            }
+
+            return helperFunc(x + 10 * a * b) + Math.sin(a - x);
+          </function>
+        </functions>
+
+        <plot>
+
+          <xrange>
+              <min>return 0;</min>
+              <max>return 30;</max>
+          </xrange>
+
+          <num_points>120</num_points>
+
+          <xticks>0, 3, 30</xticks>
+          <yticks>-1.5, 1.5, 13.5</yticks>
+
+          <xunits>\(cm\)</xunits>
+          <yunits>\(m\)</yunits>
+        </plot>
+      </configuration>
+    </graphical_slider_tool>
+</vertical>
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 92c535a624..d2082ff3a0 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -14,7 +14,7 @@ Contents:
    overview.rst
    common-lib.rst
    djangoapps.rst
-
+   xml_formats.rst
 
 Indices and tables
 ==================
diff --git a/docs/source/xml_formats.rst b/docs/source/xml_formats.rst
new file mode 100644
index 0000000000..b76ee11642
--- /dev/null
+++ b/docs/source/xml_formats.rst
@@ -0,0 +1,8 @@
+XML formats of Inputtypes and Xmodule
+=====================================
+Contents:
+
+.. toctree::
+   :maxdepth: 2
+
+   graphical_slider_tool.rst
\ No newline at end of file

From 1fb4c8c720bde483fa44196ff0ff68af925e04c2 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Tue, 25 Dec 2012 18:42:59 +0200
Subject: [PATCH 308/541] grammar fix

---
 docs/source/graphical_slider_tool.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/graphical_slider_tool.rst b/docs/source/graphical_slider_tool.rst
index 07d5f058c1..0b42519288 100644
--- a/docs/source/graphical_slider_tool.rst
+++ b/docs/source/graphical_slider_tool.rst
@@ -106,7 +106,7 @@ After processing plot tags will be replaced by Flot plot with applied
 HTML tags with id
 .................
 
-Any html tag with id, i.e. ``<span id="answer_span_1">`` will be counted as
+Any html tag with id, e.g. ``<span id="answer_span_1">`` will be counted as
 place where result of function can be rendered. To render function result to
 element, element id must be included in ``function`` tag as ``el_id`` attribute
 and ``output`` value must be ``"element"``::

From 3f44b3aa2a9ea4af0a64222bcf985a48e655f138 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Tue, 25 Dec 2012 18:47:41 +0200
Subject: [PATCH 309/541] gst module docs

---
 common/lib/xmodule/xmodule/gst_module.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index 02040274c3..a6b0fb516b 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -8,7 +8,6 @@ import logging
 from lxml import etree
 from lxml import html
 import xmltodict
-import re
 
 from xmodule.mako_module import MakoModuleDescriptor
 from xmodule.xml_module import XmlDescriptor
@@ -71,17 +70,19 @@ class GraphicalSliderToolModule(XModule):
         return self.content
 
     def substitute_controls(self, html_string):
-        """ Substitutes control elements via their divs.
-        TODO: change regexps to html parsing via beautiful soup  or something
-        similar (aim : simpler support).
+        """ Substitutes control elements (slider, textbox and plot) in
+        html_string with their divs. Html_string is content of <render> tag
+        inside <graphical_slider_tool> tag. Documentation on how information in
+        <render> tag is organized and processed is located in:
+        mitx/docs/build/html/graphical_slider_tool.html.
 
         Args:
-            html_string: rendered html string with controls as xml tags
-            (<slider var="a"/>)
+            html_string: content of <render> tag, with controls as xml tags,
+                         e.g. <slider var="a"/>.
 
         Returns:
-            html_string with control tags replaced by proper divs
-            (<slider var="a"/> -> <div class="....slider" > </div>)
+                html_string with control tags replaced by proper divs
+                (<slider var="a"/> -> <div class="....slider" > </div>)
         """
 
         xml = html.fromstring(html_string)

From 535bd3f1959beac2338b6e1bbb4521e020af69b2 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Wed, 26 Dec 2012 12:56:34 +0200
Subject: [PATCH 310/541] Added bar support.

---
 .../js/src/graphical_slider_tool/graph.js     | 56 ++++++++++++++++---
 1 file changed, 48 insertions(+), 8 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 35c75c8adc..b4e6146a93 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -9,6 +9,17 @@ define('Graph', ['logme'], function (logme) {
     function Graph(gstId, config, state) {
         var plotDiv, dataSeries, functions, xaxis, yaxis, numPoints, xrange;
 
+        state.barsConfig = {
+            'N': 0,
+            'delta': 0,
+            'diff': 0,
+            'width': 0,
+            'width_perc': 0.8,
+            'margin': 0.1,
+            'total': 0.4,
+            'total_half': 0.2
+        };
+
         // We need plot configuration settings. Without them we can't continue.
         if ($.isPlainObject(config.plot) === false) {
             return;
@@ -410,11 +421,13 @@ define('Graph', ['logme'], function (logme) {
                     obj['@dot'],
                     obj['@label'],
                     obj['@point_size'],
-                    obj['@fill_area']
+                    obj['@fill_area'],
+                    obj['@bar']
                 );
             }
 
-            function addFunction(funcString, color, line, dot, label, pointSize, fillArea) {
+            function addFunction(funcString, color, line, dot, label,
+                                 pointSize, fillArea, bar) {
                 var newFunctionObject, func, paramNames;
 
                 // The main requirement is function string. Without it we can't
@@ -433,7 +446,8 @@ define('Graph', ['logme'], function (logme) {
                 // make sure that at least a line is drawn for a function.
                 newFunctionObject = {
                     'line': true,
-                    'dot': false
+                    'dot': false,
+                    'bars': false
                 };
 
                 // Get all of the parameter names defined by the user in the
@@ -505,9 +519,21 @@ define('Graph', ['logme'], function (logme) {
                     newFunctionObject['pointSize'] = pointSize;
                 }
 
-                // If the preference is conflicting (we must have either line
-                // or dot, none is not an option), we will show line.
-                if (
+                if (typeof bar === 'string') {
+                    if (bar.toLowerCase() === 'true') {
+                        newFunctionObject['bars'] = true;
+                    } else if (bar.toLowerCase() === 'false') {
+                        newFunctionObject['bars'] = false;
+                    }
+                }
+
+                if (newFunctionObject['bars'] === true) {
+                    newFunctionObject['line'] = false;
+                    newFunctionObject['dot'] = false;
+
+                    newFunctionObject.barIndex = state.barsConfig.N;
+                    state.barsConfig.N += 1;
+                } else if (
                     (newFunctionObject['dot'] === false) &&
                     (newFunctionObject['line'] === false)
                 ) {
@@ -547,7 +573,7 @@ define('Graph', ['logme'], function (logme) {
 
         function generateData() {
             var c0, c1, functionObj, seriesObj, dataPoints, paramValues, x, y,
-                start, end, step;
+                start, end, step, tempX;
 
             paramValues = state.getAllParameterValues();
 
@@ -588,6 +614,9 @@ define('Graph', ['logme'], function (logme) {
                 }
                 step = (end - start) / (numPoints - 1);
 
+                state.barsConfig.delta = (step * state.barsConfig.total) / state.barsConfig.N;
+                state.barsConfig.diff = step * state.barsConfig.total_half;
+
                 // Generate the data points.
                 for (x = start; x <= end; x += step) {
 
@@ -609,12 +638,18 @@ define('Graph', ['logme'], function (logme) {
                         return false;
                     }
 
+                    if (functionObj.bars === true) {
+                        tempX = x - state.barsConfig.diff + (functionObj.barIndex + state.barsConfig.margin) * state.barsConfig.delta;
+                    } else {
+                        tempX = x;
+                    }
+
                     // Return the paramValues array to how it was before we
                     // added 'x' variable to the end of it.
                     paramValues.pop();
 
                     // Add the generated point to the data points set.
-                    dataPoints.push([x, y]);
+                    dataPoints.push([tempX, y]);
 
                     c1 += 1;
 
@@ -669,6 +704,11 @@ define('Graph', ['logme'], function (logme) {
                     'show': functionObj.dot
                 };
 
+                seriesObj.bars = {
+                    'show': functionObj.bars,
+                    'barWidth': state.barsConfig.delta * state.barsConfig.width_perc
+                };
+
                 if (functionObj.hasOwnProperty('pointSize')) {
                     seriesObj.points.radius = functionObj.pointSize;
                 }

From 421002808df29e7de555a7aa591fee89b7447b48 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Wed, 26 Dec 2012 13:35:35 +0200
Subject: [PATCH 311/541] Fixed bug. Specified values that are outside the
 allowed range now behave properly. Plot is redrawn after the value has been
 set to max (or min) value.

---
 .../xmodule/js/src/graphical_slider_tool/state.js      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
index 47653a8ae9..77423d2a20 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
@@ -207,11 +207,6 @@ define('State', ['logme'], function (logme) {
 
             parameters[paramName].value = paramValueNum;
 
-            // If we have a plot DIV to work with, tell to update.
-            if (plotDiv !== undefined) {
-                plotDiv.trigger('update_plot');
-            }
-
             // Update all text inputs with the new parameter's value.
             for (c1 = 0; c1 < parameters[paramName].inputDivs.length; c1 += 1) {
                 parameters[paramName].inputDivs[c1].val(paramValueNum);
@@ -229,6 +224,11 @@ define('State', ['logme'], function (logme) {
                 dynamicEl[c1].outputEl.html(dynamicEl[c1].func.apply(window, allParameterValues));
             }
 
+            // If we have a plot DIV to work with, tell to update.
+            if (plotDiv !== undefined) {
+                plotDiv.trigger('update_plot');
+            }
+
             return true;
         } // End-of: function setParameterValue
 

From 3fec482f7f0a5dff66e3ea9f5d95c4246405212c Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Mon, 31 Dec 2012 13:25:13 +0200
Subject: [PATCH 312/541] Added support for horizontal and vertical asymptotes.

---
 .../js/src/graphical_slider_tool/graph.js     | 150 +++++++++++++++++-
 1 file changed, 148 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index b4e6146a93..678aacfe52 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -7,7 +7,8 @@ define('Graph', ['logme'], function (logme) {
     return Graph;
 
     function Graph(gstId, config, state) {
-        var plotDiv, dataSeries, functions, xaxis, yaxis, numPoints, xrange;
+        var plotDiv, dataSeries, functions, xaxis, yaxis, numPoints, xrange,
+            asymptotes;
 
         state.barsConfig = {
             'N': 0,
@@ -69,6 +70,8 @@ define('Graph', ['logme'], function (logme) {
             return;
         }
 
+        createMarkingsFunctions();
+
         // Create the initial graph and plot it for the user to see.
         if (generateData() === true) {
             updatePlot();
@@ -80,6 +83,93 @@ define('Graph', ['logme'], function (logme) {
 
         return;
 
+        function createMarkingsFunctions() {
+            var c1, paramNames;
+
+            asymptotes = [];
+            paramNames = state.getAllParameterNames();
+
+            if ($.isPlainObject(config.plot.asymptote)) {
+                processAsymptote(config.plot.asymptote);
+            } else if ($.isArray(config.plot.asymptote)) {
+                for (c1 = 0; c1 < config.plot.asymptote.length; c1 += 1) {
+                    processAsymptote(config.plot.asymptote[c1]);
+                }
+            }
+
+            return;
+
+            // Read configuration options for asymptotes, and store them as
+            // an array of objects. Each object will have 3 properties:
+            //
+            //    - color: the color of the asymptote line
+            //    - type: 'x' (vertical), or 'y' (horizontal)
+            //    - func: the function that will generate the value at which
+            //            the asymptote will be plotted; i.e. x = func(), or
+            //            y = func(); for now only horizontal and vertical
+            //            asymptotes are supported
+            //
+            // Since each asymptote can have a variable function - function
+            // that relies on some parameter specified in the config - we will
+            // generate each asymptote just before we draw the graph. See:
+            //
+            //     function updatePlot()
+            //     function generateMarkings()
+            //
+            // Asymptotes are really thin rectangles implemented via the Flot's
+            // markings option.
+            function processAsymptote(asyObj) {
+                var newAsyObj, funcString, func;
+
+                newAsyObj = {};
+
+                if (typeof asyObj['@type'] === 'string') {
+                    if (asyObj['@type'].toLowerCase() === 'x') {
+                        newAsyObj.type = 'x';
+                    } else if (asyObj['@type'].toLowerCase() === 'y') {
+                        newAsyObj.type = 'y';
+                    } else {
+                        logme('ERROR: Attribute "type" for asymptote can be "x" or "y".');
+
+                        return;
+                    }
+                } else {
+                    logme('ERROR: Attribute "type" for asymptote is not specified.');
+
+                    return;
+                }
+
+                if (typeof asyObj['#text'] === 'string') {
+                    funcString = asyObj['#text'];
+                } else {
+                    logme('ERROR: Function body for asymptote is not specified.');
+
+                    return;
+                }
+
+                newAsyObj.color = '#000';
+                if (typeof asyObj['@color'] === 'string') {
+                    newAsyObj.color = asyObj['@color'];
+                }
+
+                paramNames.push(funcString);
+
+                try {
+                    func = Function.apply(null, paramNames);
+                } catch (err) {
+                    logme('ERROR: Asymptote function body could not be converted to function object.');
+                    logme('Error message: "".' + err.message);
+
+                    return;
+                }
+
+                paramNames.pop();
+
+                newAsyObj.func = func;
+                asymptotes.push(newAsyObj);
+            }
+        }
+
         function setGraphAxes() {
             xaxis = {};
             if (typeof config.plot['xticks'] === 'string') {
@@ -366,7 +456,7 @@ define('Graph', ['logme'], function (logme) {
             } else if ($.isArray(config.functions.function)) {
 
                 // If more than one function is defined.
-                for (c1 = 0; c1 < config.functions.function.length; c1++) {
+                for (c1 = 0; c1 < config.functions.function.length; c1 += 1) {
 
                     // For each definition, we must check if it is a simple
                     // string definition, or a complex one with properties.
@@ -722,6 +812,10 @@ define('Graph', ['logme'], function (logme) {
         } // End-of: function generateData
 
         function updatePlot() {
+            var paramValues;
+
+            paramValues = state.getAllParameterValues();
+
             // Tell Flot to draw the graph to our specification.
 
             $.plot(
@@ -743,6 +837,9 @@ define('Graph', ['logme'], function (logme) {
                         // legend background become.
                         'backgroundOpacity': 0
 
+                    },
+                    'grid': {
+                        'markings': generateMarkings()
                     }
                 }
             );
@@ -759,6 +856,55 @@ define('Graph', ['logme'], function (logme) {
                 MathJax.Hub,
                 plotDiv.attr('id')
             ]);
+
+            return;
+
+            // Generate markings to represent asymptotes defined by the user.
+            // See the following function for more details:
+            //
+            //     function processAsymptote()
+            //
+            function generateMarkings() {
+                var c1, asymptote, markings, val;
+
+                markings = [];
+
+                for (c1 = 0; c1 < asymptotes.length; c1 += 1) {
+                    asymptote = asymptotes[c1];
+
+                    try {
+                        val = asymptote.func.apply(window, paramValues);
+                    } catch (err) {
+                        logme('ERROR: Could not generate value from asymptote function.');
+                        logme('Error message: ', err.message);
+
+                        continue;
+                    }
+
+                    if (asymptote.type === 'x') {
+                        markings.push({
+                            'color': asymptote.color,
+                            'lineWidth': 1,
+                            'xaxis': {
+                                'from': val,
+                                'to': val
+                            }
+                        });
+                    } else {
+                        markings.push({
+                            'color': asymptote.color,
+                            'lineWidth': 1,
+                            'yaxis': {
+                                'from': val,
+                                'to': val
+                            }
+                        });
+
+                    }
+                }
+
+                return markings;
+            }
         }
     }
 });

From 9cabaf1ef356b0e180e20152022e136c6abd622e Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Fri, 4 Jan 2013 17:26:48 +0200
Subject: [PATCH 313/541] Added automatic insertion of missing "return"
 statement into simple function strings. Added an option to turn this feature
 off.

---
 .../js/src/graphical_slider_tool/graph.js     | 29 +++++++++++++++++--
 docs/source/graphical_slider_tool.rst         |  6 ++++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 678aacfe52..65511e1599 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -512,12 +512,13 @@ define('Graph', ['logme'], function (logme) {
                     obj['@label'],
                     obj['@point_size'],
                     obj['@fill_area'],
-                    obj['@bar']
+                    obj['@bar'],
+                    obj['@disable_auto_return']
                 );
             }
 
             function addFunction(funcString, color, line, dot, label,
-                                 pointSize, fillArea, bar) {
+                                 pointSize, fillArea, bar, disableAutoReturn) {
                 var newFunctionObject, func, paramNames;
 
                 // The main requirement is function string. Without it we can't
@@ -532,6 +533,30 @@ define('Graph', ['logme'], function (logme) {
                 // will break.
                 funcString = $('<div>').html(funcString).text();
 
+                // If the user did not specifically turn off this feature,
+                // check if the function string contains a 'return', and
+                // prepend a 'return ' to the string if one, or more, is not
+                // found.
+                if (
+                    (disableAutoReturn === undefined) ||
+                    (
+                        (typeof disableAutoReturn === 'string') &&
+                        (disableAutoReturn.toLowerCase() !== 'true')
+                    )
+                ) {
+                    if (funcString.search(/return/i) === -1) {
+                        funcString = 'return ' + funcString;
+                    }
+                } else {
+                    if (funcString.search(/return/i) === -1) {
+                        logme(
+                            'ERROR: You have specified a JavaScript ' +
+                            'function without a "return" statemnt. Your ' +
+                            'function will return "undefined" by default.'
+                        );
+                    }
+                }
+
                 // Some defaults. If no options are set for the graph, we will
                 // make sure that at least a line is drawn for a function.
                 newFunctionObject = {
diff --git a/docs/source/graphical_slider_tool.rst b/docs/source/graphical_slider_tool.rst
index 0b42519288..6334c6d77e 100644
--- a/docs/source/graphical_slider_tool.rst
+++ b/docs/source/graphical_slider_tool.rst
@@ -266,6 +266,12 @@ Optional parameters::
             with id set in 'el_id' attribute.
     el_id:  Id of html element, defined in 'render' section. Value of
             function will be rendered to content of this element.
+    disable_auto_return: By default, if JavaScript function string is written
+                         without a "return" statement, one will be prepended
+                         to it. Set to "true" to disable this functionality.
+                         This is done so that simple functions can be defined
+                         in an easy fashion (for example, "a", which will be
+                         translated into "return a").
 
 With ``output`` and ``el_id`` set together you can update html elements with
 function value, also function will not be plotted.

From def8eb472c34d6599893832adb1da7f6baf4dd16 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Tue, 8 Jan 2013 17:17:29 +0200
Subject: [PATCH 314/541] Refactoring. Added ability to add dynamic element
 output to graph labels. Updated 2 demos for GST. "Falsified Clinic Data", and
 "Sample Size and Power".

---
 .../js/src/graphical_slider_tool/el_output.js |  39 ++++---
 .../js/src/graphical_slider_tool/graph.js     | 107 +++++++++++++-----
 .../js/src/graphical_slider_tool/gst_main.js  |   6 +-
 .../js/src/graphical_slider_tool/state.js     |  41 +++++--
 4 files changed, 138 insertions(+), 55 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
index 901989b2af..146d8a9f7f 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
@@ -25,15 +25,14 @@ define('ElOutput', ['logme'], function (logme) {
         return;
 
         function processFuncObj(obj) {
-            var outputEl, paramNames, funcString, func;
+            var paramNames, funcString, func, special, el;
 
             // We are only interested in functions that are meant for output to an
             // element.
-            if (typeof obj['@output'] !== 'string') {
-                return;
-            }
-
-            if (obj['@output'].toLowerCase() !== 'element') {
+            if (
+                (typeof obj['@output'] !== 'string') ||
+                (obj['@output'].toLowerCase() !== 'element')
+            ) {
                 return;
             }
 
@@ -55,14 +54,6 @@ define('ElOutput', ['logme'], function (logme) {
             // ASCII text equivalents.
             funcString = $('<div>').html(funcString).text();
 
-            outputEl = $('#' + obj['@el_id']);
-
-            if (outputEl.length !== 1) {
-                logme('ERROR: The element with id "' + obj['@el_id'] + '" was not found.');
-
-                return;
-            }
-
             paramNames = state.getAllParameterNames();
             paramNames.push(funcString);
 
@@ -86,9 +77,25 @@ define('ElOutput', ['logme'], function (logme) {
 
             paramNames.pop();
 
-            outputEl.html(func.apply(window, state.getAllParameterValues()));
+            special = false;
+            if (obj['@el_id'][0] === '_') {
+                special = true;
+            } else {
+                el = $('#' + obj['@el_id']);
 
-            state.addDynamicEl(outputEl, func);
+                if (el.length !== 1) {
+                    logme(
+                        'ERROR: DOM element with ID "' + obj['@el_id'] + '" ' +
+                        'not found. Dynamic element not created.'
+                    );
+
+                    return;
+                }
+
+                el.html(func.apply(window, state.getAllParameterValues()));
+            }
+
+            state.addDynamicEl(el, func, obj['@el_id'], special);
         }
 
     }
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 65511e1599..8756f03aef 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -8,7 +8,9 @@ define('Graph', ['logme'], function (logme) {
 
     function Graph(gstId, config, state) {
         var plotDiv, dataSeries, functions, xaxis, yaxis, numPoints, xrange,
-            asymptotes;
+            asymptotes, plotObj;
+
+        plotObj = null;
 
         state.barsConfig = {
             'N': 0,
@@ -519,7 +521,7 @@ define('Graph', ['logme'], function (logme) {
 
             function addFunction(funcString, color, line, dot, label,
                                  pointSize, fillArea, bar, disableAutoReturn) {
-                var newFunctionObject, func, paramNames;
+                var newFunctionObject, func, paramNames, matches;
 
                 // The main requirement is function string. Without it we can't
                 // create a function, and the series cannot be calculated.
@@ -671,6 +673,17 @@ define('Graph', ['logme'], function (logme) {
                 }
 
                 if (typeof label === 'string') {
+                    matches = label.match(/%%_[^%]*%%/g);
+
+                    if (
+                        ($.isArray(matches) === true) &&
+                        (matches.length > 0)
+                    ) {
+                        newFunctionObject['specialLabel'] = true;
+                    } else {
+                        newFunctionObject['specialLabel'] = false;
+                    }
+
                     newFunctionObject['label'] = label;
                 }
 
@@ -688,7 +701,7 @@ define('Graph', ['logme'], function (logme) {
 
         function generateData() {
             var c0, c1, functionObj, seriesObj, dataPoints, paramValues, x, y,
-                start, end, step, tempX;
+                start, end, step, tempX, matches;
 
             paramValues = state.getAllParameterValues();
 
@@ -801,7 +814,35 @@ define('Graph', ['logme'], function (logme) {
 
                 // See if a user defined a label for this function.
                 if (functionObj.hasOwnProperty('label') === true) {
-                    seriesObj.label = functionObj.label;
+                    if (functionObj.specialLabel === true) {
+                        matches = functionObj.label.match(/%%_[^%]*%%/g);
+
+                        if ($.isArray(matches) === true) {
+                            (function (c1) {
+                                var el_id, func, tempLabel;
+
+                                tempLabel = functionObj.label;
+
+                                while (c1 < matches.length) {
+                                    el_id = matches[c1].replace(/%/g, '');
+                                    func = state.getFuncForSpecialLabel(el_id);
+
+                                    if (func !== null) {
+                                        tempLabel = tempLabel.replace(
+                                            matches[c1],
+                                            func.apply(window, state.getAllParameterValues())
+                                        );
+                                    }
+
+                                    c1 += 1;
+                                }
+
+                                seriesObj.label = tempLabel;
+                            }(0));
+                        }
+                    } else {
+                        seriesObj.label = functionObj.label;
+                    }
                 }
 
                 // Should the data points be connected by a line?
@@ -841,33 +882,41 @@ define('Graph', ['logme'], function (logme) {
 
             paramValues = state.getAllParameterValues();
 
-            // Tell Flot to draw the graph to our specification.
+            // Tell Flot to draw the graph to our specification. If this is the
+            // first time, then call $.plot.
+            if (plotObj === null) {
+                plotObj = $.plot(
+                    plotDiv,
+                    dataSeries,
+                    {
+                        'xaxis': xaxis,
+                        'yaxis': yaxis,
+                        'legend': {
 
-            $.plot(
-                plotDiv,
-                dataSeries,
-                {
-                    'xaxis': xaxis,
-                    'yaxis': yaxis,
-                    'legend': {
+                            // To show the legend or not. Note, even if 'show' is
+                            // 'true', the legend will only show if labels are
+                            // provided for at least one of the series that are
+                            // going to be plotted.
+                            'show': true,
 
-                        // To show the legend or not. Note, even if 'show' is
-                        // 'true', the legend will only show if labels are
-                        // provided for at least one of the series that are
-                        // going to be plotted.
-                        'show': true,
+                            // A floating point number in the range [0, 1]. The
+                            // smaller the number, the more transparent will the
+                            // legend background become.
+                            'backgroundOpacity': 0
 
-                        // A floating point number in the range [0, 1]. The
-                        // smaller the number, the more transparent will the
-                        // legend background become.
-                        'backgroundOpacity': 0
-
-                    },
-                    'grid': {
-                        'markings': generateMarkings()
+                        },
+                        'grid': {
+                            'markings': generateMarkings()
+                        }
                     }
-                }
-            );
+                );
+            }
+            // Otherwise, use stored plot object.
+            else {
+                plotObj.setData(dataSeries);
+                plotObj.setupGrid();
+                plotObj.draw();
+            }
 
             // The first time that the graph gets added to the page, the legend
             // is created from scratch. When it appears, MathJax works some
@@ -909,7 +958,7 @@ define('Graph', ['logme'], function (logme) {
                     if (asymptote.type === 'x') {
                         markings.push({
                             'color': asymptote.color,
-                            'lineWidth': 1,
+                            'lineWidth': 2,
                             'xaxis': {
                                 'from': val,
                                 'to': val
@@ -918,7 +967,7 @@ define('Graph', ['logme'], function (logme) {
                     } else {
                         markings.push({
                             'color': asymptote.color,
-                            'lineWidth': 1,
+                            'lineWidth': 2,
                             'yaxis': {
                                 'from': val,
                                 'to': val
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
index bdbe317f36..71f946e312 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
@@ -64,12 +64,12 @@ define(
         Sliders(gstId, state);
         Inputs(gstId, gstClass, state);
 
+        // Configure functions that output to an element instead of the graph.
+        ElOutput(config, state);
+
         // Configure and display the graph. Attach event for the graph to be
         // updated on any change of a slider or a text input.
         Graph(gstId, config, state);
-
-        // Configure functions that output to an element instead of the graph.
-        ElOutput(config, state);
     }
 });
 
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
index 77423d2a20..3aea34ceb5 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
@@ -18,9 +18,10 @@ define('State', ['logme'], function (logme) {
 
     function State(gstId, config) {
         var parameters, allParameterNames, allParameterValues,
-            plotDiv, dynamicEl;
+            plotDiv, dynamicEl, dynamicElByElId;
 
         dynamicEl = [];
+        dynamicElByElId = {};
 
         stateInst += 1;
         logme('MESSAGE: Creating state instance # ' + stateInst + '.');
@@ -95,7 +96,9 @@ define('State', ['logme'], function (logme) {
             'getAllParameterValues': getAllParameterValues,
 
             'bindUpdatePlotEvent': bindUpdatePlotEvent,
-            'addDynamicEl': addDynamicEl
+            'addDynamicEl': addDynamicEl,
+
+            'getFuncForSpecialLabel': getFuncForSpecialLabel
         };
 
         function getAllParameterNames() {
@@ -122,11 +125,33 @@ define('State', ['logme'], function (logme) {
             plotDiv.bind('update_plot', callback);
         }
 
-        function addDynamicEl(outputEl, func) {
-            dynamicEl.push({
-                'outputEl': outputEl,
-                'func': func
+        function addDynamicEl(el, func, elId, special) {
+            var newLength;
+
+            newLength = dynamicEl.push({
+                'el': el,
+                'func': func,
+                'elId': elId,
+                'special': special
             });
+
+            if (typeof dynamicElByElId[elId] !== 'undefined') {
+                logme(
+                    'ERROR: Duplicate dynamic element ID "' + elId + '" found.'
+                );
+            } else {
+                dynamicElByElId[elId] = dynamicEl[newLength - 1];
+            }
+        }
+
+        function getFuncForSpecialLabel(elId) {
+            if (typeof dynamicElByElId[elId] === 'undefined') {
+                logme('ERROR: Special label with ID "' + elId + '" does not exist.');
+
+                return null;
+            }
+
+            return dynamicElByElId[elId].func;
         }
 
         function getParameterValue(paramName) {
@@ -221,7 +246,9 @@ define('State', ['logme'], function (logme) {
             allParameterValues[parameters[paramName].helperArrayIndex] = paramValueNum;
 
             for (c1 = 0; c1 < dynamicEl.length; c1++) {
-                dynamicEl[c1].outputEl.html(dynamicEl[c1].func.apply(window, allParameterValues));
+                if (dynamicEl[c1].special !== true) {
+                    dynamicEl[c1].el.html(dynamicEl[c1].func.apply(window, allParameterValues));
+                }
             }
 
             // If we have a plot DIV to work with, tell to update.

From 20227d219e1ac51f3497538d584ff025f16e15ea Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Wed, 9 Jan 2013 10:16:06 +0200
Subject: [PATCH 315/541] Added new feature: ability to add a label for an
 asymptote. Added new demo to GST: "Power and Alpha Demo".

---
 .../js/src/graphical_slider_tool/graph.js     | 68 ++++++++++---------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 8756f03aef..f35f92aa98 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -154,6 +154,11 @@ define('Graph', ['logme'], function (logme) {
                     newAsyObj.color = asyObj['@color'];
                 }
 
+                newAsyObj.label = false;
+                if (typeof asyObj['@label'] === 'string') {
+                    newAsyObj.label = asyObj['@label'];
+                }
+
                 paramNames.push(funcString);
 
                 try {
@@ -874,6 +879,16 @@ define('Graph', ['logme'], function (logme) {
                 dataSeries.push(seriesObj);
             }
 
+            for (c0 = 0; c0 < asymptotes.length; c0 += 1) {
+                if (typeof asymptotes[c0].label === 'string') {
+                    dataSeries.push({
+                        'data': [],
+                        'label': asymptotes[c0].label,
+                        'color': asymptotes[c0].color
+                    });
+                }
+            }
+
             return true;
         } // End-of: function generateData
 
@@ -882,41 +897,32 @@ define('Graph', ['logme'], function (logme) {
 
             paramValues = state.getAllParameterValues();
 
-            // Tell Flot to draw the graph to our specification. If this is the
-            // first time, then call $.plot.
-            if (plotObj === null) {
-                plotObj = $.plot(
-                    plotDiv,
-                    dataSeries,
-                    {
-                        'xaxis': xaxis,
-                        'yaxis': yaxis,
-                        'legend': {
+            // Tell Flot to draw the graph to our specification.
+            $.plot(
+                plotDiv,
+                dataSeries,
+                {
+                    'xaxis': xaxis,
+                    'yaxis': yaxis,
+                    'legend': {
 
-                            // To show the legend or not. Note, even if 'show' is
-                            // 'true', the legend will only show if labels are
-                            // provided for at least one of the series that are
-                            // going to be plotted.
-                            'show': true,
+                        // To show the legend or not. Note, even if 'show' is
+                        // 'true', the legend will only show if labels are
+                        // provided for at least one of the series that are
+                        // going to be plotted.
+                        'show': true,
 
-                            // A floating point number in the range [0, 1]. The
-                            // smaller the number, the more transparent will the
-                            // legend background become.
-                            'backgroundOpacity': 0
+                        // A floating point number in the range [0, 1]. The
+                        // smaller the number, the more transparent will the
+                        // legend background become.
+                        'backgroundOpacity': 0
 
-                        },
-                        'grid': {
-                            'markings': generateMarkings()
-                        }
+                    },
+                    'grid': {
+                        'markings': generateMarkings()
                     }
-                );
-            }
-            // Otherwise, use stored plot object.
-            else {
-                plotObj.setData(dataSeries);
-                plotObj.setupGrid();
-                plotObj.draw();
-            }
+                }
+            );
 
             // The first time that the graph gets added to the page, the legend
             // is created from scratch. When it appears, MathJax works some

From 72d500c168bfb429f45ed24a8fbde4923916b90e Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Thu, 10 Jan 2013 11:11:00 +0200
Subject: [PATCH 316/541] Feature "Dynamic Elements in Labels" has been
 refactored to provide the user an easier interface for access. Demo "Sample
 Size and Power" has been updated.

---
 common/lib/xmodule/xmodule/gst_module.py      |   1 +
 .../g_label_el_output.js                      |  91 +++++++++++++++
 .../js/src/graphical_slider_tool/graph.js     | 110 +++++++++++-------
 .../js/src/graphical_slider_tool/gst_main.js  |   8 +-
 .../js/src/graphical_slider_tool/state.js     |   5 +-
 5 files changed, 172 insertions(+), 43 deletions(-)
 create mode 100644 common/lib/xmodule/xmodule/js/src/graphical_slider_tool/g_label_el_output.js

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index a6b0fb516b..c29e4e6a04 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -37,6 +37,7 @@ class GraphicalSliderToolModule(XModule):
         resource_string(__name__, 'js/src/graphical_slider_tool/inputs.js'),
         resource_string(__name__, 'js/src/graphical_slider_tool/graph.js'),
         resource_string(__name__, 'js/src/graphical_slider_tool/el_output.js'),
+        resource_string(__name__, 'js/src/graphical_slider_tool/g_label_el_output.js'),
 
         resource_string(__name__, 'js/src/graphical_slider_tool/gst.js')
       ]
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/g_label_el_output.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/g_label_el_output.js
new file mode 100644
index 0000000000..feac031aee
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/g_label_el_output.js
@@ -0,0 +1,91 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+(function (requirejs, require, define) {
+
+define('GLabelElOutput', ['logme'], function (logme) {
+    return GLabelElOutput;
+
+    function GLabelElOutput(config, state) {
+        if ($.isPlainObject(config.functions.function)) {
+            processFuncObj(config.functions.function);
+        } else if ($.isArray(config.functions.function)) {
+            (function (c1) {
+                while (c1 < config.functions.function.length) {
+                    if ($.isPlainObject(config.functions.function[c1])) {
+                        processFuncObj(config.functions.function[c1]);
+                    }
+
+                    c1 += 1;
+                }
+            }(0));
+        }
+
+        return;
+
+        function processFuncObj(obj) {
+            var paramNames, funcString, func;
+
+            // We are only interested in functions that are meant for output to an
+            // element.
+            if (
+                (typeof obj['@output'] !== 'string') ||
+                (obj['@output'].toLowerCase() !== 'plot_label')
+            ) {
+                return;
+            }
+
+            if (typeof obj['@el_id'] !== 'string') {
+                logme('ERROR: You specified "output" as "plot_label", but did not spify "el_id".');
+
+                return;
+            }
+
+            if (typeof obj['#text'] !== 'string') {
+                logme('ERROR: Function body is not defined.');
+
+                return;
+            }
+
+            funcString = obj['#text'];
+
+            // Make sure that all HTML entities are converted to their proper
+            // ASCII text equivalents.
+            funcString = $('<div>').html(funcString).text();
+
+            paramNames = state.getAllParameterNames();
+            paramNames.push(funcString);
+
+            try {
+                func = Function.apply(null, paramNames);
+            } catch (err) {
+                logme(
+                    'ERROR: The function body "' +
+                        funcString +
+                        '" was not converted by the Function constructor.'
+                );
+                logme('Error message: "' + err.message + '".');
+
+                $('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not create a function from string "' + funcString + '".' + '</div>');
+                $('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
+
+                paramNames.pop();
+
+                return;
+            }
+
+            paramNames.pop();
+
+            state.plde.push({
+                'elId': obj['@el_id'],
+                'func': func
+            });
+        }
+
+    }
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index f35f92aa98..50d8d7bcd4 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -155,7 +155,10 @@ define('Graph', ['logme'], function (logme) {
                 }
 
                 newAsyObj.label = false;
-                if (typeof asyObj['@label'] === 'string') {
+                if (
+                    (asyObj.hasOwnProperty('@label') === true) &&
+                    (typeof asyObj['@label'] === 'string')
+                ) {
                     newAsyObj.label = asyObj['@label'];
                 }
 
@@ -492,7 +495,10 @@ define('Graph', ['logme'], function (logme) {
             // properties as parameters. Rather than writing them out every
             // time, we will have a single place where it is done.
             function callAddFunction(obj) {
-                if (typeof obj['@output'] === 'string') {
+                if (
+                    (obj.hasOwnProperty('@output')) &&
+                    (typeof obj['@output'] === 'string')
+                ) {
 
                     // If this function is meant to be calculated for an
                     // element then skip it.
@@ -500,13 +506,24 @@ define('Graph', ['logme'], function (logme) {
                         return;
                     }
 
-                    // It is an error if "output" is not "element" or "graph".
-                    // Though you can ommit the "output" attribute.
+                    // If this function is meant to be calculated for a
+                    // dynamic element in a label then skip it.
+                    else if (obj['@output'].toLowerCase() === 'plot_label') {
+                        return;
+                    }
+
+                    // It is an error if '@output' is not 'element',
+                    // 'plot_label', or 'graph'. However, if the '@output'
+                    // attribute is omitted, we will not have reached this.
                     else if (obj['@output'].toLowerCase() !== 'graph') {
-                        logme('ERROR: Function "output" attribute can be either "div" or "graph".');
+                        logme(
+                            'ERROR: Function "output" attribute can be ' +
+                            'either "element", "plot_label",  or "graph".'
+                        );
 
                         return;
                     }
+
                 }
 
                 // The user did not specify an "output" attribute, or it is
@@ -525,8 +542,9 @@ define('Graph', ['logme'], function (logme) {
             }
 
             function addFunction(funcString, color, line, dot, label,
-                                 pointSize, fillArea, bar, disableAutoReturn) {
-                var newFunctionObject, func, paramNames, matches;
+                pointSize, fillArea, bar, disableAutoReturn) {
+
+                var newFunctionObject, func, paramNames, c1, rgxp;
 
                 // The main requirement is function string. Without it we can't
                 // create a function, and the series cannot be calculated.
@@ -678,18 +696,27 @@ define('Graph', ['logme'], function (logme) {
                 }
 
                 if (typeof label === 'string') {
-                    matches = label.match(/%%_[^%]*%%/g);
 
-                    if (
-                        ($.isArray(matches) === true) &&
-                        (matches.length > 0)
-                    ) {
-                        newFunctionObject['specialLabel'] = true;
-                    } else {
-                        newFunctionObject['specialLabel'] = false;
+                    newFunctionObject.specialLabel = false;
+                    newFunctionObject.pldeHash = [];
+
+                    // Let's check the label against all of the plde objects.
+                    // plde is an abbreviation for Plot Label Dynamic Elements.
+                    for (c1 = 0; c1 < state.plde.length; c1 += 1) {
+                        rgxp = new RegExp(state.plde[c1].elId, 'g');
+
+                        // If we find a dynamic element in the label, we will
+                        // hash the current plde object, and indicate that this
+                        // is a special label.
+                        if (rgxp.test(label) === true) {
+                            newFunctionObject.specialLabel = true;
+                            newFunctionObject.pldeHash.push(state.plde[c1]);
+                        }
                     }
 
-                    newFunctionObject['label'] = label;
+                    newFunctionObject.label = label;
+                } else {
+                    newFunctionObject.label = false;
                 }
 
                 functions.push(newFunctionObject);
@@ -706,7 +733,7 @@ define('Graph', ['logme'], function (logme) {
 
         function generateData() {
             var c0, c1, functionObj, seriesObj, dataPoints, paramValues, x, y,
-                start, end, step, tempX, matches;
+                start, end, step, tempX;
 
             paramValues = state.getAllParameterValues();
 
@@ -818,33 +845,27 @@ define('Graph', ['logme'], function (logme) {
                 }
 
                 // See if a user defined a label for this function.
-                if (functionObj.hasOwnProperty('label') === true) {
+                if (functionObj.label !== false) {
                     if (functionObj.specialLabel === true) {
-                        matches = functionObj.label.match(/%%_[^%]*%%/g);
+                        (function (c1) {
+                            var tempLabel;
 
-                        if ($.isArray(matches) === true) {
-                            (function (c1) {
-                                var el_id, func, tempLabel;
+                            tempLabel = functionObj.label;
 
-                                tempLabel = functionObj.label;
+                            while (c1 < functionObj.pldeHash.length) {
+                                tempLabel = tempLabel.replace(
+                                    functionObj.pldeHash[c1].elId,
+                                    functionObj.pldeHash[c1].func.apply(
+                                        window,
+                                        state.getAllParameterValues()
+                                    )
+                                );
 
-                                while (c1 < matches.length) {
-                                    el_id = matches[c1].replace(/%/g, '');
-                                    func = state.getFuncForSpecialLabel(el_id);
+                                c1 += 1;
+                            }
 
-                                    if (func !== null) {
-                                        tempLabel = tempLabel.replace(
-                                            matches[c1],
-                                            func.apply(window, state.getAllParameterValues())
-                                        );
-                                    }
-
-                                    c1 += 1;
-                                }
-
-                                seriesObj.label = tempLabel;
-                            }(0));
-                        }
+                            seriesObj.label = tempLabel;
+                        }(0));
                     } else {
                         seriesObj.label = functionObj.label;
                     }
@@ -880,13 +901,22 @@ define('Graph', ['logme'], function (logme) {
             }
 
             for (c0 = 0; c0 < asymptotes.length; c0 += 1) {
-                if (typeof asymptotes[c0].label === 'string') {
+
+                // If the user defined a label for this asympote, then the
+                // property 'label' will be a string (in the other case it is
+                // a boolean value 'false'). We will create an empty data set,
+                // and add to it a label. This solution is a bit _wrong_ , but
+                // it will have to do for now. Flot JS does not provide a way
+                // to add labels to markings, and we use markings to generate
+                // asymptotes.
+                if (asymptotes[c0].label !== false) {
                     dataSeries.push({
                         'data': [],
                         'label': asymptotes[c0].label,
                         'color': asymptotes[c0].color
                     });
                 }
+
             }
 
             return true;
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
index 71f946e312..34b54b4216 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
@@ -8,8 +8,8 @@ define(
     // Even though it is not explicitly in this module, we have to specify
     // 'GeneralMethods' as a dependency. It expands some of the core JS objects
     // with additional useful methods that are used in other modules.
-    ['State', 'GeneralMethods', 'Sliders', 'Inputs', 'Graph', 'ElOutput', 'logme'],
-    function (State, GeneralMethods, Sliders, Inputs, Graph, ElOutput, logme) {
+    ['State', 'GeneralMethods', 'Sliders', 'Inputs', 'Graph', 'ElOutput', 'GLabelElOutput', 'logme'],
+    function (State, GeneralMethods, Sliders, Inputs, Graph, ElOutput, GLabelElOutput, logme) {
 
     return GstMain;
 
@@ -67,6 +67,10 @@ define(
         // Configure functions that output to an element instead of the graph.
         ElOutput(config, state);
 
+        // Configure functions that output to an element instead of the graph
+        // label.
+        GLabelElOutput(config, state);
+
         // Configure and display the graph. Attach event for the graph to be
         // updated on any change of a slider or a text input.
         Graph(gstId, config, state);
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
index 3aea34ceb5..c1cfcd1b04 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
@@ -98,7 +98,10 @@ define('State', ['logme'], function (logme) {
             'bindUpdatePlotEvent': bindUpdatePlotEvent,
             'addDynamicEl': addDynamicEl,
 
-            'getFuncForSpecialLabel': getFuncForSpecialLabel
+            'getFuncForSpecialLabel': getFuncForSpecialLabel,
+
+            // plde is an abbreviation for Plot Label Dynamic Elements.
+            plde: []
         };
 
         function getAllParameterNames() {

From 1753f983ae7a767ddb86448a713a732cc98fc067 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Thu, 10 Jan 2013 11:46:22 +0200
Subject: [PATCH 317/541] Added ability to insert automatic "return" for
 dynamic element functions, and graph label dynamic element functions.

---
 .../js/src/graphical_slider_tool/el_output.js | 24 ++++++++++++++++++-
 .../g_label_el_output.js                      | 24 ++++++++++++++++++-
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
index 146d8a9f7f..8bad5e06b4 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
@@ -25,7 +25,7 @@ define('ElOutput', ['logme'], function (logme) {
         return;
 
         function processFuncObj(obj) {
-            var paramNames, funcString, func, special, el;
+            var paramNames, funcString, func, special, el, disableAutoReturn;
 
             // We are only interested in functions that are meant for output to an
             // element.
@@ -48,8 +48,30 @@ define('ElOutput', ['logme'], function (logme) {
                 return;
             }
 
+            disableAutoReturn = obj['@disable_auto_return'];
+
             funcString = obj['#text'];
 
+            if (
+                (disableAutoReturn === undefined) ||
+                    (
+                        (typeof disableAutoReturn === 'string') &&
+                        (disableAutoReturn.toLowerCase() !== 'true')
+                    )
+            ) {
+                if (funcString.search(/return/i) === -1) {
+                    funcString = 'return ' + funcString;
+                }
+            } else {
+                if (funcString.search(/return/i) === -1) {
+                    logme(
+                        'ERROR: You have specified a JavaScript ' +
+                        'function without a "return" statemnt. Your ' +
+                        'function will return "undefined" by default.'
+                    );
+                }
+            }
+
             // Make sure that all HTML entities are converted to their proper
             // ASCII text equivalents.
             funcString = $('<div>').html(funcString).text();
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/g_label_el_output.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/g_label_el_output.js
index feac031aee..13c9dd3389 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/g_label_el_output.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/g_label_el_output.js
@@ -23,7 +23,7 @@ define('GLabelElOutput', ['logme'], function (logme) {
         return;
 
         function processFuncObj(obj) {
-            var paramNames, funcString, func;
+            var paramNames, funcString, func, disableAutoReturn;
 
             // We are only interested in functions that are meant for output to an
             // element.
@@ -46,8 +46,30 @@ define('GLabelElOutput', ['logme'], function (logme) {
                 return;
             }
 
+            disableAutoReturn = obj['@disable_auto_return'];
+
             funcString = obj['#text'];
 
+            if (
+                (disableAutoReturn === undefined) ||
+                    (
+                        (typeof disableAutoReturn === 'string') &&
+                        (disableAutoReturn.toLowerCase() !== 'true')
+                    )
+            ) {
+                if (funcString.search(/return/i) === -1) {
+                    funcString = 'return ' + funcString;
+                }
+            } else {
+                if (funcString.search(/return/i) === -1) {
+                    logme(
+                        'ERROR: You have specified a JavaScript ' +
+                        'function without a "return" statemnt. Your ' +
+                        'function will return "undefined" by default.'
+                    );
+                }
+            }
+
             // Make sure that all HTML entities are converted to their proper
             // ASCII text equivalents.
             funcString = $('<div>').html(funcString).text();

From bd605150adab096de949bb095522fc03d3ad2d69 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Thu, 10 Jan 2013 14:58:24 +0200
Subject: [PATCH 318/541] New feature: Dynamically moving labels added. "Sample
 size and power" demo updated.

---
 .../js/src/graphical_slider_tool/graph.js     | 141 +++++++++++++++++-
 1 file changed, 136 insertions(+), 5 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 50d8d7bcd4..79148d144e 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -8,9 +8,7 @@ define('Graph', ['logme'], function (logme) {
 
     function Graph(gstId, config, state) {
         var plotDiv, dataSeries, functions, xaxis, yaxis, numPoints, xrange,
-            asymptotes, plotObj;
-
-        plotObj = null;
+            asymptotes, movingLabels;
 
         state.barsConfig = {
             'N': 0,
@@ -49,6 +47,8 @@ define('Graph', ['logme'], function (logme) {
             plotDiv.height(plotDiv.width());
         }
 
+        plotDiv.css('position', 'relative');
+
         // Configure some settings for the graph.
         if (setGraphXRange() === false) {
             logme('ERROR: Could not configure the xrange. Will not continue.');
@@ -73,6 +73,7 @@ define('Graph', ['logme'], function (logme) {
         }
 
         createMarkingsFunctions();
+        createMovingLabelFunctions();
 
         // Create the initial graph and plot it for the user to see.
         if (generateData() === true) {
@@ -85,6 +86,105 @@ define('Graph', ['logme'], function (logme) {
 
         return;
 
+        function createMovingLabelFunctions() {
+            var c1;
+
+            movingLabels = [];
+
+            if (config.plot.hasOwnProperty('moving_label') !== true) {
+                return ;
+            }
+
+            if ($.isPlainObject(config.plot.moving_label) === true) {
+                processMovingLabel(config.plot.moving_label);
+            } else if ($.isArray(config.plot.moving_label) === true) {
+                for (c1 = 0; c1 < config.plot.moving_label.length; c1++) {
+                    processMovingLabel(config.plot.moving_label[c1]);
+                }
+            }
+        }
+
+        function processMovingLabel(obj) {
+            var labelText, funcString, disableAutoReturn, paramNames, func;
+
+            if (obj.hasOwnProperty('@text') === false) {
+                logme('ERROR: You did not define a "text" attribute for the moving_label.');
+
+                return;
+            }
+            if (typeof obj['@text'] !== 'string') {
+                logme('ERROR: "text" attribute is not a string.');
+
+                return;
+            }
+            labelText = obj['@text'];
+
+            if (obj.hasOwnProperty('#text') === false) {
+                logme('ERROR: moving_label is missing function declaration.');
+
+                return;
+            }
+            if (typeof obj['#text'] !== 'string') {
+                logme('ERROR: Function declaration is not a string.');
+
+                return;
+            }
+            funcString = obj['#text'];
+
+            disableAutoReturn = obj['@disable_auto_return'];
+
+            funcString = $('<div>').html(funcString).text();
+
+            if (
+                (disableAutoReturn === undefined) ||
+                    (
+                        (typeof disableAutoReturn === 'string') &&
+                            (disableAutoReturn.toLowerCase() !== 'true')
+                    )
+            ) {
+                if (funcString.search(/return/i) === -1) {
+                    funcString = 'return ' + funcString;
+                }
+            } else {
+                if (funcString.search(/return/i) === -1) {
+                    logme(
+                        'ERROR: You have specified a JavaScript ' +
+                        'function without a "return" statemnt. Your ' +
+                        'function will return "undefined" by default.'
+                    );
+                }
+            }
+
+            paramNames = state.getAllParameterNames();
+            paramNames.push(funcString);
+
+            try {
+                func = Function.apply(null, paramNames);
+            } catch (err) {
+                logme(
+                    'ERROR: The function body "' +
+                        funcString +
+                        '" was not converted by the Function constructor.'
+                );
+                logme('Error message: "' + err.message + '"');
+
+                $('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not create a function from the string "' + funcString + '".' + '</div>');
+                $('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
+
+                paramNames.pop();
+
+                return;
+            }
+
+            paramNames.pop();
+
+            movingLabels.push({
+                'labelText': labelText,
+                'func': func,
+                'el': null
+            });
+        }
+
         function createMarkingsFunctions() {
             var c1, paramNames;
 
@@ -923,12 +1023,12 @@ define('Graph', ['logme'], function (logme) {
         } // End-of: function generateData
 
         function updatePlot() {
-            var paramValues;
+            var paramValues, plotObj;
 
             paramValues = state.getAllParameterValues();
 
             // Tell Flot to draw the graph to our specification.
-            $.plot(
+            plotObj = $.plot(
                 plotDiv,
                 dataSeries,
                 {
@@ -954,6 +1054,8 @@ define('Graph', ['logme'], function (logme) {
                 }
             );
 
+            updateMovingLabels();
+
             // The first time that the graph gets added to the page, the legend
             // is created from scratch. When it appears, MathJax works some
             // magic, and all of the specially marked TeX gets rendered nicely.
@@ -969,6 +1071,35 @@ define('Graph', ['logme'], function (logme) {
 
             return;
 
+            function updateMovingLabels() {
+                var c1, labelCoord, pointOffset;
+
+                for (c1 = 0; c1 < movingLabels.length; c1 += 1) {
+                    if (movingLabels[c1].el === null) {
+                        movingLabels[c1].el = $(
+                            '<div>' +
+                                movingLabels[c1].labelText +
+                            '</div>'
+                        );
+                        movingLabels[c1].el.css('position', 'absolute');
+                        movingLabels[c1].el.appendTo(plotDiv);
+
+                        movingLabels[c1].elWidth = movingLabels[c1].el.width();
+                        movingLabels[c1].elHeight = movingLabels[c1].el.height();
+                    } else {
+                        movingLabels[c1].el.detach();
+                        movingLabels[c1].el.appendTo(plotDiv);
+                    }
+
+                    labelCoord = movingLabels[c1].func.apply(window, paramValues);
+
+                    pointOffset = plotObj.pointOffset({'x': labelCoord.x, 'y': labelCoord.y});
+
+                    movingLabels[c1].el.css('left', pointOffset.left - 0.5 * movingLabels[c1].elWidth);
+                    movingLabels[c1].el.css('top', pointOffset.top - 0.5 * movingLabels[c1].elHeight);
+                }
+            }
+
             // Generate markings to represent asymptotes defined by the user.
             // See the following function for more details:
             //

From ad4f4144e8a9df2d847f903e7d45132e7c1e2c8e Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Thu, 10 Jan 2013 15:49:05 +0200
Subject: [PATCH 319/541] New feature: Added ability to set "color" and
 "weight" property of moving label text.

---
 .../js/src/graphical_slider_tool/graph.js     | 32 +++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 79148d144e..656ff82690 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -105,7 +105,8 @@ define('Graph', ['logme'], function (logme) {
         }
 
         function processMovingLabel(obj) {
-            var labelText, funcString, disableAutoReturn, paramNames, func;
+            var labelText, funcString, disableAutoReturn, paramNames, func,
+                fontWeight, fontColor;
 
             if (obj.hasOwnProperty('@text') === false) {
                 logme('ERROR: You did not define a "text" attribute for the moving_label.');
@@ -131,6 +132,29 @@ define('Graph', ['logme'], function (logme) {
             }
             funcString = obj['#text'];
 
+            fontColor = 'black';
+            if (
+                (obj.hasOwnProperty('@color') === true) &&
+                (typeof obj['@color'] === 'string')
+            ) {
+                fontColor = obj['@color'];
+            }
+
+            fontWeight = 'normal';
+            if (
+                (obj.hasOwnProperty('@weight') === true) &&
+                (typeof obj['@weight'] === 'string')
+            ) {
+                if (
+                    (obj['@weight'].toLowerCase() === 'normal') ||
+                    (obj['@weight'].toLowerCase() === 'bold')
+                ) {
+                    fontWeight = obj['@weight'];
+                } else {
+                    logme('ERROR: Moving label can have a weight property of "normal" or "bold".');
+                }
+            }
+
             disableAutoReturn = obj['@disable_auto_return'];
 
             funcString = $('<div>').html(funcString).text();
@@ -181,7 +205,9 @@ define('Graph', ['logme'], function (logme) {
             movingLabels.push({
                 'labelText': labelText,
                 'func': func,
-                'el': null
+                'el': null,
+                'fontColor': fontColor,
+                'fontWeight': fontWeight
             });
         }
 
@@ -1082,6 +1108,8 @@ define('Graph', ['logme'], function (logme) {
                             '</div>'
                         );
                         movingLabels[c1].el.css('position', 'absolute');
+                        movingLabels[c1].el.css('color', movingLabels[c1].fontColor);
+                        movingLabels[c1].el.css('font-weight', movingLabels[c1].fontWeight);
                         movingLabels[c1].el.appendTo(plotDiv);
 
                         movingLabels[c1].elWidth = movingLabels[c1].el.width();

From efa375114ef04a07a4664f1e030cd1df60df3379 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Thu, 10 Jan 2013 16:52:30 +0200
Subject: [PATCH 320/541] Enabled automatic addition of "return" statement for
 asymptotes, xrange.min, and xrange.max.

---
 .../js/src/graphical_slider_tool/graph.js     | 261 ++++++++++++++----
 1 file changed, 209 insertions(+), 52 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 656ff82690..dc196bfb34 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -72,8 +72,12 @@ define('Graph', ['logme'], function (logme) {
             return;
         }
 
-        createMarkingsFunctions();
-        createMovingLabelFunctions();
+        if (createMarkingsFunctions() === false) {
+            return;
+        }
+        if (createMovingLabelFunctions() === false) {
+            return;
+        }
 
         // Create the initial graph and plot it for the user to see.
         if (generateData() === true) {
@@ -87,21 +91,26 @@ define('Graph', ['logme'], function (logme) {
         return;
 
         function createMovingLabelFunctions() {
-            var c1;
+            var c1, returnStatus;
 
+            returnStatus = true;
             movingLabels = [];
 
             if (config.plot.hasOwnProperty('moving_label') !== true) {
-                return ;
-            }
-
-            if ($.isPlainObject(config.plot.moving_label) === true) {
-                processMovingLabel(config.plot.moving_label);
+                returnStatus = true;
+            } else if ($.isPlainObject(config.plot.moving_label) === true) {
+                if (processMovingLabel(config.plot.moving_label) === false) {
+                    returnStatus = false;
+                }
             } else if ($.isArray(config.plot.moving_label) === true) {
                 for (c1 = 0; c1 < config.plot.moving_label.length; c1++) {
-                    processMovingLabel(config.plot.moving_label[c1]);
+                    if (processMovingLabel(config.plot.moving_label[c1]) === false) {
+                        returnStatus = false;
+                    }
                 }
             }
+
+            return returnStatus;
         }
 
         function processMovingLabel(obj) {
@@ -111,24 +120,24 @@ define('Graph', ['logme'], function (logme) {
             if (obj.hasOwnProperty('@text') === false) {
                 logme('ERROR: You did not define a "text" attribute for the moving_label.');
 
-                return;
+                return false;
             }
             if (typeof obj['@text'] !== 'string') {
                 logme('ERROR: "text" attribute is not a string.');
 
-                return;
+                return false;
             }
             labelText = obj['@text'];
 
             if (obj.hasOwnProperty('#text') === false) {
                 logme('ERROR: moving_label is missing function declaration.');
 
-                return;
+                return false;
             }
             if (typeof obj['#text'] !== 'string') {
                 logme('ERROR: Function declaration is not a string.');
 
-                return;
+                return false;
             }
             funcString = obj['#text'];
 
@@ -197,7 +206,7 @@ define('Graph', ['logme'], function (logme) {
 
                 paramNames.pop();
 
-                return;
+                return false;
             }
 
             paramNames.pop();
@@ -209,23 +218,31 @@ define('Graph', ['logme'], function (logme) {
                 'fontColor': fontColor,
                 'fontWeight': fontWeight
             });
+
+            return true;
         }
 
         function createMarkingsFunctions() {
-            var c1, paramNames;
+            var c1, paramNames, returnStatus;
+
+            returnStatus = true;
 
             asymptotes = [];
             paramNames = state.getAllParameterNames();
 
             if ($.isPlainObject(config.plot.asymptote)) {
-                processAsymptote(config.plot.asymptote);
+                if (processAsymptote(config.plot.asymptote) === false) {
+                    returnStatus = false;
+                }
             } else if ($.isArray(config.plot.asymptote)) {
                 for (c1 = 0; c1 < config.plot.asymptote.length; c1 += 1) {
-                    processAsymptote(config.plot.asymptote[c1]);
+                    if (processAsymptote(config.plot.asymptote[c1]) === false) {
+                        returnStatus = false;
+                    }
                 }
             }
 
-            return;
+            return returnStatus;
 
             // Read configuration options for asymptotes, and store them as
             // an array of objects. Each object will have 3 properties:
@@ -259,12 +276,12 @@ define('Graph', ['logme'], function (logme) {
                     } else {
                         logme('ERROR: Attribute "type" for asymptote can be "x" or "y".');
 
-                        return;
+                        return false;
                     }
                 } else {
                     logme('ERROR: Attribute "type" for asymptote is not specified.');
 
-                    return;
+                    return false;
                 }
 
                 if (typeof asyObj['#text'] === 'string') {
@@ -272,7 +289,7 @@ define('Graph', ['logme'], function (logme) {
                 } else {
                     logme('ERROR: Function body for asymptote is not specified.');
 
-                    return;
+                    return false;
                 }
 
                 newAsyObj.color = '#000';
@@ -288,6 +305,29 @@ define('Graph', ['logme'], function (logme) {
                     newAsyObj.label = asyObj['@label'];
                 }
 
+                funcString = $('<div>').html(funcString).text();
+
+                disableAutoReturn = asyObj['@disable_auto_return'];
+                if (
+                    (disableAutoReturn === undefined) ||
+                    (
+                        (typeof disableAutoReturn === 'string') &&
+                        (disableAutoReturn.toLowerCase() !== 'true')
+                    )
+                ) {
+                    if (funcString.search(/return/i) === -1) {
+                        funcString = 'return ' + funcString;
+                    }
+                } else {
+                    if (funcString.search(/return/i) === -1) {
+                        logme(
+                            'ERROR: You have specified a JavaScript ' +
+                            'function without a "return" statemnt. Your ' +
+                            'function will return "undefined" by default.'
+                        );
+                    }
+                }
+
                 paramNames.push(funcString);
 
                 try {
@@ -296,13 +336,15 @@ define('Graph', ['logme'], function (logme) {
                     logme('ERROR: Asymptote function body could not be converted to function object.');
                     logme('Error message: "".' + err.message);
 
-                    return;
+                    return false;
                 }
 
                 paramNames.pop();
 
                 newAsyObj.func = func;
                 asymptotes.push(newAsyObj);
+
+                return true;
             }
         }
 
@@ -480,75 +522,187 @@ define('Graph', ['logme'], function (logme) {
         }
 
         function setGraphXRange() {
-            var xRangeStr, xRangeBlobs, tempNum, allParamNames;
+            var xRangeStr, xRangeBlobs, tempNum, allParamNames, funcString,
+                disableAutoReturn;
 
             xrange = {};
 
             if ($.isPlainObject(config.plot.xrange) === false) {
-                logme('ERROR: Expected config.plot.xrange to be an object. It is not.');
+                logme(
+                    'ERROR: Expected config.plot.xrange to be an object. ' +
+                    'It is not.'
+                );
                 logme('config.plot.xrange = ', config.plot.xrange);
 
                 return false;
             }
 
-            if (typeof config.plot.xrange.min !== 'string') {
-                logme('ERROR: Expected config.plot.xrange.min to be a string. It is not.');
-                logme('config.plot.xrange.min = ', config.plot.xrange.min);
+            if (config.plot.xrange.hasOwnProperty('min') === false) {
+                logme(
+                    'ERROR: Expected config.plot.xrange.min to be ' +
+                    'present. It is not.'
+                );
 
                 return false;
             }
 
-            if (typeof config.plot.xrange.max !== 'string') {
-                logme('ERROR: Expected config.plot.xrange.max to be a string. It is not.');
-                logme('config.plot.xrange.max = ', config.plot.xrange.max);
+            disableAutoReturn = false;
+            if (typeof config.plot.xrange.min === 'string') {
+                funcString = config.plot.xrange.min;
+            } else if (
+                ($.isPlainObject(config.plot.xrange.min) === true) &&
+                (config.plot.xrange.min.hasOwnProperty('#text') === true) &&
+                (typeof config.plot.xrange.min['#text'] === 'string')
+            ) {
+                funcString = config.plot.xrange.min['#text'];
+
+                disableAutoReturn =
+                    config.plot.xrange.min['@disable_auto_return'];
+                if (
+                    (disableAutoReturn === undefined) ||
+                    (
+                        (typeof disableAutoReturn === 'string') &&
+                        (disableAutoReturn.toLowerCase() !== 'true')
+                    )
+                ) {
+                    disableAutoReturn = false;
+                } else {
+                    disableAutoReturn = true;
+                }
+            } else {
+                logme(
+                    'ERROR: Could not get a function definition for ' +
+                    'xrange.min property.'
+                );
 
                 return false;
             }
 
+            funcString = $('<div>').html(funcString).text();
+
+            if (disableAutoReturn === false) {
+                if (funcString.search(/return/i) === -1) {
+                    funcString = 'return ' + funcString;
+                }
+            } else {
+                if (funcString.search(/return/i) === -1) {
+                    logme(
+                        'ERROR: You have specified a JavaScript ' +
+                        'function without a "return" statemnt. Your ' +
+                        'function will return "undefined" by default.'
+                    );
+                }
+            }
+
             allParamNames = state.getAllParameterNames();
 
-            allParamNames.push(config.plot.xrange.min);
+            allParamNames.push(funcString);
             try {
                 xrange.min = Function.apply(null, allParamNames);
             } catch (err) {
-                logme('ERROR: could not create a function from the string "' + config.plot.xrange.min + '" for xrange.min.');
+                logme(
+                    'ERROR: could not create a function from the string "' +
+                    funcString + '" for xrange.min.'
+                );
                 logme('Error message: "' + err.message + '"');
 
-                $('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not create a function from the string "' + config.plot.xrange.min + '" for xrange.min.' + '</div>');
-                $('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
+                $('#' + gstId).html(
+                    '<div style="color: red;">' + 'ERROR IN ' +
+                    'XML: Could not create a function from the string "' +
+                    funcString + '" for xrange.min.' + '</div>'
+                );
+                $('#' + gstId).append(
+                    '<div style="color: red;">' + 'Error ' +
+                    'message: "' + err.message + '".' + '</div>'
+                );
 
                 return false;
             }
             allParamNames.pop();
 
-            allParamNames.push(config.plot.xrange.max);
+            if (config.plot.xrange.hasOwnProperty('max') === false) {
+                logme(
+                    'ERROR: Expected config.plot.xrange.max to be ' +
+                    'present. It is not.'
+                );
+
+                return false;
+            }
+
+            disableAutoReturn = false;
+            if (typeof config.plot.xrange.max === 'string') {
+                funcString = config.plot.xrange.max;
+            } else if (
+                ($.isPlainObject(config.plot.xrange.max) === true) &&
+                (config.plot.xrange.max.hasOwnProperty('#text') === true) &&
+                (typeof config.plot.xrange.max['#text'] === 'string')
+            ) {
+                funcString = config.plot.xrange.max['#text'];
+
+                disableAutoReturn =
+                    config.plot.xrange.max['@disable_auto_return'];
+                if (
+                    (disableAutoReturn === undefined) ||
+                    (
+                        (typeof disableAutoReturn === 'string') &&
+                        (disableAutoReturn.toLowerCase() !== 'true')
+                    )
+                ) {
+                    disableAutoReturn = false;
+                } else {
+                    disableAutoReturn = true;
+                }
+            } else {
+                logme(
+                    'ERROR: Could not get a function definition for ' +
+                    'xrange.max property.'
+                );
+
+                return false;
+            }
+
+            funcString = $('<div>').html(funcString).text();
+
+            if (disableAutoReturn === false) {
+                if (funcString.search(/return/i) === -1) {
+                    funcString = 'return ' + funcString;
+                }
+            } else {
+                if (funcString.search(/return/i) === -1) {
+                    logme(
+                        'ERROR: You have specified a JavaScript ' +
+                        'function without a "return" statemnt. Your ' +
+                        'function will return "undefined" by default.'
+                    );
+                }
+            }
+
+            allParamNames.push(funcString);
             try {
                 xrange.max = Function.apply(null, allParamNames);
             } catch (err) {
-                logme('ERROR: could not create a function from the string "' + config.plot.xrange.max + '" for xrange.max.');
+                logme(
+                    'ERROR: could not create a function from the string "' +
+                    funcString + '" for xrange.max.'
+                );
                 logme('Error message: "' + err.message + '"');
 
-                $('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not create a function from the string "' + config.plot.xrange.max + '" for xrange.max.' + '</div>');
-                $('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
+                $('#' + gstId).html(
+                    '<div style="color: red;">' + 'ERROR IN ' +
+                    'XML: Could not create a function from the string "' +
+                    funcString + '" for xrange.max.' + '</div>'
+                );
+                $('#' + gstId).append(
+                    '<div style="color: red;">' + 'Error message: "' +
+                    err.message + '".' + '</div>'
+                );
 
                 return false;
             }
             allParamNames.pop();
 
-            if (typeof config.plot.num_points !== 'string') {
-                // logme('ERROR: config.plot.num_points is not a string.');
-                // logme('config.plot.num_points = ', config.plot.num_points);
-
-                tempNum = plotDiv.width() / 5.0;
-            }
-
             tempNum = parseInt(config.plot.num_points, 10);
             if (isFinite(tempNum) === false) {
-                // logme('ERROR: Expected config.plot.num_points to be a a valid integer. It is not.');
-                // logme('config.plot.num_points = ', config.plot.num_points);
-
-                // return false;
-
                 tempNum = plotDiv.width() / 5.0;
             }
 
@@ -556,7 +710,10 @@ define('Graph', ['logme'], function (logme) {
                 (tempNum < 2) &&
                 (tempNum > 1000)
             ) {
-                logme('ERROR: Number of points is outside the allowed range [2, 1000]');
+                logme(
+                    'ERROR: Number of points is outside the allowed range ' +
+                    '[2, 1000]'
+                );
                 logme('config.plot.num_points = ' + tempNum);
 
                 return false;
@@ -954,7 +1111,7 @@ define('Graph', ['logme'], function (logme) {
                         logme('Error message: "' + err.message + '".');
 
                         $('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not generate data from function.' + '</div>');
-                        $('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');g
+                        $('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
 
                         return false;
                     }

From f17e2466b1c4176d77ed19fa07f11a210fb26b08 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Fri, 11 Jan 2013 10:32:21 +0200
Subject: [PATCH 321/541] New feature: Now can specify x-axis and y-axisnames
 for ticks. Updated "Fick s Second Law" demo to demonstrate this.

---
 .../js/src/graphical_slider_tool/graph.js     | 102 ++++++++++++++++--
 1 file changed, 95 insertions(+), 7 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index dc196bfb34..bcc491548a 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -8,7 +8,7 @@ define('Graph', ['logme'], function (logme) {
 
     function Graph(gstId, config, state) {
         var plotDiv, dataSeries, functions, xaxis, yaxis, numPoints, xrange,
-            asymptotes, movingLabels;
+            asymptotes, movingLabels, xTicksNames, yTicksNames;
 
         state.barsConfig = {
             'N': 0,
@@ -349,7 +349,10 @@ define('Graph', ['logme'], function (logme) {
         }
 
         function setGraphAxes() {
-            xaxis = {};
+            xaxis = {
+                'tickFormatter': null
+            };
+
             if (typeof config.plot['xticks'] === 'string') {
                 if (processTicks(config.plot['xticks'], xaxis, 'xunits') === false) {
                     logme('ERROR: Could not process the ticks for x-axis.');
@@ -362,7 +365,9 @@ define('Graph', ['logme'], function (logme) {
                 return false;
             }
 
-            yaxis = {};
+            yaxis = {
+                'tickFormatter': null
+            };
             if (typeof config.plot['yticks'] === 'string') {
                 if (processTicks(config.plot['yticks'], yaxis, 'yunits') === false) {
                     logme('ERROR: Could not process the ticks for y-axis.');
@@ -375,8 +380,69 @@ define('Graph', ['logme'], function (logme) {
                 return false;
             }
 
+            xTicksNames = null;
+            yTicksNames = null;
+
+            if (checkForTicksNames('x') === false) {
+                return false;
+            }
+
+            if (checkForTicksNames('y') === false) {
+                return false;
+            }
+
             return true;
 
+            //
+            // function checkForTicksNames(axisName)
+            //
+            // The parameter "axisName" can be either "x" or "y" (string). Depending on it, the function
+            // will set "xTicksNames" or "yTicksNames" private variable.
+            //
+            // This function does not return anything. It sets the private variable "xTicksNames" ("yTicksNames")
+            // to the object converted by JSON.parse from the XML parameter "plot.xticks_names" ("plot.yticks_names").
+            // If the "plot.xticks_names" ("plot.yticks_names") is missing or it is not a valid JSON string, then
+            // "xTicksNames" ("yTicksNames") will be set to "null".
+            //
+            // Depending on the "xTicksNames" ("yTicksNames") being "null" or an object, the plot will either draw
+            // number ticks, or use the names specified by the opbject.
+            //
+            function checkForTicksNames(axisName) {
+                var tmpObj;
+
+                if ((axisName !== 'x') && (axisName !== 'y')) {
+                    // This is not an error. This funcion should simply stop executing.
+
+                    return true;
+                }
+
+                if (
+                    (config.plot.hasOwnProperty(axisName + 'ticks_names') === true) ||
+                    (typeof config.plot[axisName + 'ticks_names'] === 'string')
+                ) {
+                    try {
+                        tmpObj = JSON.parse(config.plot[axisName + 'ticks_names']);
+                    } catch (err) {
+                        logme(
+                            'ERROR: plot.' + axisName + 'ticks_names is not a valid JSON string.',
+                            'Error message: "' + err.message + '".'
+                        );
+
+                        return false;
+                    }
+
+                    if (axisName === 'x') {
+                        xTicksNames = tmpObj;
+                        xaxis.tickFormatter = xAxisTickFormatter;
+                    }
+                    // At this point, we are certain that axisName = 'y'.
+                    else {
+                        yTicksNames = tmpObj;
+                        yaxis.tickFormatter = yAxisTickFormatter;
+                    }
+                }
+            }
+
             function processTicks(ticksStr, ticksObj, unitsType) {
                 var ticksBlobs, tempFloat, tempTicks, c1, c2;
 
@@ -453,10 +519,6 @@ define('Graph', ['logme'], function (logme) {
                     ticksObj.ticks = tempTicks;
                 }
 
-                // ticksObj.font = {
-                //     'size': '16px'
-                // };
-
                 return true;
 
                 function roundToPrec(num, prec) {
@@ -1210,6 +1272,14 @@ define('Graph', ['logme'], function (logme) {
 
             paramValues = state.getAllParameterValues();
 
+            if (xaxis.tickFormatter !== null) {
+                xaxis.ticks = null;
+            }
+
+            if (yaxis.tickFormatter !== null) {
+                yaxis.ticks = null;
+            }
+
             // Tell Flot to draw the graph to our specification.
             plotObj = $.plot(
                 plotDiv,
@@ -1332,7 +1402,25 @@ define('Graph', ['logme'], function (logme) {
                 return markings;
             }
         }
+
+        function xAxisTickFormatter(val, axis) {
+            if (xTicksNames.hasOwnProperty(val.toFixed(axis.tickDecimals)) === true) {
+                return xTicksNames[val.toFixed(axis.tickDecimals)];
+            }
+
+            return '';
+        }
+
+        function yAxisTickFormatter(val, axis) {
+            if (yTicksNames.hasOwnProperty(val.toFixed(axis.tickDecimals)) === true) {
+                return yTicksNames[val.toFixed(axis.tickDecimals)];
+            }
+
+            return '';
+        }
     }
+
+
 });
 
 // End of wrapper for RequireJS. As you can see, we are passing

From 782fb3b465a9265d977f5712a4f62f37e64c9a36 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Fri, 11 Jan 2013 11:02:58 +0200
Subject: [PATCH 322/541] New feature: Can specify "change" or "slide" event
 type of sliders.

---
 .../xmodule/js/src/graphical_slider_tool/sliders.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
index 7c9b5f1c38..8005c97180 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
@@ -6,7 +6,7 @@ define('Sliders', ['logme'], function (logme) {
     return Sliders;
 
     function Sliders(gstId, state) {
-        var c1, paramName, allParamNames, sliderDiv;
+        var c1, paramName, allParamNames, sliderDiv, onEvent;
 
         allParamNames = state.getAllParameterNames();
 
@@ -16,7 +16,11 @@ define('Sliders', ['logme'], function (logme) {
             sliderDiv = $('#' + gstId + '_slider_' + paramName);
 
             if (sliderDiv.length === 1) {
-                createSlider(sliderDiv, paramName);
+                onEvent = 'slide';
+                if (sliderDiv.attr('data-on_event') === 'change') {
+                    onEvent = 'change';
+                }
+                createSlider(sliderDiv, paramName, onEvent);
             } else if (sliderDiv.length > 1) {
                 logme('ERROR: Found more than one slider for the parameter "' + paramName + '".');
                 logme('sliderDiv.length = ', sliderDiv.length);
@@ -25,7 +29,7 @@ define('Sliders', ['logme'], function (logme) {
             }
         }
 
-        function createSlider(sliderDiv, paramName) {
+        function createSlider(sliderDiv, paramName, onEvent) {
             var paramObj;
 
             paramObj = state.getParamObj(paramName);
@@ -46,8 +50,7 @@ define('Sliders', ['logme'], function (logme) {
                 'value': paramObj.value,
                 'step': paramObj.step,
 
-                // 'change': sliderOnChange,
-                'slide': sliderOnSlide
+                onEvent: sliderOnSlide
             });
 
             // Tell the parameter object stored in state that we have a slider

From a75003ef2feb15cd8843340f869f6bc24f820486 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 11 Jan 2013 11:23:25 +0200
Subject: [PATCH 323/541] added no_slide parameters

---
 common/lib/xmodule/xmodule/gst_module.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index c29e4e6a04..c4771f3bcb 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -102,15 +102,18 @@ class GraphicalSliderToolModule(XModule):
         #substitute sliders
         slider_div = '<div class="{element_class}_slider" \
                                    id="{element_id}_slider_{var}" \
-                                   data-var="{var}" style="{style}">\
+                                   data-var="{var}" \
+                                   data-on_event="{on_event}" \
+                                   style="{style}">\
                      </div>'
         slider_els = xml.xpath('//slider')
         for slider_el in slider_els:
             slider_el.getparent().replace(slider_el, html.fromstring(
                                 slider_div.format(element_class=self.html_class,
-                                            element_id=self.html_id,
-                                            var=slider_el.get('var', ""),
-                                            style=slider_el.get('style', ""))))
+                                    element_id=self.html_id,
+                                    var=slider_el.get('var', ""),
+                                    on_event=slider_el.get('on_event', 'slide'),
+                                    style=slider_el.get('style', ""))))
 
         # substitute inputs aka textboxes
         input_div = '<input class="{element_class}_input" \

From 271c182f4e44b53e375f7ec68319b964a6deba92 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Fri, 11 Jan 2013 11:47:20 +0200
Subject: [PATCH 324/541] Fixed bug: jQuery slider default change event name is
 "slidechange", and it behaves a bit differently than "slide" event.

---
 .../xmodule/js/src/graphical_slider_tool/sliders.js   | 11 ++++++-----
 .../xmodule/js/src/graphical_slider_tool/state.js     |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
index 8005c97180..a12f0099c6 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
@@ -18,8 +18,9 @@ define('Sliders', ['logme'], function (logme) {
             if (sliderDiv.length === 1) {
                 onEvent = 'slide';
                 if (sliderDiv.attr('data-on_event') === 'change') {
-                    onEvent = 'change';
+                    onEvent = 'slidechange';
                 }
+
                 createSlider(sliderDiv, paramName, onEvent);
             } else if (sliderDiv.length > 1) {
                 logme('ERROR: Found more than one slider for the parameter "' + paramName + '".');
@@ -48,9 +49,7 @@ define('Sliders', ['logme'], function (logme) {
                 'min': paramObj.min,
                 'max': paramObj.max,
                 'value': paramObj.value,
-                'step': paramObj.step,
-
-                onEvent: sliderOnSlide
+                'step': paramObj.step
             });
 
             // Tell the parameter object stored in state that we have a slider
@@ -58,6 +57,9 @@ define('Sliders', ['logme'], function (logme) {
             // will also update the value of this slider.
             paramObj.sliderDiv = sliderDiv;
 
+            // Atach a callback to update the slider's parameter.
+            paramObj.sliderDiv.on(onEvent, sliderOnSlide);
+
             return;
 
             // Update the 'state' - i.e. set the value of the parameter this
@@ -66,7 +68,6 @@ define('Sliders', ['logme'], function (logme) {
             // This will cause the plot to be redrawn each time after the user
             // drags the slider handle and releases it.
             function sliderOnSlide(event, ui) {
-
                 // Last parameter passed to setParameterValue() will be 'true'
                 // so that the function knows we are a slider, and it can
                 // change the our value back in the case when the new value is
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
index c1cfcd1b04..e5cd8634bc 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
@@ -241,7 +241,7 @@ define('State', ['logme'], function (logme) {
             }
 
             // Update the single slider with the new parameter's value.
-            if (parameters[paramName].sliderDiv !== null) {
+            if ((slider === false) && (parameters[paramName].sliderDiv !== null)) {
                 parameters[paramName].sliderDiv.slider('value', paramValueNum);
             }
 

From 052dc3fa228bf17511ad5f8dae6623acd58bb5d4 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Fri, 11 Jan 2013 14:39:50 +0200
Subject: [PATCH 325/541] New feature: For bar graphs, can specify bar width
 and bar alignment.

---
 .../js/src/graphical_slider_tool/graph.js     | 129 +++++++++++++-----
 1 file changed, 94 insertions(+), 35 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index bcc491548a..7099a910a4 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -8,18 +8,7 @@ define('Graph', ['logme'], function (logme) {
 
     function Graph(gstId, config, state) {
         var plotDiv, dataSeries, functions, xaxis, yaxis, numPoints, xrange,
-            asymptotes, movingLabels, xTicksNames, yTicksNames;
-
-        state.barsConfig = {
-            'N': 0,
-            'delta': 0,
-            'diff': 0,
-            'width': 0,
-            'width_perc': 0.8,
-            'margin': 0.1,
-            'total': 0.4,
-            'total_half': 0.2
-        };
+            asymptotes, movingLabels, xTicksNames, yTicksNames, graphBarWidth, graphBarAlign;
 
         // We need plot configuration settings. Without them we can't continue.
         if ($.isPlainObject(config.plot) === false) {
@@ -62,6 +51,15 @@ define('Graph', ['logme'], function (logme) {
             return;
         }
 
+        graphBarWidth = 1;
+        graphBarAlign = null;
+
+        getBarWidth();
+        getBarAlign();
+
+        logme('graphBarWidth = ' + graphBarWidth);
+        logme('graphBarAlign = ' + graphBarAlign);
+
         // Get the user defined functions. If there aren't any, don't do
         // anything else.
         createFunctions();
@@ -90,6 +88,52 @@ define('Graph', ['logme'], function (logme) {
 
         return;
 
+        function getBarWidth() {
+            if (config.plot.hasOwnProperty('bar_width') === false) {
+                return;
+            }
+
+            if (typeof config.plot.bar_width !== 'string') {
+                logme('ERROR: The parameter config.plot.bar_width must be a string.');
+
+                return;
+            }
+
+            if (isFinite(graphBarWidth = parseFloat(config.plot.bar_width)) === false) {
+                logme('ERROR: The parameter config.plot.bar_width is not a valid floating number.');
+                graphBarWidth = 1;
+
+                return;
+            }
+
+            return;
+        }
+
+        function getBarAlign() {
+            if (config.plot.hasOwnProperty('bar_align') === false) {
+                return;
+            }
+
+            if (typeof config.plot.bar_align !== 'string') {
+                logme('ERROR: The parameter config.plot.bar_align must be a string.');
+
+                return;
+            }
+
+            if (
+                (config.plot.bar_align.toLowerCase() !== 'left') &&
+                (config.plot.bar_align.toLowerCase() !== 'center')
+            ) {
+                logme('ERROR: Property config.plot.bar_align can be one of "left", or "center".');
+
+                return;
+            }
+
+            graphBarAlign = config.plot.bar_align.toLowerCase();
+
+            return;
+        }
+
         function createMovingLabelFunctions() {
             var c1, returnStatus;
 
@@ -1015,9 +1059,7 @@ define('Graph', ['logme'], function (logme) {
                 if (newFunctionObject['bars'] === true) {
                     newFunctionObject['line'] = false;
                     newFunctionObject['dot'] = false;
-
-                    newFunctionObject.barIndex = state.barsConfig.N;
-                    state.barsConfig.N += 1;
+                    // To do: See if need to do anything here.
                 } else if (
                     (newFunctionObject['dot'] === false) &&
                     (newFunctionObject['line'] === false)
@@ -1078,7 +1120,7 @@ define('Graph', ['logme'], function (logme) {
 
         function generateData() {
             var c0, c1, functionObj, seriesObj, dataPoints, paramValues, x, y,
-                start, end, step, tempX;
+                start, end, step, numNotUndefined;
 
             paramValues = state.getAllParameterValues();
 
@@ -1087,14 +1129,6 @@ define('Graph', ['logme'], function (logme) {
             for (c0 = 0; c0 < functions.length; c0 += 1) {
                 functionObj = functions[c0];
 
-                seriesObj = {};
-                dataPoints = [];
-
-                // For counting number of points added. In the end we will
-                // compare this number to 'numPoints' specified in the config
-                // JSON.
-                c1 = 0;
-
                 try {
                     start = xrange.min.apply(window, paramValues);
                 } catch (err) {
@@ -1117,10 +1151,16 @@ define('Graph', ['logme'], function (logme) {
 
                     return false;
                 }
-                step = (end - start) / (numPoints - 1);
 
-                state.barsConfig.delta = (step * state.barsConfig.total) / state.barsConfig.N;
-                state.barsConfig.diff = step * state.barsConfig.total_half;
+                seriesObj = {};
+                dataPoints = [];
+
+                // For counting number of points added. In the end we will
+                // compare this number to 'numPoints' specified in the config
+                // JSON.
+                c1 = 0;
+
+                step = (end - start) / (numPoints - 1);
 
                 // Generate the data points.
                 for (x = start; x <= end; x += step) {
@@ -1143,18 +1183,12 @@ define('Graph', ['logme'], function (logme) {
                         return false;
                     }
 
-                    if (functionObj.bars === true) {
-                        tempX = x - state.barsConfig.diff + (functionObj.barIndex + state.barsConfig.margin) * state.barsConfig.delta;
-                    } else {
-                        tempX = x;
-                    }
-
                     // Return the paramValues array to how it was before we
                     // added 'x' variable to the end of it.
                     paramValues.pop();
 
                     // Add the generated point to the data points set.
-                    dataPoints.push([tempX, y]);
+                    dataPoints.push([x, y]);
 
                     c1 += 1;
 
@@ -1233,9 +1267,13 @@ define('Graph', ['logme'], function (logme) {
 
                 seriesObj.bars = {
                     'show': functionObj.bars,
-                    'barWidth': state.barsConfig.delta * state.barsConfig.width_perc
+                    'barWidth': graphBarWidth
                 };
 
+                if (graphBarAlign !== null) {
+                    seriesObj.bars.align = graphBarAlign;
+                }
+
                 if (functionObj.hasOwnProperty('pointSize')) {
                     seriesObj.points.radius = functionObj.pointSize;
                 }
@@ -1245,6 +1283,27 @@ define('Graph', ['logme'], function (logme) {
                 dataSeries.push(seriesObj);
             }
 
+            if (graphBarAlign === null) {
+                for (c0 = 0; c0 < numPoints; c0 += 1) {
+                    // Number of points that have a value other than 'undefined' (undefined).
+                    numNotUndefined = 0;
+
+                    for (c1 = 0; c1 < dataSeries.length; c1 += 1) {
+                        logme('c1 = ' + c1 + ', dataSeries[c1].data[c0][1] = ' + dataSeries[c1].data[c0][1]);
+
+                        if (isFinite(parseInt(dataSeries[c1].data[c0][1])) === true) {
+                            numNotUndefined += 1;
+                        }
+                    }
+
+                    logme('Point number = ' + c0 + ', numNotUndefined = ' + numNotUndefined);
+
+                    for (c1 = 0; c1 < dataSeries.length; c1 += 1) {
+                        dataSeries[c1].data[c0][0] -= graphBarWidth * (0.5 * numNotUndefined - c1);
+                    }
+                }
+            }
+
             for (c0 = 0; c0 < asymptotes.length; c0 += 1) {
 
                 // If the user defined a label for this asympote, then the

From 77962e3cdb6eb443c3ca82325fc4c58e5350e66a Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Fri, 11 Jan 2013 15:35:48 +0200
Subject: [PATCH 326/541] Removed unnecessary comments. Added feature to update
 element either on "change" or on "slide" event.

---
 .../js/src/graphical_slider_tool/el_output.js | 36 ++++++++++---------
 .../js/src/graphical_slider_tool/graph.js     | 16 ++++-----
 .../js/src/graphical_slider_tool/sliders.js   | 23 ++++++------
 .../js/src/graphical_slider_tool/state.js     | 23 ++++--------
 4 files changed, 46 insertions(+), 52 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
index 8bad5e06b4..f98e890af9 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
@@ -25,7 +25,7 @@ define('ElOutput', ['logme'], function (logme) {
         return;
 
         function processFuncObj(obj) {
-            var paramNames, funcString, func, special, el, disableAutoReturn;
+            var paramNames, funcString, func, el, disableAutoReturn, updateOnEvent;
 
             // We are only interested in functions that are meant for output to an
             // element.
@@ -48,6 +48,15 @@ define('ElOutput', ['logme'], function (logme) {
                 return;
             }
 
+            updateOnEvent = 'slide';
+            if (
+                (obj.hasOwnProperty('@update_on') === true) &&
+                (typeof obj['@update_on'] === 'string') &&
+                ((obj['@update_on'].toLowerCase() === 'slide') || (obj['@update_on'].toLowerCase() === 'change'))
+            ) {
+                updateOnEvent = obj['@update_on'].toLowerCase();
+            }
+
             disableAutoReturn = obj['@disable_auto_return'];
 
             funcString = obj['#text'];
@@ -99,25 +108,20 @@ define('ElOutput', ['logme'], function (logme) {
 
             paramNames.pop();
 
-            special = false;
-            if (obj['@el_id'][0] === '_') {
-                special = true;
-            } else {
-                el = $('#' + obj['@el_id']);
+            el = $('#' + obj['@el_id']);
 
-                if (el.length !== 1) {
-                    logme(
-                        'ERROR: DOM element with ID "' + obj['@el_id'] + '" ' +
-                        'not found. Dynamic element not created.'
-                    );
+            if (el.length !== 1) {
+                logme(
+                    'ERROR: DOM element with ID "' + obj['@el_id'] + '" ' +
+                    'not found. Dynamic element not created.'
+                );
 
-                    return;
-                }
-
-                el.html(func.apply(window, state.getAllParameterValues()));
+                return;
             }
 
-            state.addDynamicEl(el, func, obj['@el_id'], special);
+            el.html(func.apply(window, state.getAllParameterValues()));
+
+            state.addDynamicEl(el, func, obj['@el_id'], updateOnEvent);
         }
 
     }
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 7099a910a4..ad25c5f27c 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -57,9 +57,6 @@ define('Graph', ['logme'], function (logme) {
         getBarWidth();
         getBarAlign();
 
-        logme('graphBarWidth = ' + graphBarWidth);
-        logme('graphBarAlign = ' + graphBarAlign);
-
         // Get the user defined functions. If there aren't any, don't do
         // anything else.
         createFunctions();
@@ -1119,7 +1116,7 @@ define('Graph', ['logme'], function (logme) {
         }
 
         function generateData() {
-            var c0, c1, functionObj, seriesObj, dataPoints, paramValues, x, y,
+            var c0, c1, c3, functionObj, seriesObj, dataPoints, paramValues, x, y,
                 start, end, step, numNotUndefined;
 
             paramValues = state.getAllParameterValues();
@@ -1289,17 +1286,18 @@ define('Graph', ['logme'], function (logme) {
                     numNotUndefined = 0;
 
                     for (c1 = 0; c1 < dataSeries.length; c1 += 1) {
-                        logme('c1 = ' + c1 + ', dataSeries[c1].data[c0][1] = ' + dataSeries[c1].data[c0][1]);
-
                         if (isFinite(parseInt(dataSeries[c1].data[c0][1])) === true) {
                             numNotUndefined += 1;
                         }
                     }
 
-                    logme('Point number = ' + c0 + ', numNotUndefined = ' + numNotUndefined);
-
+                    c3 = 0;
                     for (c1 = 0; c1 < dataSeries.length; c1 += 1) {
-                        dataSeries[c1].data[c0][0] -= graphBarWidth * (0.5 * numNotUndefined - c1);
+                        dataSeries[c1].data[c0][0] -= graphBarWidth * (0.5 * numNotUndefined - c3);
+
+                        if (isFinite(parseInt(dataSeries[c1].data[c0][1])) === true) {
+                            c3 += 1;
+                        }
                     }
                 }
             }
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
index a12f0099c6..6201da8237 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
@@ -6,7 +6,7 @@ define('Sliders', ['logme'], function (logme) {
     return Sliders;
 
     function Sliders(gstId, state) {
-        var c1, paramName, allParamNames, sliderDiv, onEvent;
+        var c1, paramName, allParamNames, sliderDiv;
 
         allParamNames = state.getAllParameterNames();
 
@@ -16,12 +16,7 @@ define('Sliders', ['logme'], function (logme) {
             sliderDiv = $('#' + gstId + '_slider_' + paramName);
 
             if (sliderDiv.length === 1) {
-                onEvent = 'slide';
-                if (sliderDiv.attr('data-on_event') === 'change') {
-                    onEvent = 'slidechange';
-                }
-
-                createSlider(sliderDiv, paramName, onEvent);
+                createSlider(sliderDiv, paramName);
             } else if (sliderDiv.length > 1) {
                 logme('ERROR: Found more than one slider for the parameter "' + paramName + '".');
                 logme('sliderDiv.length = ', sliderDiv.length);
@@ -30,7 +25,7 @@ define('Sliders', ['logme'], function (logme) {
             }
         }
 
-        function createSlider(sliderDiv, paramName, onEvent) {
+        function createSlider(sliderDiv, paramName) {
             var paramObj;
 
             paramObj = state.getParamObj(paramName);
@@ -57,8 +52,9 @@ define('Sliders', ['logme'], function (logme) {
             // will also update the value of this slider.
             paramObj.sliderDiv = sliderDiv;
 
-            // Atach a callback to update the slider's parameter.
-            paramObj.sliderDiv.on(onEvent, sliderOnSlide);
+            // Atach callbacks to update the slider's parameter.
+            paramObj.sliderDiv.on('slide', sliderOnSlide);
+            paramObj.sliderDiv.on('slidechange', sliderOnChange);
 
             return;
 
@@ -72,10 +68,15 @@ define('Sliders', ['logme'], function (logme) {
                 // so that the function knows we are a slider, and it can
                 // change the our value back in the case when the new value is
                 // invalid for some reason.
-                if (state.setParameterValue(paramName, ui.value, sliderDiv, true) === undefined) {
+                if (state.setParameterValue(paramName, ui.value, sliderDiv, true, 'slide') === undefined) {
                     logme('ERROR: Could not update the parameter named "' + paramName + '" with the value "' + ui.value + '".');
                 }
+            }
 
+            function sliderOnChange(event, ui) {
+                if (state.setParameterValue(paramName, ui.value, sliderDiv, true, 'change') === undefined) {
+                    logme('ERROR: Could not update the parameter named "' + paramName + '" with the value "' + ui.value + '".');
+                }
             }
         }
     }
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
index e5cd8634bc..c7e54289be 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
@@ -98,8 +98,6 @@ define('State', ['logme'], function (logme) {
             'bindUpdatePlotEvent': bindUpdatePlotEvent,
             'addDynamicEl': addDynamicEl,
 
-            'getFuncForSpecialLabel': getFuncForSpecialLabel,
-
             // plde is an abbreviation for Plot Label Dynamic Elements.
             plde: []
         };
@@ -128,14 +126,14 @@ define('State', ['logme'], function (logme) {
             plotDiv.bind('update_plot', callback);
         }
 
-        function addDynamicEl(el, func, elId, special) {
+        function addDynamicEl(el, func, elId, updateOnEvent) {
             var newLength;
 
             newLength = dynamicEl.push({
                 'el': el,
                 'func': func,
                 'elId': elId,
-                'special': special
+                'updateOnEvent': updateOnEvent
             });
 
             if (typeof dynamicElByElId[elId] !== 'undefined') {
@@ -147,16 +145,6 @@ define('State', ['logme'], function (logme) {
             }
         }
 
-        function getFuncForSpecialLabel(elId) {
-            if (typeof dynamicElByElId[elId] === 'undefined') {
-                logme('ERROR: Special label with ID "' + elId + '" does not exist.');
-
-                return null;
-            }
-
-            return dynamicElByElId[elId].func;
-        }
-
         function getParameterValue(paramName) {
 
             // If the name of the constant is not tracked by state, return an
@@ -203,7 +191,7 @@ define('State', ['logme'], function (logme) {
         // original value.
         //
         // ####################################################################
-        function setParameterValue(paramName, paramValue, element, slider) {
+        function setParameterValue(paramName, paramValue, element, slider, updateOnEvent) {
             var paramValueNum, c1;
 
             // If a parameter with the name specified by the 'paramName'
@@ -249,7 +237,10 @@ define('State', ['logme'], function (logme) {
             allParameterValues[parameters[paramName].helperArrayIndex] = paramValueNum;
 
             for (c1 = 0; c1 < dynamicEl.length; c1++) {
-                if (dynamicEl[c1].special !== true) {
+                if (
+                    ((updateOnEvent !== undefined) && (dynamicEl[c1].updateOnEvent === updateOnEvent)) ||
+                    (updateOnEvent === undefined)
+                ) {
                     dynamicEl[c1].el.html(dynamicEl[c1].func.apply(window, allParameterValues));
                 }
             }

From 1770de73f1d9b9b25c348fc5eea365ebd00c49c5 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Fri, 11 Jan 2013 15:54:19 +0200
Subject: [PATCH 327/541] Bugfixing. Refactoring. Removed readonly check for
 text edits. Styling of text edits with jQuery UI.

---
 .../js/src/graphical_slider_tool/graph.js     |  8 ++++
 .../js/src/graphical_slider_tool/inputs.js    | 44 ++++++-------------
 2 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index ad25c5f27c..6208f5fc3a 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -1286,6 +1286,10 @@ define('Graph', ['logme'], function (logme) {
                     numNotUndefined = 0;
 
                     for (c1 = 0; c1 < dataSeries.length; c1 += 1) {
+                        if (dataSeries[c1].bars.show === false) {
+                            continue;
+                        }
+
                         if (isFinite(parseInt(dataSeries[c1].data[c0][1])) === true) {
                             numNotUndefined += 1;
                         }
@@ -1293,6 +1297,10 @@ define('Graph', ['logme'], function (logme) {
 
                     c3 = 0;
                     for (c1 = 0; c1 < dataSeries.length; c1 += 1) {
+                        if (dataSeries[c1].bars.show === false) {
+                            continue;
+                        }
+
                         dataSeries[c1].data[c0][0] -= graphBarWidth * (0.5 * numNotUndefined - c3);
 
                         if (isFinite(parseInt(dataSeries[c1].data[c0][1])) === true) {
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
index e48174ddb5..a04ed113ec 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
@@ -26,7 +26,7 @@ define('Inputs', ['logme'], function (logme) {
         return;
 
         function createInput(inputDiv, paramName) {
-            var paramObj, readOnly;
+            var paramObj;
 
             paramObj = state.getParamObj(paramName);
 
@@ -37,41 +37,25 @@ define('Inputs', ['logme'], function (logme) {
                 return;
             }
 
-            readOnly = false;
-            if (inputDiv.attr('data-el_readonly').toLowerCase() === 'true') {
-                readOnly = true;
-            }
-
-            if (readOnly === true) {
-
-                // In the case of a readonly config option, configure the text
-                // inputit as read-only, and NOT bind an event to it.
-                inputDiv.attr('readonly', 'readonly');
-                inputDiv.css('background-color', '#D3D3D3');
-
-            } else { // readonly !== true
-
-                // Bind a function to the 'change' event. Whenever the user changes
-                // the value of this text input, and presses 'enter' (or clicks
-                // somewhere else on the page), this event will be triggered, and
-                // our callback will be called.
-                inputDiv.bind('change', inputOnChange);
-
-            }
+            // Bind a function to the 'change' event. Whenever the user changes
+            // the value of this text input, and presses 'enter' (or clicks
+            // somewhere else on the page), this event will be triggered, and
+            // our callback will be called.
+            inputDiv.bind('change', inputOnChange);
 
             inputDiv.val(paramObj.value);
 
             // Lets style the input element nicely. We will use the button()
             // widget for this since there is no native widget for the text
             // input.
-            // inputDiv.button().css({
-            //     'font': 'inherit',
-            //     'color': 'inherit',
-            //     'text-align': 'left',
-            //     'outline': 'none',
-            //     'cursor': 'text',
-            //     'height': '15px'
-            // });
+            inputDiv.button().css({
+                'font': 'inherit',
+                'color': 'inherit',
+                'text-align': 'left',
+                'outline': 'none',
+                'cursor': 'text',
+                'height': '15px'
+            });
 
             // Tell the parameter object from state that we are attaching a
             // text input to it. Next time the parameter will be updated with

From ec0bdfb445cb2e23eed34f1ef6f8ff93180e89d4 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Fri, 11 Jan 2013 15:59:54 +0200
Subject: [PATCH 328/541] New feature: can specify output of "none" for a
 dynamic element.

---
 .../js/src/graphical_slider_tool/el_output.js | 24 +++++++++++--------
 .../js/src/graphical_slider_tool/state.js     |  4 ++++
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
index f98e890af9..3c64857d99 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
@@ -31,7 +31,7 @@ define('ElOutput', ['logme'], function (logme) {
             // element.
             if (
                 (typeof obj['@output'] !== 'string') ||
-                (obj['@output'].toLowerCase() !== 'element')
+                ((obj['@output'].toLowerCase() !== 'element') && (obj['@output'].toLowerCase() !== 'none'))
             ) {
                 return;
             }
@@ -108,19 +108,23 @@ define('ElOutput', ['logme'], function (logme) {
 
             paramNames.pop();
 
-            el = $('#' + obj['@el_id']);
+            if (obj['@output'].toLowerCase() !== 'none') {
+                el = $('#' + obj['@el_id']);
 
-            if (el.length !== 1) {
-                logme(
-                    'ERROR: DOM element with ID "' + obj['@el_id'] + '" ' +
-                    'not found. Dynamic element not created.'
-                );
+                if (el.length !== 1) {
+                    logme(
+                        'ERROR: DOM element with ID "' + obj['@el_id'] + '" ' +
+                        'not found. Dynamic element not created.'
+                    );
 
-                return;
+                    return;
+                }
+
+                el.html(func.apply(window, state.getAllParameterValues()));
+            } else {
+                el = null;
             }
 
-            el.html(func.apply(window, state.getAllParameterValues()));
-
             state.addDynamicEl(el, func, obj['@el_id'], updateOnEvent);
         }
 
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
index c7e54289be..e1da8cc022 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
@@ -237,6 +237,10 @@ define('State', ['logme'], function (logme) {
             allParameterValues[parameters[paramName].helperArrayIndex] = paramValueNum;
 
             for (c1 = 0; c1 < dynamicEl.length; c1++) {
+                if (dynamicEl[c1].el === null) {
+                    continue;
+                }
+
                 if (
                     ((updateOnEvent !== undefined) && (dynamicEl[c1].updateOnEvent === updateOnEvent)) ||
                     (updateOnEvent === undefined)

From b56174c8d4953941727ab2355fc353a8696d9b7d Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 11 Jan 2013 16:01:29 +0200
Subject: [PATCH 329/541] updated docs

---
 docs/source/gst_example_with_documentation.xml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/docs/source/gst_example_with_documentation.xml b/docs/source/gst_example_with_documentation.xml
index a7a646d307..addada5b10 100644
--- a/docs/source/gst_example_with_documentation.xml
+++ b/docs/source/gst_example_with_documentation.xml
@@ -14,8 +14,8 @@
             <!-- make text and input or slider at the same line -->
             <div>
               <p style="float:left;"> Currently \(a\) is</p>
-              <!-- readonly input for b -->
-              <textbox var="a" style="width:50px; float:left; margin-left:10px;" readonly="false"/>
+              <!-- readonly input for a -->
+              <span id="a_readonly" style="width:50px; float:left; margin-left:10px;"/>
             </div>
             <!-- clear:left will make next text to begin from new line -->
             <p style="clear:left">   This one
@@ -26,7 +26,7 @@
             </p>
             <div>
               <p style="float:left;">Currently \(b\) is </p>
-              <textbox var="b" readonly="true" style="width:50px; float:left; margin-left:10px;"/>
+              <textbox var="b" style="width:50px; float:left; margin-left:10px;"/>
             </div>
             <div style="clear:left;">
               <p style="float:left;">To change \(a\) use:</p>
@@ -57,7 +57,8 @@
             return 10.0 * b * Math.sin(a * x) * Math.sin(b * x) / (Math.cos(b * x) + 10);
           </function>
           <function color="red" line="true" dot="false" label="\(y_2\)">
-            return Math.sin(a * x);
+            <!-- works w/o return, if function is single line -->
+            Math.sin(a * x);
           </function>
           <function color="#FFFF00" line="false" dot="false" label="unknown">
             function helperFunc(c1) {
@@ -66,13 +67,15 @@
 
             return helperFunc(x + 10 * a * b) + Math.sin(a - x);
           </function>
+          <function output="element" el_id="a_readonly">a</function>
         </functions>
 
         <plot>
 
           <xrange>
               <min>return 0;</min>
-              <max>return 30;</max>
+              <!-- works w/o return -->
+              <max>30</max>
           </xrange>
 
           <num_points>120</num_points>

From a49f94fe490b84afddbe644f1a53fdfd6c686e5e Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 11 Jan 2013 16:08:27 +0200
Subject: [PATCH 330/541] added none to allowed parameters in functions

---
 .../xmodule/xmodule/js/src/graphical_slider_tool/graph.js    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 6208f5fc3a..2520f0b12f 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -888,7 +888,8 @@ define('Graph', ['logme'], function (logme) {
 
                     // If this function is meant to be calculated for an
                     // element then skip it.
-                    if (obj['@output'].toLowerCase() === 'element') {
+                    if ((obj['@output'].toLowerCase() === 'element') ||
+                        (obj['@output'].toLowerCase() === 'none')) {
                         return;
                     }
 
@@ -904,7 +905,7 @@ define('Graph', ['logme'], function (logme) {
                     else if (obj['@output'].toLowerCase() !== 'graph') {
                         logme(
                             'ERROR: Function "output" attribute can be ' +
-                            'either "element", "plot_label",  or "graph".'
+                            'either "element", "plot_label", "none" or "graph".'
                         );
 
                         return;

From fc09bbd0b4aa93a6c564db5da92c7af5bc95bef3 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 11 Jan 2013 16:11:13 +0200
Subject: [PATCH 331/541] added funciton call

---
 .../lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
index e1da8cc022..0d39ac6f41 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
@@ -238,7 +238,7 @@ define('State', ['logme'], function (logme) {
 
             for (c1 = 0; c1 < dynamicEl.length; c1++) {
                 if (dynamicEl[c1].el === null) {
-                    continue;
+                    dynamicEl[c1].func.apply(window, allParameterValues);
                 }
 
                 if (

From d3045b36abfb4b0b788426a8959a2a6e1f6f9b8c Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 11 Jan 2013 16:13:16 +0200
Subject: [PATCH 332/541] initial function call added, fix

---
 .../xmodule/xmodule/js/src/graphical_slider_tool/el_output.js    | 1 +
 common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
index 3c64857d99..3175aae3f0 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
@@ -123,6 +123,7 @@ define('ElOutput', ['logme'], function (logme) {
                 el.html(func.apply(window, state.getAllParameterValues()));
             } else {
                 el = null;
+                func.apply(window, state.getAllParameterValues());
             }
 
             state.addDynamicEl(el, func, obj['@el_id'], updateOnEvent);
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
index 0d39ac6f41..44d536e9be 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
@@ -239,6 +239,7 @@ define('State', ['logme'], function (logme) {
             for (c1 = 0; c1 < dynamicEl.length; c1++) {
                 if (dynamicEl[c1].el === null) {
                     dynamicEl[c1].func.apply(window, allParameterValues);
+                    continue;
                 }
 
                 if (

From c9c328cf3961abff553524b7a9d8e93017d52954 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Fri, 11 Jan 2013 16:18:43 +0200
Subject: [PATCH 333/541] Bugfix.

---
 .../js/src/graphical_slider_tool/state.js        | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
index 44d536e9be..8b534fd19d 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
@@ -237,16 +237,20 @@ define('State', ['logme'], function (logme) {
             allParameterValues[parameters[paramName].helperArrayIndex] = paramValueNum;
 
             for (c1 = 0; c1 < dynamicEl.length; c1++) {
-                if (dynamicEl[c1].el === null) {
-                    dynamicEl[c1].func.apply(window, allParameterValues);
-                    continue;
-                }
-
                 if (
                     ((updateOnEvent !== undefined) && (dynamicEl[c1].updateOnEvent === updateOnEvent)) ||
                     (updateOnEvent === undefined)
                 ) {
-                    dynamicEl[c1].el.html(dynamicEl[c1].func.apply(window, allParameterValues));
+                    // If we have a DOM element, call the function "paste" the answer into the DIV.
+                    if (dynamicEl[c1].el !== null) {
+                        dynamicEl[c1].el.html(dynamicEl[c1].func.apply(window, allParameterValues));
+                    }
+                    // If we DO NOT have an element, simply call the function. The function can then
+                    // manipulate all the DOM elements it wants, without the fear of them being overwritten
+                    // by us afterwards.
+                    else {
+                        dynamicEl[c1].func.apply(window, allParameterValues);
+                    }
                 }
             }
 

From 442e112d6faf7f39fb7e01666ea1b79390a416ec Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Tue, 15 Jan 2013 12:45:07 +0200
Subject: [PATCH 334/541] Updated documentation. Try #2.

---
 docs/source/graphical_slider_tool.rst     | 357 +++++++++++++++++-----
 docs/source/gst_example_bars.rst          |  64 ++++
 docs/source/gst_example_dynamic_labels    |  40 +++
 docs/source/gst_example_dynamic_range.xml |  16 +-
 4 files changed, 391 insertions(+), 86 deletions(-)
 create mode 100644 docs/source/gst_example_bars.rst
 create mode 100644 docs/source/gst_example_dynamic_labels

diff --git a/docs/source/graphical_slider_tool.rst b/docs/source/graphical_slider_tool.rst
index 6334c6d77e..37b17136e8 100644
--- a/docs/source/graphical_slider_tool.rst
+++ b/docs/source/graphical_slider_tool.rst
@@ -4,6 +4,7 @@ Xml format of graphical slider tool [xmodule]
 
 .. module:: xml_format_gst
 
+
 Format description
 ==================
 
@@ -14,101 +15,102 @@ Graphical slider tool (GST) main tag is::
 ``graphical_slider_tool`` tag must have two children tags: ``render``
 and ``configuration``.
 
+
 Render tag
 ----------
 
 Render tag can contain usual html tags mixed with some GST specific tags::
 
-    <slider/> - represents jQuery slider
-    <textbox/> - represents input
-    <plot/> - represents Flot plot
+    <slider/> - represents jQuery slider for changing a parameter's value
+    <textbox/> - represents a text input field for changing a parameter's value
+    <plot/> - represents Flot JS plot element
 
 Also GST will track all elements inside ``<render></render>`` where ``id``
-attribute is set.
+attribute is set, and a corresponding parameter referencing that ``id`` is present
+in the configuration section below. These will be referred to as dynamic elements.
 
 The contents of the <render> section will be shown to the user after
 all occurrences of::
 
-    <slider var="{parameter name}" [style="{CSS statements}"]/>
-    <input var="parameter name" [style="{CSS statements}"] [readonly="true" | readonly="false"]/>
-    <plot [style="{CSS statements}"]/>
+    <slider var="{parameter name}" [style="{CSS statements}"] />
+    <textbox var="{parameter name}" [style="{CSS statements}"] />
+    <plot [style="{CSS statements}"] />
 
 have been converted to actual sliders, text inputs, and a plot graph.
-Everything in square brackets is optional.
+Everything in square brackets is optional. After initialization, all
+text input fields, sliders, and dynamic elements will be set to the initial
+values of the parameters that they are assigned to.
 
 ``{parameter name}`` specifies the parameter to which the slider or text
 input will be attached to.
 
+[style="{CSS statements}"] specifies valid CSS styling. It will be passed
+directly to the browser without any parsing.
+
 There is a one-to-one relationship between a slider and a parameter.
-I.e. for one parameter you can put only one ``<slider ...<`` in the
+I.e. for one parameter you can put only one ``<slider>`` in the
 ``<render>`` section. However, you don't have to specify a slider - they
 are optional.
 
 There is a many-to-one relationship between text inputs and a
-parameter. I.e. for one parameter you can put many '<input ...<' in
+parameter. I.e. for one parameter you can put many '<textbox>' elements in
 the ``<render>`` section. However, you don't have to specify a text
 input - they are optional.
 
-You can put only one ``<plot ...<`` in the ``<render>`` section. It is not
+You can put only one ``<plot>`` in the ``<render>`` section. It is not
 required.
 
-NOTE: MathJax, independently of this module, will render all TeX code
-within the ``<render>`` section into nice mathematical formulas. Just
-remember to wrap it in one of::
-
-    \(  and  \)  -  for inline formulas (formulas surrounded by
-                  standard text)
-    \[  and  \]  -  if you want the formula to be a separate line
 
 Slider tag
 ..........
 
 Slider tag must have ``var`` attribute and optional ``style`` attribute::
 
-    <slider var='a' style="width:400px;float:left;"/>
+    <slider var='a' style="width:400px;float:left;" />
 
-After processing slider tags will be replaced by jQuery UI sliders with applied
+After processing, slider tags will be replaced by jQuery UI sliders with applied
 ``style`` attribute.
 
-
-``Var`` attribute must correspond to parameter in one of ``function`` tags in
-``functions`` tag. By moving slider, value of parameter ``a`` will change, and so
-result of function, that depends on parameter ``a``, will change.
+``var`` attribute must correspond to a parameter. Parameters can be used in any
+of the ``function`` tags in ``functions`` tag. By moving slider, value of
+parameter ``a`` will change, and so result of function, that depends on parameter
+``a``, will also change.
 
 
 Textbox tag
 ...........
 
+Texbox tag must have ``var`` attribute and optional ``style`` attribute::
 
-Texbox tag must have ``var`` attribute and optional ``style`` and ``readonly``
-attributes::
+    <textbox var="b" style="width:50px; float:left; margin-left:10px;" />
 
-    <textbox var="b" readonly="true" style="width:50px; float:left; margin-left:10px;"/>
+After processing, textbox tags will be replaced by html text inputs with applied
+``style`` attribute. If you want a readonly text input, then you should use a
+dynamic element instead (see section below "HTML tagsd with ID").
 
-After processing tetbox tags will be replaced by html inputs with applied
-``style`` attribute. If ``readonly`` is set to ``true`` input will be
-not-editable, default is ``false``.
+``var`` attribute must correspond to a parameter. Parameters can be used in any
+of the ``function`` tags in ``functions`` tag. By changing the value on the text input,
+value of parameter ``a`` will change, and so result of function, that depends on
+parameter ``a``, will also change.
 
-``Var`` attribute must correspond to parameter in one of ``function`` tags in
-``functions`` tag. By entering value in input, value of parameter ``b`` will change, and so
-result of function, that depends on parameter ``b``, will change.
 
 Plot tag
 ........
 
 Plot tag may have optional ``style`` attribute::
 
-    <plot style="width:50px; float:left; margin-left:10px;"/>
+    <plot style="width:50px; float:left; margin-left:10px;" />
 
-After processing plot tags will be replaced by Flot plot with applied
+After processing plot tags will be replaced by Flot JS plot with applied
 ``style`` attribute.
 
-HTML tags with id
-.................
 
-Any html tag with id, e.g. ``<span id="answer_span_1">`` will be counted as
-place where result of function can be rendered. To render function result to
-element, element id must be included in ``function`` tag as ``el_id`` attribute
+HTML tags with ID (dynamic elements)
+....................................
+
+Any HTML tag with ID, e.g. ``<span id="answer_span_1">`` can be used as a
+place where result of function can be inserted. To insert function result to
+an element, element ID must be included in ``function`` tag as ``el_id`` attribute
 and ``output`` value must be ``"element"``::
 
     <function output="element" el_id="answer_span_1">
@@ -121,17 +123,17 @@ and ``output`` value must be ``"element"``::
     </function>
 
 
-
 Configuration tag
 -----------------
 
-The configuration tag contain sparameter settings, graph
+The configuration tag contains parameter settings, graph
 settings, and function definitions which are to be plotted on the
 graph and that use specified parameters.
 
 Configuration tag contains two mandatory tag ``functions`` and ``parameters`` and
 may contain another ``plot`` tag.
 
+
 Parameters tag
 ..............
 
@@ -143,30 +145,30 @@ Parameters tag
                 <param var="b" min="-10.0" max="10.0" step="0.1" initial="0" />
         </parameters>
 
-``Var`` attribute links min, max, step and initial values to parameter name.
-``Min`` attribute is minimal value that parameter can take. Slider and input
+``var`` attribute links min, max, step and initial values to parameter name.
+
+``min`` attribute is the minimal value that a parameter can take. Slider and input
 values can not go below it.
 
-``Max`` attribute is maximal value that parameter can take. Slider and input
+``max`` attribute is the maximal value that a parameter can take. Slider and input
 values can not go over it.
 
-``Step`` attribute is value of slider step. When a slider increase or decreases
+``step`` attribute is value of slider step. When a slider increase or decreases
 the specified parameter, it will do so by the amount specified with 'step'
 
-``Initial`` attribute is the initial value that the specified parameter should be
-set to.
+``initial`` attribute is the initial value that the specified parameter should be
+set to. Sliders and inputs will initially show this value.
 
-The parameter's name is specified by the 'var' property. All occurrences
-of sliders and/or text inputs that specify a 'var' property, will be
+The parameter's name is specified by the ``var`` property. All occurrences
+of sliders and/or text inputs that specify a ``var`` property, will be
 connected to this parameter - i.e. they will reflect the current
-value of the parameter and will be updated when the parameter
+value of the parameter, and will be updated when the parameter
 changes.
 
-
 If at lest one of these attributes is not set, then the parameter
 will not be used, slider's and/or text input elements that specify
 this parameter will not be activated, and the specified functions
-which use this parameter will return a non valid value. This means
+which use this parameter will not return a numeric value. This means
 that neglecting to specify at least one of the attributes for some
 parameter will have the result of the whole GST instance not working
 properly.
@@ -175,12 +177,23 @@ properly.
 Functions tag
 .............
 
-
 For the GST to do something, you must defined at least one
 function, which can use any of the specified parameter values. The
 function expects to take the ``x`` value, do some calculations, and
 return the ``y`` value. I.e. this is a 2D plot in Cartesian
-coordinates.
+coordinates. This is how the default function is meant to be used for
+the graph.
+
+There are other special cases of functions. They are used mainly for
+outputting to elements, plot labels, or for custom output. Because
+the return a single value, and that value is meant for a single element,
+these function are invoked only with the set of all of the parameters.
+I.e. no ``x`` value is available inside them. They are useful for
+showing the current value of a parameter, showing complex static
+formulas where some parameter's value must change, and other useful
+things.
+
+The different style of function is specified by the ``output`` attribute.
 
 Each function must be defined inside ``function`` tag in  ``functions`` tag::
 
@@ -202,11 +215,11 @@ by the browser's JavaScript engine and converted to a true JS
 function.
 
 The function's parameter list will automatically be created and
-populated, and will include the ``x``, and all of the specified
-parameter values (from sliders and text inputs). This means that
-each of the defined functions will have access to all of the
-parameter values. You don't have to use them, but they will be
-there.
+populated, and will include the ``x`` (when ``output`` is not specified or
+is set to ``"graph"``), and all of the specified parameter values (from sliders
+and text inputs). This means that each of the defined functions will have
+access to all of the parameter values. You don't have to use them, but
+they will be there.
 
 Examples::
 
@@ -245,43 +258,144 @@ Required parameters::
     you would specify the above function like so (the
     bare-bone minimum):
 
+        <function>return x * a + b;</function>
+
+    VERY IMPORTANT: Because the function will be passed
+    to the browser as a single string, depending on implementation
+    specifics, the end-of-line characters can be stripped. This
+    means that single line JavaScript comments (starting with "//")
+    can lead to the effect that everything after the first such comment
+    will be treated as a comment. Therefore, it is absolutely
+    necessary that such single line comments are not used when
+    defining functions for GST. You can safely use the alternative
+    multiple line JavaScript comments (such comments start with "/*"
+    and end with "*/).
+
+    VERY IMPORTANT: If you have a large function body, and decide to
+    split it into several lines, than you must wrap it in "CDATA" like
+    so:
+
         <function>
-            return x * a + b;
+        <![CDATA[
+            var dNew;
+
+            dNew = 0.3;
+
+            return x * a + b - dNew;
+        ]]>
         </function>
 
 Optional parameters::
 
 
-    color:  Color name (red, green, etc.) or in the form of
+    color:  Color name ('red', 'green', etc.) or in the form of
             '#FFFF00'. If not specified, a default color (different
-            one for each function) will be given by Flot;
+            one for each graphed function) will be given by Flot JS.
     line:   A string - 'true' or 'false'. Should the data points be
             connected by a line on the graph? Default is 'true'.
     dot:    A string - 'true' or 'false'. Should points be shown for
             each data point on the graph? Default is 'false'.
+    bar:    A string - 'true' or 'false'. When set to 'true', points
+            will be plotted as bars.
     label:  A string. If provided, will be shown in the legend, along
             with the color that was used to plot the function.
-    output: "element" or "plot". If not defined, function will be plotted.
-            If defined, function will not be plotted, but rendered to element
-            with id set in 'el_id' attribute.
-    el_id:  Id of html element, defined in 'render' section. Value of
-            function will be rendered to content of this element.
+    output: 'element', 'none', 'plot_label', or 'graph'. If not defined,
+            function will be plotted (same as setting 'output' to 'graph').
+            If defined, and other than 'graph', function will not be
+            plotted, but it's output will be inserted into the element
+            with ID specified by 'el_id' attribute.
+    el_id:  Id of HTML element, defined in '<render>' section. Value of
+            function will be inserted as content of this element.
     disable_auto_return: By default, if JavaScript function string is written
-                         without a "return" statement, one will be prepended
-                         to it. Set to "true" to disable this functionality.
-                         This is done so that simple functions can be defined
-                         in an easy fashion (for example, "a", which will be
-                         translated into "return a").
+                         without a "return" statement, the "return" will be
+                         prepended to it. Set to "true" to disable this
+                         functionality. This is done so that simple functions
+                         can be defined in an easy fashion (for example, "a",
+                         which will be translated into "return a").
+    update_on: A string - 'change', or 'slide'. Default (if not set) is
+               'slide'. This defines the event on which a given function is
+               called, and its result is inserted into an element. This
+               setting is relevant only when "output" is other than "graph".
 
-With ``output`` and ``el_id`` set together you can update html elements with
-function value, also function will not be plotted.
+When specifying ``el_id``, it is essential to set "output" to one of
+    element - GST will invoke the function, and the return of it will be
+              inserted into a HTML element with id specified by ``el_id``.
+    none    - GST will simply inoke the function. It is left to the instructor
+              who writes the JavaScript function body to update all necesary
+              HTML elements inside the function, before it exits. This is done
+              so that extra steps can be preformed after an HTML element has
+              been updated with a value. Note, that because the return value
+              from this function is not actually used, it will be tempting to
+              omit the "return" statement. However, in this case, the attribute
+              "disable_auto_return" must be set to "true" in order to prevent
+              GST from inserting a "return" statement automatically.
+    plot_label - GST will process all plot labels (which are strings), and
+                 will replace the all instances of substrings specified by
+                 ``el_id`` with the returned value of the function. This is
+                 necessary if you want a label in the graph to have some changing
+                 number. Because of the nature of Flot JS, it is impossible to
+                 achieve the same effect by setting the "output" attribute
+                 to "element", and including a HTML element in the label.
 
-[note on MathJax and labels]:
+The above values for "output" will tell GST that the function is meant for an
+HTML element (not for graph), and that it should not get an 'x' parameter (along
+with some value).
+
+
+[Note on MathJax and labels]
+............................
+
+Independently of this module, will render all TeX code
+within the ``<render>`` section into nice mathematical formulas. Just
+remember to wrap it in one of::
+
+    \(  and  \)  -  for inline formulas (formulas surrounded by
+                  standard text)
+    \[  and  \]  -  if you want the formula to be a separate line
 
 It is possible to define a label in standard TeX notation. The JS
 library MathJax will work on these labels also because they are
 inserted on top of the plot as standard HTML (text within a DIV).
 
+If the label is dynamic, i.e. it will contain some text (numeric, or other)
+that has to be updated on a parameter's change, then one can define
+a special function to handle this. The "output" of such a function must be
+set to "none", and the JavaScript code inside this function must update the
+MathJax element by itself. Before exiting, MathJax typeset function should
+be called so that the new text will be re-rendered by MathJax. For example,
+
+    <render>
+        ...
+        <span id="dynamic_mathjax"></span>
+    </render>
+    ...
+    <function output="none" el_id="dynamic_mathjax">
+    <![CDATA[
+        var out_text;
+
+        out_text = "\\[\\mathrm{Percent \\space of \\space treated \\space with \\space YSS=\\frac{"
+          +(treated_men*10)+"\\space men *"
+          +(your_m_tx_yss/100)+"\\space prev. +\\space "
+          +((100-treated_men)*10)+"\\space women *"
+          +(your_f_tx_yss/100)+"\\space prev.}"
+          +"{1000\\space total\\space treated\\space patients}"
+          +"="+drummond_combined[0][1]+"\\%}\\]";
+          mathjax_for_prevalence_calcs+="\\[\\mathrm{Percent \\space of \\space untreated \\space with \\space YSS=\\frac{"
+          +(untreated_men*10)+"\\space men *"
+          +(your_m_utx_yss/100)+"\\space prev. +\\space "
+          +((100-untreated_men)*10)+"\\space women *"
+          +(your_f_utx_yss/100)+"\\space prev.}"
+          +"{1000\\space total\\space untreated\\space patients}"
+          +"="+drummond_combined[1][1]+"\\%}\\]";
+
+        $("#dynamic_mathjax").html(out_text);
+
+        MathJax.Hub.Queue(["Typeset",MathJax.Hub,"dynamic_mathjax"]);
+    ]]>
+    </function>
+    ...
+
+
 Plot tag
 ........
 
@@ -312,6 +426,15 @@ Optional parameters::
     num_points: Number of data points to generated for the plot. If
                 this is not set, the number of points will be
                 calculated as width / 5.
+
+    bar_width: If functions are present which are to be plotted as bars,
+               then this parameter specifies the width of the bars. A
+               numeric value for this parameter is expected.
+
+    bar_align: If functions are present which are to be plotted as bars,
+               then this parameter specifies how to align the bars relative
+               to the tick. Available values are "left" and "center".
+
     xticks,
     yticks:    3 floating point numbers separated by commas. This
                specifies how many ticks are created, what number they
@@ -333,19 +456,89 @@ Optional parameters::
                the plotted data will change - the axes (ticks) will
                remain as you have defined them.
 
+    xticks_names, yticks_names:
+              A JSON string which represents a mapping of xticks, yticks
+              values to some defined strings. If specified, the graph will
+              not have any xticks, yticks except those for which a string
+              value has been defined in the JSON string. Note that the
+              matching will be string-based and not numeric. I.e. if a tick
+              value was "3.70" before, then inside the JSON there should be
+              a mapping like {..., "3.70": "Some string", ...}. Example:
+
+                  <xticks_names>
+                  <![CDATA[
+                  {
+                      "1": "Treated", "2": "Not Treated",
+                      "4": "Treated", "5": "Not Treated",
+                      "7": "Treated", "8": "Not Treated"
+                  }
+                  ]]>
+                  </xticks_names>
+
+                  <yticks_names>
+                  <![CDATA[
+                      {"0": "0%", "10": "10%", "20": "20%", "30": "30%", "40": "40%", "50": "50%"}
+                  ]]>
+                  </yticks_names>
+
     xunits,
     yunits:   Units values to be set on axes. Use MathJax. Example:
                 <xunits>\(cm\)</xunits>
                 <yunits>\(m\)</yunits>
 
+    moving_label:
+              A way to specify a label that should be positioned dynamically,
+              based on the values of some parameters, or some other factors.
+              It is similar to a <function>, but it is only valid for a plot
+              because it is drawn relative to the plot coordinate system.
+
+              Multiple "moving_label" configurations can be provided, each one
+              with a unique text and a unique set of functions that determine
+              it's dynamic positioning.
+
+              Each "moving_label" can have a "color" attribute (CSS color notation),
+              and a "weight" attribute. "weight" can be one of "normal" or "bold",
+              and determines the styling of moving label's text.
+
+              Each "moving_label" function should return an object with a 'x'
+              and 'y properties. Within those functions, all of the parameter
+              names along with their value are available.
+
+              Example (note that "return" statement is missing; it will be automatically
+              inserted by GST):
+
+                  <moving_label text="Co" weight="bold" color="red>
+                  <![CDATA[  {'x': -50, 'y': c0};]]>
+                  </moving_label>
+
+    asymptote:
+              Add a vertical or horizontal asymptote to the graph which will
+              be dynamically repositioned based on the specified function.
+
+              It is similar to the function in that it provides a JavaScript body function
+              string. This function will be used to calculate the position of the asymptote
+              relative to the axis specified by the "type" parameter.
+
+              Required parameters:
+                  type:
+                        Which axis should the asymptote be plotted against. Available values
+                        are "x" and "y".
+
+              Optional parameters:
+                  color:
+                        The color of the line. A valid CSS color string is expected.
+
+
 Example
 =======
 
+
 Plotting, sliders and inputs
 ----------------------------
 
 .. literalinclude:: gst_example_with_documentation.xml
 
+
 Update of html elements, no plotting
 ------------------------------------
 
@@ -356,3 +549,15 @@ Circle with dynamic radius
 --------------------------
 
 .. literalinclude:: gst_example_dynamic_range.xml
+
+
+Example of a bar graph
+----------------------
+
+.. literalinclude:: gst_example_bars.xml
+
+
+Example of moving labels of graph
+---------------------------------
+
+.. literalinclude:: gst_example_dynamic_labels.xml
diff --git a/docs/source/gst_example_bars.rst b/docs/source/gst_example_bars.rst
new file mode 100644
index 0000000000..f0a197bb79
--- /dev/null
+++ b/docs/source/gst_example_bars.rst
@@ -0,0 +1,64 @@
+<vertical>
+    <graphical_slider_tool>
+      <render>
+        <h2>Graphic slider tool: Bar graph example.</h2>
+
+        <p>We can request the API to plot us a bar graph.</p>
+        <div style="clear:both">
+          <p style="width:60px;float:left;">a</p>
+          <slider var='a' style="width:400px;float:left;"/>
+          <textbox var='a' style="width:50px;float:left;margin-left:15px;"/>
+          <br /><br /><br />
+          <p style="width:60px;float:left;">b</p>
+          <slider var='b' style="width:400px;float:left;"/>
+          <textbox var='b' style="width:50px;float:left;margin-left:15px;"/>
+        </div>
+          <plot style="clear:left;"/>
+      </render>
+      <configuration>
+        <parameters>
+            <param var="a" min="-100" max="100" step="5" initial="25" />
+            <param var="b" min="-100" max="100" step="5" initial="50" />
+        </parameters>
+        <functions>
+          <function bar="true" color="blue" label="Men">
+            <![CDATA[if (((x>0.9) && (x<1.1)) || ((x>4.9) && (x<5.1))) { return Math.sin(a * 0.01 * Math.PI + 2.952 * x); }
+            else {return undefined;}]]>
+          </function>
+          <function bar="true" color="red" label="Women">
+            <![CDATA[if (((x>1.9) && (x<2.1)) || ((x>3.9) && (x<4.1))) { return Math.cos(b * 0.01 * Math.PI + 3.432 * x); }
+            else {return undefined;}]]>
+          </function>
+          <function bar="true" color="green" label="Other 1">
+            <![CDATA[if (((x>1.9) && (x<2.1)) || ((x>3.9) && (x<4.1))) { return Math.cos((b - 10 * a) * 0.01 * Math.PI + 3.432 * x); }
+            else {return undefined;}]]>
+          </function>
+          <function bar="true" color="yellow" label="Other 2">
+            <![CDATA[if (((x>1.9) && (x<2.1)) || ((x>3.9) && (x<4.1))) { return Math.cos((b + 7 * a) * 0.01 * Math.PI + 3.432 * x); }
+            else {return undefined;}]]>
+          </function>
+        </functions>
+        <plot>
+          <xrange><min>1</min><max>5</max></xrange>
+          <num_points>5</num_points>
+          <xticks>0, 0.5, 6</xticks>
+          <yticks>-1.5, 0.1, 1.5</yticks>
+          <xticks_names>
+          <![CDATA[
+              {
+                  "1.5": "Single", "4.5": "Married"
+              }
+          ]]>
+          </xticks_names>
+          <yticks_names>
+          <![CDATA[
+              {
+                  "-1.0": "-100%", "-0.5": "-50%", "0.0": "0%", "0.5": "50%", "1.0": "100%"
+              }
+          ]]>
+          </yticks_names>
+          <bar_width>0.4</bar_width>
+        </plot>
+      </configuration>
+    </graphical_slider_tool>
+</vertical>
diff --git a/docs/source/gst_example_dynamic_labels b/docs/source/gst_example_dynamic_labels
new file mode 100644
index 0000000000..05cbe407fb
--- /dev/null
+++ b/docs/source/gst_example_dynamic_labels
@@ -0,0 +1,40 @@
+<vertical>
+ <graphical_slider_tool>
+      <render>
+        <h1>Graphic slider tool: Dynamic labels.</h1>
+        <p>There are two kinds of dynamic lables.
+        1) Dynamic changing values in graph legends.
+        2) Dynamic labels, which coordinates depend on parameters </p>
+         <p>a: <slider var="a"/></p>
+          <br/>
+          <p>b: <slider var="b"/></p>
+          <br/><br/>
+          <plot style="width:400px; height:400px;"/>
+      </render>
+
+      <configuration>
+        <parameters>
+            <param var="a" min="-10" max="10" step="1" initial="0" />
+            <param var="b" min="0" max="10" step="0.5" initial="5" />
+        </parameters>
+        <functions>
+          <function label="Value of a is: dyn_val_1">a * x + b</function>
+         <!-- dynamic values in legend -->
+         <function output="plot_label" el_id="dyn_val_1">a</function>
+        </functions>
+        <plot>
+          <xrange><min>0</min><max>30</max></xrange>
+          <num_points>10</num_points>
+          <xticks>0, 6, 30</xticks>
+          <yticks>-9, 1, 9</yticks>
+          <!-- custom labels with coordinates as any function of parameter -->
+          <moving_label text="Dynam_lbl 1" weight="bold">
+          <![CDATA[  {'x': 10, 'y': a};]]>
+          </moving_label>
+          <moving_label text="Dynam lbl 2" weight="bold">
+          <![CDATA[  {'x': -6, 'y': b};]]>
+          </moving_label>
+        </plot>
+      </configuration>
+    </graphical_slider_tool>
+</vertical>
\ No newline at end of file
diff --git a/docs/source/gst_example_dynamic_range.xml b/docs/source/gst_example_dynamic_range.xml
index 0938e7b60b..0ce4263d62 100644
--- a/docs/source/gst_example_dynamic_range.xml
+++ b/docs/source/gst_example_dynamic_range.xml
@@ -3,10 +3,10 @@
       <render>
         <h2>Graphic slider tool: Dynamic range and implicit functions.</h2>
 
-        <p>You can make x range (not ticks of x axis) of functions to depend on 
+        <p>You can make x range (not ticks of x axis) of functions to depend on
           parameter value. This can be useful when function domain depends
           on parameter.</p>
-        <p>Also implicit functons like circle can be plotted as 2 separate 
+        <p>Also implicit functons like circle can be plotted as 2 separate
             functions of same color.</p>
          <div style="height:50px;">
          <slider var='a' style="width:400px;float:left;"/>
@@ -19,18 +19,14 @@
             <param var="a" min="5" max="25" step="0.5" initial="12.5" />
         </parameters>
         <functions>
-          <function color="red">return Math.sqrt(a * a - x * x);</function>
-          <function color="red">return -Math.sqrt(a * a - x * x);</function>
+          <function color="red">Math.sqrt(a * a - x * x)</function>
+          <function color="red">-Math.sqrt(a * a - x * x)</function>
         </functions>
         <plot>
           <xrange>
             <!-- dynamic range -->
-              <min>
-                  return -a;
-              </min>
-              <max>
-                  return a;
-              </max>
+              <min>-a</min>
+              <max>a</max>
           </xrange>
           <num_points>1000</num_points>
           <xticks>-30, 6, 30</xticks>

From 00bf973d4a92e667237424f5dfdad76e7c3e6955 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Tue, 15 Jan 2013 12:46:52 +0200
Subject: [PATCH 335/541] Renamed to XML example code.

---
 docs/source/{gst_example_bars.rst => gst_example_bars.xml}        | 0
 ...{gst_example_dynamic_labels => gst_example_dynamic_labels.xml} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename docs/source/{gst_example_bars.rst => gst_example_bars.xml} (100%)
 rename docs/source/{gst_example_dynamic_labels => gst_example_dynamic_labels.xml} (100%)

diff --git a/docs/source/gst_example_bars.rst b/docs/source/gst_example_bars.xml
similarity index 100%
rename from docs/source/gst_example_bars.rst
rename to docs/source/gst_example_bars.xml
diff --git a/docs/source/gst_example_dynamic_labels b/docs/source/gst_example_dynamic_labels.xml
similarity index 100%
rename from docs/source/gst_example_dynamic_labels
rename to docs/source/gst_example_dynamic_labels.xml

From b53786b688ac3b57401f4658c3b7133d4bc83be7 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Tue, 15 Jan 2013 13:34:16 +0200
Subject: [PATCH 336/541] removed on event from slider and readonly from
 textbox

---
 common/lib/xmodule/xmodule/gst_module.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index c4771f3bcb..3b8d96ee81 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -103,7 +103,6 @@ class GraphicalSliderToolModule(XModule):
         slider_div = '<div class="{element_class}_slider" \
                                    id="{element_id}_slider_{var}" \
                                    data-var="{var}" \
-                                   data-on_event="{on_event}" \
                                    style="{style}">\
                      </div>'
         slider_els = xml.xpath('//slider')
@@ -112,21 +111,18 @@ class GraphicalSliderToolModule(XModule):
                                 slider_div.format(element_class=self.html_class,
                                     element_id=self.html_id,
                                     var=slider_el.get('var', ""),
-                                    on_event=slider_el.get('on_event', 'slide'),
                                     style=slider_el.get('style', ""))))
 
         # substitute inputs aka textboxes
         input_div = '<input class="{element_class}_input" \
                                   id="{element_id}_input_{var}_{input_index}" \
-                                   data-var="{var}" style="{style}" \
-                                   data-el_readonly="{readonly}"/>'
+                                   data-var="{var}" style="{style}"/>'
         input_els = xml.xpath('//textbox')
         for input_index, input_el in enumerate(input_els):
             input_el.getparent().replace(input_el, html.fromstring(
                                 input_div.format(element_class=self.html_class,
                                         element_id=self.html_id,
                                         var=input_el.get('var', ""),
-                                        readonly=input_el.get('readonly', ''),
                                         style=input_el.get('style', ""),
                                         input_index=input_index)))
 

From c50c705eb6aaf72f2870ce3b7c4acf2ade63e5c6 Mon Sep 17 00:00:00 2001
From: Ashley Penney <apenney@edx.org>
Date: Tue, 15 Jan 2013 11:17:45 -0500
Subject: [PATCH 337/541] Temporary workaround to our bizarre numpy issue.  I
 think it's to do with the way shiningpanda works but I can't see any reason
 why.

---
 jenkins/test.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/jenkins/test.sh b/jenkins/test.sh
index 7a61e914b7..67651ccf09 100755
--- a/jenkins/test.sh
+++ b/jenkins/test.sh
@@ -28,6 +28,11 @@ export PYTHONIOENCODING=UTF-8
 
 GIT_BRANCH=${GIT_BRANCH/HEAD/master}
 
+# Temporary workaround for pip/numpy bug.
+wget -O /tmp/numpy.tar.gz http://pypi.python.org/packages/source/n/numpy/numpy-1.6.2.tar.gz#md5=95ed6c9dcc94af1fc1642ea2a33c1bba
+tar -zxvf /tmp/numpy.tar.gz -C /tmp/
+python /tmp/numpy-1.6.2/setup.py install
+
 pip install -q -r pre-requirements.txt
 pip install -q -r test-requirements.txt
 yes w | pip install -q -r requirements.txt

From 3e5a2f9bded5eac1f3f1c867437a00fe648c28ba Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@mitx.mit.edu>
Date: Sat, 12 Jan 2013 09:48:44 -0500
Subject: [PATCH 338/541] Add beta test group support

* add a days_early_for_beta inherited policy option
* students in the beta_testers_{COURSE} group get to see content that many days early
* Clean up some docstrings related to time formats
* Add basic test
---
 common/lib/xmodule/xmodule/timeparse.py  |  7 ++-
 common/lib/xmodule/xmodule/x_module.py   | 22 +++++++--
 doc/xml-format.md                        |  1 +
 lms/djangoapps/courseware/access.py      | 58 ++++++++++++++++++++++--
 lms/djangoapps/courseware/tests/tests.py | 46 +++++++++++++++++--
 5 files changed, 120 insertions(+), 14 deletions(-)

diff --git a/common/lib/xmodule/xmodule/timeparse.py b/common/lib/xmodule/xmodule/timeparse.py
index 117105d085..36c0f725e5 100644
--- a/common/lib/xmodule/xmodule/timeparse.py
+++ b/common/lib/xmodule/xmodule/timeparse.py
@@ -7,8 +7,11 @@ TIME_FORMAT = "%Y-%m-%dT%H:%M"
 
 def parse_time(time_str):
     """
-    Takes a time string in TIME_FORMAT, returns
-    it as a time_struct.  Raises ValueError if the string is not in the right format.
+    Takes a time string in TIME_FORMAT
+
+    Returns it as a time_struct.
+
+    Raises ValueError if the string is not in the right format.
     """
     return time.strptime(time_str, TIME_FORMAT)
 
diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py
index 19a592191e..12de947a5e 100644
--- a/common/lib/xmodule/xmodule/x_module.py
+++ b/common/lib/xmodule/xmodule/x_module.py
@@ -414,7 +414,11 @@ class XModuleDescriptor(Plugin, HTMLSnippet, ResourceTemplates):
         'xqa_key',
         # TODO: This is used by the XMLModuleStore to provide for locations for
         # static files, and will need to be removed when that code is removed
-        'data_dir'
+        'data_dir',
+        # How many days early to show a course element to beta testers (float)
+        # intended to be set per-course, but can be overridden in for specific
+        # elements.  Can be a float.
+        'days_early_for_beta'
     )
 
     # cdodge: this is a list of metadata names which are 'system' metadata
@@ -497,12 +501,23 @@ class XModuleDescriptor(Plugin, HTMLSnippet, ResourceTemplates):
     @property
     def start(self):
         """
-        If self.metadata contains start, return it.  Else return None.
+        If self.metadata contains a valid start time, return it as a time struct.
+        Else return None.
         """
         if 'start' not in self.metadata:
             return None
         return self._try_parse_time('start')
 
+    @property
+    def days_early_for_beta(self):
+        """
+        If self.metadata contains start, return the number, as a float.  Else return None.
+        """
+        if 'days_early_for_beta' not in self.metadata:
+            return None
+        return float(self.metadata['days_early_for_beta'])
+
+
     @property
     def own_metadata(self):
         """
@@ -715,7 +730,8 @@ class XModuleDescriptor(Plugin, HTMLSnippet, ResourceTemplates):
         """
         Parse an optional metadata key containing a time: if present, complain
         if it doesn't parse.
-        Return None if not present or invalid.
+        
+        Returns a time_struct, or None if metadata key is not present or is invalid.
         """
         if key in self.metadata:
             try:
diff --git a/doc/xml-format.md b/doc/xml-format.md
index d7c5027a79..e4bbc0d4db 100644
--- a/doc/xml-format.md
+++ b/doc/xml-format.md
@@ -257,6 +257,7 @@ Supported fields at the course level:
 * "tabs" -- have custom tabs in the courseware.  See below for details on config.
 * "discussion_blackouts" -- An array of time intervals during which you want to disable a student's ability to create or edit posts in the forum. Moderators, Community TAs, and Admins are unaffected. You might use this during exam periods, but please be aware that the forum is often a very good place to catch mistakes and clarify points to students. The better long term solution would be to have better flagging/moderation mechanisms, but this is the hammer we have today. Format by example: [["2012-10-29T04:00", "2012-11-03T04:00"], ["2012-12-30T04:00", "2013-01-02T04:00"]]
 * "show_calculator" (value "Yes" if desired)
+* "days_early_for_beta" -- number of days early that students in the beta-testers group get to see course content.  Can also be specified for any other course element, and overrides values set at higher levels.
 * TODO: there are others
 
 ### Grading policy file contents
diff --git a/lms/djangoapps/courseware/access.py b/lms/djangoapps/courseware/access.py
index 26f9fcdfd3..097d14b81e 100644
--- a/lms/djangoapps/courseware/access.py
+++ b/lms/djangoapps/courseware/access.py
@@ -4,13 +4,13 @@ like DISABLE_START_DATES"""
 
 import logging
 import time
+from datetime import datetime, timedelta
 
 from django.conf import settings
 
 from xmodule.course_module import CourseDescriptor
 from xmodule.error_module import ErrorDescriptor
 from xmodule.modulestore import Location
-from xmodule.timeparse import parse_time
 from xmodule.x_module import XModule, XModuleDescriptor
 
 from student.models import CourseEnrollmentAllowed
@@ -73,7 +73,7 @@ def has_access(user, obj, action):
     raise TypeError("Unknown object type in has_access(): '{0}'"
                     .format(type(obj)))
 
-def get_access_group_name(obj,action):
+def get_access_group_name(obj, action):
     '''
     Returns group name for user group which has "action" access to the given object.
 
@@ -226,9 +226,10 @@ def _has_access_descriptor(user, descriptor, action):
         # Check start date
         if descriptor.start is not None:
             now = time.gmtime()
-            if now > descriptor.start:
+            effective_start = _adjust_start_date_for_beta_testers(user, descriptor)
+            if now > effective_start:
                 # after start date, everyone can see it
-                debug("Allow: now > start date")
+                debug("Allow: now > effective start date")
                 return True
             # otherwise, need staff access
             return _has_staff_access_to_descriptor(user, descriptor)
@@ -328,6 +329,15 @@ def _course_staff_group_name(location):
     """
     return 'staff_%s' % Location(location).course
 
+def _course_beta_test_group_name(location):
+    """
+    Get the name of the beta tester group for a location.  Right now, that's
+    beta_testers_COURSE.
+
+    location: something that can passed to Location.
+    """
+    return 'beta_testers_{0}'.format(Location(location).course)
+
 
 def _course_instructor_group_name(location):
     """
@@ -348,6 +358,46 @@ def _has_global_staff_access(user):
         return False
 
 
+def _adjust_start_date_for_beta_testers(user, descriptor):
+    """
+    If user is in a beta test group, adjust the start date by the appropriate number of
+    days.
+
+    Arguments:
+       user: A django user.  May be anonymous.
+       descriptor: the XModuleDescriptor the user is trying to get access to, with a
+       non-None start date.
+
+    Returns:
+        A time, in the same format as returned by time.gmtime().  Either the same as
+        start, or earlier for beta testers.
+
+    NOTE: number of days to adjust should be cached to avoid looking it up thousands of
+    times per query.
+
+    NOTE: For now, this function assumes that the descriptor's location is in the course
+    the user is looking at.  Once we have proper usages and definitions per the XBlock
+    design, this should use the course the usage is in.
+    """
+    if descriptor.days_early_for_beta is None:
+        # bail early if no beta testing is set up
+        return descriptor.start
+
+    user_groups = [g.name for g in user.groups.all()]
+
+    beta_group = _course_beta_test_group_name(descriptor.location)
+    if beta_group in user_groups:
+        debug("Adjust start time: user in group %s", beta_group)
+        # time_structs don't support subtraction, so convert to datetimes,
+        # subtract, convert back.
+        start_as_datetime = datetime(*descriptor.start[:6])
+        delta = timedelta(descriptor.days_early_for_beta)
+        effective = start_as_datetime - delta
+        # ...and back to time_struct
+        return effective.timetuple()
+
+    return descriptor.start
+
 def _has_instructor_access_to_location(user, location):
     return _has_access_to_location(user, location, 'instructor')
 
diff --git a/lms/djangoapps/courseware/tests/tests.py b/lms/djangoapps/courseware/tests/tests.py
index b6ec6aff02..6972ded307 100644
--- a/lms/djangoapps/courseware/tests/tests.py
+++ b/lms/djangoapps/courseware/tests/tests.py
@@ -17,7 +17,8 @@ import xmodule.modulestore.django
 
 # Need access to internal func to put users in the right group
 from courseware import grades
-from courseware.access import _course_staff_group_name
+from courseware.access import (has_access, _course_staff_group_name,
+                               _course_beta_test_group_name)
 from courseware.models import StudentModuleCache
 
 from student.models import Registration
@@ -238,7 +239,7 @@ class PageLoader(ActivateLoginTestCase):
         n = 0
         num_bad = 0
         all_ok = True
-        for descriptor in module_store.modules[course_id].itervalues(): 
+        for descriptor in module_store.modules[course_id].itervalues():
             n += 1
             print "Checking ", descriptor.location.url()
             #print descriptor.__class__, descriptor.location
@@ -259,11 +260,11 @@ class PageLoader(ActivateLoginTestCase):
             # check content to make sure there were no rendering failures
             content = resp.content
             if content.find("this module is temporarily unavailable")>=0:
-                msg = "ERROR unavailable module " 
+                msg = "ERROR unavailable module "
                 all_ok = False
                 num_bad += 1
             elif isinstance(descriptor, ErrorDescriptor):
-                msg = "ERROR error descriptor loaded: " 
+                msg = "ERROR error descriptor loaded: "
                 msg = msg + descriptor.definition['data']['error_msg']
                 all_ok = False
                 num_bad += 1
@@ -286,7 +287,7 @@ class TestCoursesLoadTestCase(PageLoader):
 #        xmodule.modulestore.django.modulestore().collection.drop()
 #        store = xmodule.modulestore.django.modulestore()
         # is there a way to empty the store?
-        
+
     def test_toy_course_loads(self):
         self.check_pages_load('toy', TEST_DATA_DIR, modulestore())
 
@@ -453,6 +454,9 @@ class TestViewAuth(PageLoader):
         """Check that enrollment periods work"""
         self.run_wrapped(self._do_test_enrollment_period)
 
+    def test_beta_period(self):
+        """Check that beta-test access works"""
+        self.run_wrapped(self._do_test_beta_period)
 
     def _do_test_dark_launch(self):
         """Actually do the test, relying on settings to be right."""
@@ -618,6 +622,38 @@ class TestViewAuth(PageLoader):
         self.unenroll(self.toy)
         self.assertTrue(self.try_enroll(self.toy))
 
+    def _do_test_beta_period(self):
+        """Actually test beta periods, relying on settings to be right."""
+
+        # trust, but verify :)
+        self.assertFalse(settings.MITX_FEATURES['DISABLE_START_DATES'])
+
+        # Make courses start in the future
+        tomorrow = time.time() + 24 * 3600
+        nextday = tomorrow + 24 * 3600
+        yesterday = time.time() - 24 * 3600
+
+        # toy course's hasn't started
+        self.toy.metadata['start'] = stringify_time(time.gmtime(tomorrow))
+        self.assertFalse(self.toy.has_started())
+
+        # but should be accessible for beta testers
+        self.toy.metadata['days_early_for_beta'] = '2'
+
+        # student user shouldn't see it
+        student_user = user(self.student)
+        self.assertFalse(has_access(student_user, self.toy, 'load'))
+
+        # now add the student to the beta test group
+        group_name = _course_beta_test_group_name(self.toy.location)
+        g = Group.objects.create(name=group_name)
+        g.user_set.add(student_user)
+
+        # now the student should see it
+        self.assertTrue(has_access(student_user, self.toy, 'load'))
+
+
+
 @override_settings(MODULESTORE=TEST_DATA_XML_MODULESTORE)
 class TestCourseGrader(PageLoader):
     """Check that a course gets graded properly"""

From 58a9fdeddc952d4be9ccc248ad15aba6f53b52cf Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@mitx.mit.edu>
Date: Sat, 12 Jan 2013 10:10:01 -0500
Subject: [PATCH 339/541] add note about settings needed for manual testing

---
 lms/djangoapps/courseware/access.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lms/djangoapps/courseware/access.py b/lms/djangoapps/courseware/access.py
index 097d14b81e..f4e4a95e07 100644
--- a/lms/djangoapps/courseware/access.py
+++ b/lms/djangoapps/courseware/access.py
@@ -378,6 +378,9 @@ def _adjust_start_date_for_beta_testers(user, descriptor):
     NOTE: For now, this function assumes that the descriptor's location is in the course
     the user is looking at.  Once we have proper usages and definitions per the XBlock
     design, this should use the course the usage is in.
+
+    NOTE: If testing manually, make sure MITX_FEATURES['DISABLE_START_DATES'] = False
+    in envs/dev.py!
     """
     if descriptor.days_early_for_beta is None:
         # bail early if no beta testing is set up

From 093839e13dc784a8a38441eb7593bef10164e8c8 Mon Sep 17 00:00:00 2001
From: Ashley Penney <apenney@edx.org>
Date: Tue, 15 Jan 2013 11:39:59 -0500
Subject: [PATCH 340/541] flesh out comment.

---
 jenkins/test.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jenkins/test.sh b/jenkins/test.sh
index 67651ccf09..e960313d76 100755
--- a/jenkins/test.sh
+++ b/jenkins/test.sh
@@ -28,7 +28,8 @@ export PYTHONIOENCODING=UTF-8
 
 GIT_BRANCH=${GIT_BRANCH/HEAD/master}
 
-# Temporary workaround for pip/numpy bug.
+# Temporary workaround for pip/numpy bug. (Jenkin's is unable to pip install numpy successfully, scipy fails to install afterwards.
+# We tried pip 1.1, 1.2, all sorts of varieties but it's apparently a pip bug of some kind.
 wget -O /tmp/numpy.tar.gz http://pypi.python.org/packages/source/n/numpy/numpy-1.6.2.tar.gz#md5=95ed6c9dcc94af1fc1642ea2a33c1bba
 tar -zxvf /tmp/numpy.tar.gz -C /tmp/
 python /tmp/numpy-1.6.2/setup.py install

From 1a5fc065ad67249d2b8740a4b1f959e744e818e0 Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@mitx.mit.edu>
Date: Mon, 14 Jan 2013 08:08:31 -0500
Subject: [PATCH 341/541] Add beta test group management view to instructor
 dashboard

* still needs to support uploading a list
* also want to clean up and refactor the code a bit
---
 lms/djangoapps/courseware/access.py           |   4 +-
 lms/djangoapps/courseware/tests/tests.py      |   4 +-
 lms/djangoapps/instructor/tests.py            |   2 +-
 lms/djangoapps/instructor/views.py            | 148 +++++++++++++-----
 .../courseware/instructor_dashboard.html      |  20 ++-
 5 files changed, 133 insertions(+), 45 deletions(-)

diff --git a/lms/djangoapps/courseware/access.py b/lms/djangoapps/courseware/access.py
index f4e4a95e07..64bef8fa1a 100644
--- a/lms/djangoapps/courseware/access.py
+++ b/lms/djangoapps/courseware/access.py
@@ -329,7 +329,7 @@ def _course_staff_group_name(location):
     """
     return 'staff_%s' % Location(location).course
 
-def _course_beta_test_group_name(location):
+def course_beta_test_group_name(location):
     """
     Get the name of the beta tester group for a location.  Right now, that's
     beta_testers_COURSE.
@@ -388,7 +388,7 @@ def _adjust_start_date_for_beta_testers(user, descriptor):
 
     user_groups = [g.name for g in user.groups.all()]
 
-    beta_group = _course_beta_test_group_name(descriptor.location)
+    beta_group = course_beta_test_group_name(descriptor.location)
     if beta_group in user_groups:
         debug("Adjust start time: user in group %s", beta_group)
         # time_structs don't support subtraction, so convert to datetimes,
diff --git a/lms/djangoapps/courseware/tests/tests.py b/lms/djangoapps/courseware/tests/tests.py
index 6972ded307..eeb304b193 100644
--- a/lms/djangoapps/courseware/tests/tests.py
+++ b/lms/djangoapps/courseware/tests/tests.py
@@ -18,7 +18,7 @@ import xmodule.modulestore.django
 # Need access to internal func to put users in the right group
 from courseware import grades
 from courseware.access import (has_access, _course_staff_group_name,
-                               _course_beta_test_group_name)
+                               course_beta_test_group_name)
 from courseware.models import StudentModuleCache
 
 from student.models import Registration
@@ -645,7 +645,7 @@ class TestViewAuth(PageLoader):
         self.assertFalse(has_access(student_user, self.toy, 'load'))
 
         # now add the student to the beta test group
-        group_name = _course_beta_test_group_name(self.toy.location)
+        group_name = course_beta_test_group_name(self.toy.location)
         g = Group.objects.create(name=group_name)
         g.user_set.add(student_user)
 
diff --git a/lms/djangoapps/instructor/tests.py b/lms/djangoapps/instructor/tests.py
index 2d17cee47d..57c0436921 100644
--- a/lms/djangoapps/instructor/tests.py
+++ b/lms/djangoapps/instructor/tests.py
@@ -179,7 +179,7 @@ class TestInstructorDashboardForumAdmin(ct.PageLoader):
             self.assertTrue(response.content.find('Removed "{0}" from "{1}" forum role = "{2}"'.format(username, course.id, rolename))>=0)
             self.assertFalse(has_forum_access(username, course.id, rolename))
 
-    def test_add_and_readd_forum_admin_users(self):
+    def test_add_and_read_forum_admin_users(self):
         course = self.toy
         self.initialize_roles(course.id)
         url = reverse('instructor_dashboard', kwargs={'course_id': course.id})
diff --git a/lms/djangoapps/instructor/views.py b/lms/djangoapps/instructor/views.py
index 2d58799efe..1519d876bb 100644
--- a/lms/djangoapps/instructor/views.py
+++ b/lms/djangoapps/instructor/views.py
@@ -19,9 +19,13 @@ from mitxmako.shortcuts import render_to_response
 from django.core.urlresolvers import reverse
 
 from courseware import grades
-from courseware.access import has_access, get_access_group_name
-from courseware.courses import get_course_with_access 
-from django_comment_client.models import Role, FORUM_ROLE_ADMINISTRATOR, FORUM_ROLE_MODERATOR, FORUM_ROLE_COMMUNITY_TA
+from courseware.access import (has_access, get_access_group_name,
+                               course_beta_test_group_name)
+from courseware.courses import get_course_with_access
+from django_comment_client.models import (Role,
+                                          FORUM_ROLE_ADMINISTRATOR,
+                                          FORUM_ROLE_MODERATOR,
+                                          FORUM_ROLE_COMMUNITY_TA)
 from django_comment_client.utils import has_forum_access
 from psychometrics import psychoanalyze
 from student.models import CourseEnrollment, CourseEnrollmentAllowed
@@ -44,13 +48,12 @@ FORUM_ROLE_REMOVE = 'remove'
 
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
-
 def instructor_dashboard(request, course_id):
     """Display the instructor dashboard for a course."""
     course = get_course_with_access(request.user, course_id, 'staff')
 
     instructor_access = has_access(request.user, course, 'instructor')   # an instructor can manage staff lists
-    
+
     forum_admin_access = has_forum_access(request.user, course_id, FORUM_ROLE_ADMINISTRATOR)
 
     msg = ''
@@ -105,6 +108,16 @@ def instructor_dashboard(request, course_id):
         except Group.DoesNotExist:
             group = Group(name=grpname)     # create the group
             group.save()
+
+    def get_beta_group(course):
+        """
+        Get the group for beta testers of course.
+        """
+        # Not using get_group because there is no access control action called
+        # 'beta', so adding it to get_access_group_name doesn't really make
+        # sense.
+        name = course_beta_test_group_name(course.location)
+        (group, created) = Group.objects.get_or_create(name=name)
         return group
 
     # process actions from form POST
@@ -310,26 +323,64 @@ def instructor_dashboard(request, course_id):
             user.groups.remove(group)
             track.views.server_track(request, 'remove-instructor {0}'.format(user), {}, page='idashboard')
 
+    #----------------------------------------
+    # Group management
+
+    elif 'List beta testers' in action:
+        group = get_beta_group(course)
+        msg += 'Beta test group = {0}'.format(group.name)
+        datatable = _group_members_table(group, "List of beta_testers", course_id)
+        track.views.server_track(request, 'list-beta-testers', {}, page='idashboard')
+
+    elif action == 'Add beta testers':
+        uname = request.POST['betausers']
+        try:
+            user = User.objects.get(username=uname)
+        except User.DoesNotExist:
+            msg += '<font color="red">Error: unknown username "{0}"</font>'.format(uname)
+            user = None
+        if user is not None:
+            group = get_beta_group(course)
+            msg += '<font color="green">Added {0} to beta testers group = {1}</font>'.format(user, group.name)
+            log.debug('staffgrp={0}'.format(group.name))
+            user.groups.add(group)
+            track.views.server_track(request, 'add-beta-tester {0}'.format(user), {}, page='idashboard')
+
+    elif action == 'Remove beta testers':
+        uname = request.POST['betausers']
+        try:
+            user = User.objects.get(username=uname)
+        except User.DoesNotExist:
+            msg += '<font color="red">Error: unknown username "{0}"</font>'.format(uname)
+            user = None
+        if user is not None:
+            group = get_beta_group(course)
+            msg += '<font color="green">Removed {0} from beta tester group = {1}</font>'.format(user, group.name)
+            log.debug('staffgrp={0}'.format(group.name))
+            user.groups.remove(group)
+            track.views.server_track(request, 'remove-beta-tester {0}'.format(user), {}, page='idashboard')
+
+
     #----------------------------------------
     # forum administration
-  
+
     elif action == 'List course forum admins':
         rolename = FORUM_ROLE_ADMINISTRATOR
         datatable = {}
         msg += _list_course_forum_members(course_id, rolename, datatable)
         track.views.server_track(request, 'list-{0}'.format(rolename), {}, page='idashboard')
-        
-    
+
+
     elif action == 'Remove forum admin':
         uname = request.POST['forumadmin']
         msg += _update_forum_role_membership(uname, course, FORUM_ROLE_ADMINISTRATOR, FORUM_ROLE_REMOVE)
-        track.views.server_track(request, '{0} {1} as {2} for {3}'.format(FORUM_ROLE_REMOVE, uname, FORUM_ROLE_ADMINISTRATOR, course_id), 
+        track.views.server_track(request, '{0} {1} as {2} for {3}'.format(FORUM_ROLE_REMOVE, uname, FORUM_ROLE_ADMINISTRATOR, course_id),
                                  {}, page='idashboard')
 
     elif action == 'Add forum admin':
         uname = request.POST['forumadmin']
         msg += _update_forum_role_membership(uname, course, FORUM_ROLE_ADMINISTRATOR, FORUM_ROLE_ADD)
-        track.views.server_track(request, '{0} {1} as {2} for {3}'.format(FORUM_ROLE_ADD, uname, FORUM_ROLE_ADMINISTRATOR, course_id), 
+        track.views.server_track(request, '{0} {1} as {2} for {3}'.format(FORUM_ROLE_ADD, uname, FORUM_ROLE_ADMINISTRATOR, course_id),
                                  {}, page='idashboard')
 
     elif action == 'List course forum moderators':
@@ -337,35 +388,35 @@ def instructor_dashboard(request, course_id):
         datatable = {}
         msg += _list_course_forum_members(course_id, rolename, datatable)
         track.views.server_track(request, 'list-{0}'.format(rolename), {}, page='idashboard')
-    
+
     elif action == 'Remove forum moderator':
         uname = request.POST['forummoderator']
         msg += _update_forum_role_membership(uname, course, FORUM_ROLE_MODERATOR, FORUM_ROLE_REMOVE)
-        track.views.server_track(request, '{0} {1} as {2} for {3}'.format(FORUM_ROLE_REMOVE, uname, FORUM_ROLE_MODERATOR, course_id), 
+        track.views.server_track(request, '{0} {1} as {2} for {3}'.format(FORUM_ROLE_REMOVE, uname, FORUM_ROLE_MODERATOR, course_id),
                                  {}, page='idashboard')
-    
+
     elif action == 'Add forum moderator':
         uname = request.POST['forummoderator']
         msg += _update_forum_role_membership(uname, course, FORUM_ROLE_MODERATOR, FORUM_ROLE_ADD)
-        track.views.server_track(request, '{0} {1} as {2} for {3}'.format(FORUM_ROLE_ADD, uname, FORUM_ROLE_MODERATOR, course_id), 
+        track.views.server_track(request, '{0} {1} as {2} for {3}'.format(FORUM_ROLE_ADD, uname, FORUM_ROLE_MODERATOR, course_id),
                                  {}, page='idashboard')
-    
+
     elif action == 'List course forum community TAs':
         rolename = FORUM_ROLE_COMMUNITY_TA
         datatable = {}
         msg += _list_course_forum_members(course_id, rolename, datatable)
         track.views.server_track(request, 'list-{0}'.format(rolename), {}, page='idashboard')
-    
+
     elif action == 'Remove forum community TA':
         uname = request.POST['forummoderator']
         msg += _update_forum_role_membership(uname, course, FORUM_ROLE_COMMUNITY_TA, FORUM_ROLE_REMOVE)
-        track.views.server_track(request, '{0} {1} as {2} for {3}'.format(FORUM_ROLE_REMOVE, uname, FORUM_ROLE_COMMUNITY_TA, course_id), 
+        track.views.server_track(request, '{0} {1} as {2} for {3}'.format(FORUM_ROLE_REMOVE, uname, FORUM_ROLE_COMMUNITY_TA, course_id),
                                  {}, page='idashboard')
-    
+
     elif action == 'Add forum community TA':
         uname = request.POST['forummoderator']
         msg += _update_forum_role_membership(uname, course, FORUM_ROLE_COMMUNITY_TA, FORUM_ROLE_ADD)
-        track.views.server_track(request, '{0} {1} as {2} for {3}'.format(FORUM_ROLE_ADD, uname, FORUM_ROLE_COMMUNITY_TA, course_id), 
+        track.views.server_track(request, '{0} {1} as {2} for {3}'.format(FORUM_ROLE_ADD, uname, FORUM_ROLE_COMMUNITY_TA, course_id),
                                  {}, page='idashboard')
 
     #----------------------------------------
@@ -418,7 +469,7 @@ def instructor_dashboard(request, course_id):
         msg2, datatable = _do_remote_gradebook(request.user, course, 'get-sections')
         msg += msg2
 
-    elif action in ['List students in section in remote gradebook', 
+    elif action in ['List students in section in remote gradebook',
                     'Overload enrollment list using remote gradebook',
                     'Merge enrollment list with remote gradebook']:
 
@@ -431,7 +482,7 @@ def instructor_dashboard(request, course_id):
             overload = 'Overload' in action
             ret = _do_enroll_students(course, course_id, students, overload=overload)
             datatable = ret['datatable']
-        
+
 
     #----------------------------------------
     # psychometrics
@@ -448,7 +499,7 @@ def instructor_dashboard(request, course_id):
 
     #----------------------------------------
     # offline grades?
-    
+
     if use_offline:
         msg += "<br/><font color='orange'>Grades from %s</font>" % offline_grades_available(course_id)
 
@@ -482,17 +533,17 @@ def _do_remote_gradebook(user, course, action, args=None, files=None):
     if not rg:
         msg = "No remote gradebook defined in course metadata"
         return msg, {}
-    
+
     rgurl = settings.MITX_FEATURES.get('REMOTE_GRADEBOOK_URL','')
     if not rgurl:
         msg = "No remote gradebook url defined in settings.MITX_FEATURES"
         return msg, {}
-    
+
     rgname = rg.get('name','')
     if not rgname:
         msg = "No gradebook name defined in course remote_gradebook metadata"
         return msg, {}
-    
+
     if args is None:
         args = {}
     data = dict(submit=action, gradebook=rgname, user=user.email)
@@ -522,15 +573,15 @@ def _do_remote_gradebook(user, course, action, args=None, files=None):
     return msg, datatable
 
 def _list_course_forum_members(course_id, rolename, datatable):
-    ''' 
+    """
     Fills in datatable with forum membership information, for a given role,
     so that it will be displayed on instructor dashboard.
-    
+
       course_ID = the ID string for a course
       rolename = one of "Administrator", "Moderator", "Community TA"
-    
+
     Returns message status string to append to displayed message, if role is unknown.
-    '''
+    """
     # make sure datatable is set up properly for display first, before checking for errors
     datatable['header'] = ['Username', 'Full name', 'Roles']
     datatable['title'] = 'List of Forum {0}s in course {1}'.format(rolename, course_id)
@@ -549,13 +600,13 @@ def _list_course_forum_members(course_id, rolename, datatable):
 def _update_forum_role_membership(uname, course, rolename, add_or_remove):
     '''
     Supports adding a user to a course's forum role
-    
+
       uname = username string for user
-      course = course object 
+      course = course object
       rolename = one of "Administrator", "Moderator", "Community TA"
       add_or_remove = one of "add" or "remove"
-      
-    Returns message status string to append to displayed message,  Status is returned if user 
+
+    Returns message status string to append to displayed message,  Status is returned if user
     or role is unknown, or if entry already exists when adding, or if entry doesn't exist when removing.
     '''
     # check that username and rolename are valid:
@@ -575,21 +626,42 @@ def _update_forum_role_membership(uname, course, rolename, add_or_remove):
     if add_or_remove == FORUM_ROLE_REMOVE:
         if not alreadyexists:
             msg ='<font color="red">Error: user "{0}" does not have rolename "{1}", cannot remove</font>'.format(uname, rolename)
-        else: 
+        else:
             user.roles.remove(role)
             msg = '<font color="green">Removed "{0}" from "{1}" forum role = "{2}"</font>'.format(user, course.id, rolename)
     else:
         if alreadyexists:
             msg = '<font color="red">Error: user "{0}" already has rolename "{1}", cannot add</font>'.format(uname, rolename)
-        else: 
-            if (rolename == FORUM_ROLE_ADMINISTRATOR and not has_access(user, course, 'staff')):   
+        else:
+            if (rolename == FORUM_ROLE_ADMINISTRATOR and not has_access(user, course, 'staff')):
                 msg = '<font color="red">Error: user "{0}" should first be added as staff before adding as a forum administrator, cannot add</font>'.format(uname)
             else:
                 user.roles.add(role)
                 msg = '<font color="green">Added "{0}" to "{1}" forum role = "{2}"</font>'.format(user, course.id, rolename)
 
     return msg
-    
+
+def _group_members_table(group, title, course_id):
+    """
+    Return a data table of usernames and names of users in group_name.
+
+    Arguments:
+        group -- a django group.
+        title -- a descriptive title to show the user
+
+    Returns:
+        a dictionary with keys
+        'header': ['Username', 'Full name'],
+        'data': [[username, name] for all users]
+        'title': "{title} in course {course}"
+    """
+    uset = group.user_set.all()
+    datatable = {'header': ['Username', 'Full name']}
+    datatable['data'] = [[x.username, x.profile.name] for x in uset]
+    datatable['title'] = '{0} in course {1}'.format(title, course_id)
+    return datatable
+
+
 
 def get_student_grade_summary_data(request, course, course_id, get_grades=True, get_raw_scores=False, use_offline=False):
     '''
@@ -750,7 +822,7 @@ def _do_enroll_students(course, course_id, students, overload=False):
 
     def sf(stat): return [x for x in status if status[x]==stat]
 
-    data = dict(added=sf('added'), rejected=sf('rejected')+sf('exists'), 
+    data = dict(added=sf('added'), rejected=sf('rejected')+sf('exists'),
                 deleted=sf('deleted'), datatable=datatable)
 
     return data
diff --git a/lms/templates/courseware/instructor_dashboard.html b/lms/templates/courseware/instructor_dashboard.html
index 7f1912cd45..04248336e5 100644
--- a/lms/templates/courseware/instructor_dashboard.html
+++ b/lms/templates/courseware/instructor_dashboard.html
@@ -59,7 +59,7 @@ function goto( mode)
           <a href="#" onclick="goto('Admin');" class="${modeflag.get('Admin')}">Admin</a> |
           <a href="#" onclick="goto('Forum Admin');" class="${modeflag.get('Forum Admin')}">Forum Admin</a> |
           <a href="#" onclick="goto('Enrollment');" class="${modeflag.get('Enrollment')}">Enrollment</a>
-	 ]
+          <a href="#" onclick="goto('Manage Groups');" class="${modeflag.get('Manage Groups')}">Manage Groups</a> ]
     </h2>
 
   <div style="text-align:right"><span id="djangopid">${djangopid}</span>
@@ -168,7 +168,8 @@ function goto( mode)
     <p>
     <input type="submit" name="action" value="List course staff members">
     <p>
-    <input type="text" name="staffuser"> <input type="submit" name="action" value="Remove course staff">
+    <input type="text" name="staffuser">
+    <input type="submit" name="action" value="Remove course staff">
     <input type="submit" name="action" value="Add course staff">
     <hr width="40%" style="align:left">
   %endif
@@ -258,6 +259,21 @@ function goto( mode)
 
 ##----------------------------------------------------------------------------- 
 
+%if modeflag.get('Manage Groups'):
+  %if instructor_access:
+    <hr width="40%" style="align:left">
+    <p>
+    <input type="submit" name="action" value="List beta testers">
+    <p>
+    Enter usernames or emails for students who should be beta-testers.  They will get to see course materials early, as configured via the <tt>days_early_for_beta</tt> option in the course policy.
+    </p>
+    <input type="textarea" name="betausers">
+    <input type="submit" name="action" value="Add beta testers">
+    <input type="submit" name="action" value="Remove beta testers">
+    <hr width="40%" style="align:left">
+  %endif
+%endif
+
     </form>
 
 ##----------------------------------------------------------------------------- 

From 3f654af7cd48b309cb3ce3e6e0d6c539284bde85 Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@edx.org>
Date: Mon, 14 Jan 2013 09:22:57 -0500
Subject: [PATCH 342/541] Refactor common code, fix view a bit

remaining:
 * support putting multiple names / emails in the big box we now have
---
 lms/djangoapps/instructor/views.py            | 120 ++++++++++--------
 .../courseware/instructor_dashboard.html      |   9 +-
 2 files changed, 77 insertions(+), 52 deletions(-)

diff --git a/lms/djangoapps/instructor/views.py b/lms/djangoapps/instructor/views.py
index 1519d876bb..99d96cad95 100644
--- a/lms/djangoapps/instructor/views.py
+++ b/lms/djangoapps/instructor/views.py
@@ -250,11 +250,7 @@ def instructor_dashboard(request, course_id):
     elif 'List course staff' in action:
         group = get_staff_group(course)
         msg += 'Staff group = {0}'.format(group.name)
-        log.debug('staffgrp={0}'.format(group.name))
-        uset = group.user_set.all()
-        datatable = {'header': ['Username', 'Full name']}
-        datatable['data'] = [[x.username, x.profile.name] for x in uset]
-        datatable['title'] = 'List of Staff in course {0}'.format(course_id)
+        datatable = _group_members_table(group, "List of Staff", course_id)
         track.views.server_track(request, 'list-staff', {}, page='idashboard')
 
     elif 'List course instructors' in action and request.user.is_staff:
@@ -269,17 +265,8 @@ def instructor_dashboard(request, course_id):
 
     elif action == 'Add course staff':
         uname = request.POST['staffuser']
-        try:
-            user = User.objects.get(username=uname)
-        except User.DoesNotExist:
-            msg += '<font color="red">Error: unknown username "{0}"</font>'.format(uname)
-            user = None
-        if user is not None:
-            group = get_staff_group(course)
-            msg += '<font color="green">Added {0} to staff group = {1}</font>'.format(user, group.name)
-            log.debug('staffgrp={0}'.format(group.name))
-            user.groups.add(group)
-            track.views.server_track(request, 'add-staff {0}'.format(user), {}, page='idashboard')
+        group = get_staff_group(course)
+        msg += add_user_to_group(request, uname, group, 'staff', 'staff')
 
     elif action == 'Add instructor' and request.user.is_staff:
         uname = request.POST['instructor']
@@ -297,17 +284,8 @@ def instructor_dashboard(request, course_id):
 
     elif action == 'Remove course staff':
         uname = request.POST['staffuser']
-        try:
-            user = User.objects.get(username=uname)
-        except User.DoesNotExist:
-            msg += '<font color="red">Error: unknown username "{0}"</font>'.format(uname)
-            user = None
-        if user is not None:
-            group = get_staff_group(course)
-            msg += '<font color="green">Removed {0} from staff group = {1}</font>'.format(user, group.name)
-            log.debug('staffgrp={0}'.format(group.name))
-            user.groups.remove(group)
-            track.views.server_track(request, 'remove-staff {0}'.format(user), {}, page='idashboard')
+        group = get_staff_group(course)
+        msg += remove_user_from_group(request, uname, group, 'staff', 'staff')
 
     elif action == 'Remove instructor' and request.user.is_staff:
         uname = request.POST['instructor']
@@ -334,32 +312,13 @@ def instructor_dashboard(request, course_id):
 
     elif action == 'Add beta testers':
         uname = request.POST['betausers']
-        try:
-            user = User.objects.get(username=uname)
-        except User.DoesNotExist:
-            msg += '<font color="red">Error: unknown username "{0}"</font>'.format(uname)
-            user = None
-        if user is not None:
-            group = get_beta_group(course)
-            msg += '<font color="green">Added {0} to beta testers group = {1}</font>'.format(user, group.name)
-            log.debug('staffgrp={0}'.format(group.name))
-            user.groups.add(group)
-            track.views.server_track(request, 'add-beta-tester {0}'.format(user), {}, page='idashboard')
+        group = get_beta_group(course)
+        msg += add_user_to_group(request, uname, group, 'beta testers', 'beta-tester')
 
     elif action == 'Remove beta testers':
         uname = request.POST['betausers']
-        try:
-            user = User.objects.get(username=uname)
-        except User.DoesNotExist:
-            msg += '<font color="red">Error: unknown username "{0}"</font>'.format(uname)
-            user = None
-        if user is not None:
-            group = get_beta_group(course)
-            msg += '<font color="green">Removed {0} from beta tester group = {1}</font>'.format(user, group.name)
-            log.debug('staffgrp={0}'.format(group.name))
-            user.groups.remove(group)
-            track.views.server_track(request, 'remove-beta-tester {0}'.format(user), {}, page='idashboard')
-
+        group = get_beta_group(course)
+        msg += remove_user_from_group(request, uname, group, 'beta testers', 'beta-tester')
 
     #----------------------------------------
     # forum administration
@@ -661,6 +620,67 @@ def _group_members_table(group, title, course_id):
     datatable['title'] = '{0} in course {1}'.format(title, course_id)
     return datatable
 
+def add_user_to_group(request, username_or_email, group, group_title, event_name):
+    """
+    Look up the given user by username (if no '@') or email (otherwise), and add them to group.
+
+    Arguments:
+       request: django request--used for tracking log
+       username_or_email: who to add.  Decide if it's an email by presense of an '@'
+       group: django group object
+       group_title: what to call this group in messages to user--e.g. "beta-testers".
+       event_name: what to call this event when logging to tracking logs.
+
+    Returns:
+       html to insert in the message field
+    """
+    user = None
+    try:
+        if '@' in username_or_email:
+            user = User.objects.get(email=username_or_email)
+        else:
+            user = User.objects.get(username=username_or_email)
+    except User.DoesNotExist:
+        msg = '<font color="red">Error: unknown username "{0}"</font>'.format(uname)
+        user = None
+
+    if user is not None:
+        msg = '<font color="green">Added {0} to {1} group = {2}</font>'.format(user, group_title, group.name)
+        user.groups.add(group)
+        track.views.server_track(request, 'add-{0} {1}'.format(event_name, user), {}, page='idashboard')
+
+    return msg
+
+def remove_user_from_group(request, username_or_email, group, group_title, event_name):
+    """
+    Look up the given user by username (if no '@') or email (otherwise), and remove them from group.
+
+    Arguments:
+       request: django request--used for tracking log
+       username_or_email: who to remove.  Decide if it's an email by presense of an '@'
+       group: django group object
+       group_title: what to call this group in messages to user--e.g. "beta-testers".
+       event_name: what to call this event when logging to tracking logs.
+
+    Returns:
+       html to insert in the message field
+    """
+    user = None
+    try:
+        if '@' in username_or_email:
+            user = User.objects.get(email=username_or_email)
+        else:
+            user = User.objects.get(username=username_or_email)
+    except User.DoesNotExist:
+        msg = '<font color="red">Error: unknown username "{0}"</font>'.format(uname)
+        user = None
+
+    if user is not None:
+        msg = '<font color="green">Removed {0} from {1} group = {2}</font>'.format(user, group_title, group.name)
+        user.groups.remove(group)
+        track.views.server_track(request, 'remove-{0} {1}'.format(event_name, user), {}, page='idashboard')
+
+    return msg
 
 
 def get_student_grade_summary_data(request, course, course_id, get_grades=True, get_raw_scores=False, use_offline=False):
diff --git a/lms/templates/courseware/instructor_dashboard.html b/lms/templates/courseware/instructor_dashboard.html
index 04248336e5..b12d17dced 100644
--- a/lms/templates/courseware/instructor_dashboard.html
+++ b/lms/templates/courseware/instructor_dashboard.html
@@ -36,6 +36,9 @@ table.stat_table td {
 
 a.selectedmode { background-color: yellow; }
 
+textarea {
+  height: 200px;
+}
 </style>
 
 <script language="JavaScript" type="text/javascript">
@@ -267,9 +270,11 @@ function goto( mode)
     <p>
     Enter usernames or emails for students who should be beta-testers.  They will get to see course materials early, as configured via the <tt>days_early_for_beta</tt> option in the course policy.
     </p>
-    <input type="textarea" name="betausers">
-    <input type="submit" name="action" value="Add beta testers">
+    <p>
+    <textarea cols="50" row="30" name="betausers"></textarea>
     <input type="submit" name="action" value="Remove beta testers">
+    <input type="submit" name="action" value="Add beta testers">
+    </p>
     <hr width="40%" style="align:left">
   %endif
 %endif

From 570df1c9e668db55384be47431ccdaec3dfe37a2 Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@edx.org>
Date: Mon, 14 Jan 2013 10:27:14 -0500
Subject: [PATCH 343/541] Fix bugs, refactor, support lists of users

---
 lms/djangoapps/instructor/views.py            | 79 ++++++++++---------
 .../courseware/instructor_dashboard.html      |  3 +-
 2 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/lms/djangoapps/instructor/views.py b/lms/djangoapps/instructor/views.py
index 99d96cad95..e6aa6c2f2e 100644
--- a/lms/djangoapps/instructor/views.py
+++ b/lms/djangoapps/instructor/views.py
@@ -311,14 +311,19 @@ def instructor_dashboard(request, course_id):
         track.views.server_track(request, 'list-beta-testers', {}, page='idashboard')
 
     elif action == 'Add beta testers':
-        uname = request.POST['betausers']
+        users = request.POST['betausers']
+        log.debug("users: {0!r}".format(users))
         group = get_beta_group(course)
-        msg += add_user_to_group(request, uname, group, 'beta testers', 'beta-tester')
+        for username_or_email in users.split():
+            msg += "<p>{0}</p>".format(
+                add_user_to_group(request, username_or_email, group, 'beta testers', 'beta-tester'))
 
     elif action == 'Remove beta testers':
-        uname = request.POST['betausers']
+        users = request.POST['betausers']
         group = get_beta_group(course)
-        msg += remove_user_from_group(request, uname, group, 'beta testers', 'beta-tester')
+        for username_or_email in users.split():
+            msg += "<p>{0}</p>".format(
+                remove_user_from_group(request, username_or_email, group, 'beta testers', 'beta-tester'))
 
     #----------------------------------------
     # forum administration
@@ -620,6 +625,38 @@ def _group_members_table(group, title, course_id):
     datatable['title'] = '{0} in course {1}'.format(title, course_id)
     return datatable
 
+
+def _add_or_remove_user_group(request, username_or_email, group, group_title, event_name, do_add):
+    """
+    Implementation for both add and remove functions, to get rid of shared code.  do_add is bool that determines which
+    to do.
+    """
+    user = None
+    try:
+        if '@' in username_or_email:
+            user = User.objects.get(email=username_or_email)
+        else:
+            user = User.objects.get(username=username_or_email)
+    except User.DoesNotExist:
+        msg = '<font color="red">Error: unknown username or email "{0}"</font>'.format(username_or_email)
+        user = None
+
+    if user is not None:
+        action = "Added" if do_add else "Removed"
+        prep = "to" if do_add else "from"
+        msg = '<font color="green">{action} {0} {prep} {1} group = {2}</font>'.format(user, group_title, group.name,
+                                                                                  action=action, prep=prep)
+        if do_add:
+            user.groups.add(group)
+        else:
+            user.groups.remove(group)
+        event = "add" if do_add else "remove"
+        track.views.server_track(request, '{event}-{0} {1}'.format(event_name, user, event=event),
+                                 {}, page='idashboard')
+
+    return msg
+
+
 def add_user_to_group(request, username_or_email, group, group_title, event_name):
     """
     Look up the given user by username (if no '@') or email (otherwise), and add them to group.
@@ -634,22 +671,7 @@ def add_user_to_group(request, username_or_email, group, group_title, event_name
     Returns:
        html to insert in the message field
     """
-    user = None
-    try:
-        if '@' in username_or_email:
-            user = User.objects.get(email=username_or_email)
-        else:
-            user = User.objects.get(username=username_or_email)
-    except User.DoesNotExist:
-        msg = '<font color="red">Error: unknown username "{0}"</font>'.format(uname)
-        user = None
-
-    if user is not None:
-        msg = '<font color="green">Added {0} to {1} group = {2}</font>'.format(user, group_title, group.name)
-        user.groups.add(group)
-        track.views.server_track(request, 'add-{0} {1}'.format(event_name, user), {}, page='idashboard')
-
-    return msg
+    return _add_or_remove_user_group(request, username_or_email, group, group_title, event_name, True)
 
 def remove_user_from_group(request, username_or_email, group, group_title, event_name):
     """
@@ -665,22 +687,7 @@ def remove_user_from_group(request, username_or_email, group, group_title, event
     Returns:
        html to insert in the message field
     """
-    user = None
-    try:
-        if '@' in username_or_email:
-            user = User.objects.get(email=username_or_email)
-        else:
-            user = User.objects.get(username=username_or_email)
-    except User.DoesNotExist:
-        msg = '<font color="red">Error: unknown username "{0}"</font>'.format(uname)
-        user = None
-
-    if user is not None:
-        msg = '<font color="green">Removed {0} from {1} group = {2}</font>'.format(user, group_title, group.name)
-        user.groups.remove(group)
-        track.views.server_track(request, 'remove-{0} {1}'.format(event_name, user), {}, page='idashboard')
-
-    return msg
+    return _add_or_remove_user_group(request, username_or_email, group, group_title, event_name, False)
 
 
 def get_student_grade_summary_data(request, course, course_id, get_grades=True, get_raw_scores=False, use_offline=False):
diff --git a/lms/templates/courseware/instructor_dashboard.html b/lms/templates/courseware/instructor_dashboard.html
index b12d17dced..6bff32fc48 100644
--- a/lms/templates/courseware/instructor_dashboard.html
+++ b/lms/templates/courseware/instructor_dashboard.html
@@ -268,7 +268,8 @@ function goto( mode)
     <p>
     <input type="submit" name="action" value="List beta testers">
     <p>
-    Enter usernames or emails for students who should be beta-testers.  They will get to see course materials early, as configured via the <tt>days_early_for_beta</tt> option in the course policy.
+    Enter usernames or emails for students who should be beta-testers, one per line.  They will get to
+    see course materials early, as configured via the <tt>days_early_for_beta</tt> option in the course policy.
     </p>
     <p>
     <textarea cols="50" row="30" name="betausers"></textarea>

From 2f7210ed0c51a915d6f48cb6599432adeb666411 Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@edx.org>
Date: Mon, 14 Jan 2013 11:35:12 -0500
Subject: [PATCH 344/541] address Ike's comments

---
 common/lib/xmodule/xmodule/x_module.py | 7 +++++--
 doc/xml-format.md                      | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py
index 12de947a5e..a1d9cdda9b 100644
--- a/common/lib/xmodule/xmodule/x_module.py
+++ b/common/lib/xmodule/xmodule/x_module.py
@@ -515,7 +515,10 @@ class XModuleDescriptor(Plugin, HTMLSnippet, ResourceTemplates):
         """
         if 'days_early_for_beta' not in self.metadata:
             return None
-        return float(self.metadata['days_early_for_beta'])
+        try:
+            return float(self.metadata['days_early_for_beta'])
+        except ValueError:
+            return None
 
 
     @property
@@ -730,7 +733,7 @@ class XModuleDescriptor(Plugin, HTMLSnippet, ResourceTemplates):
         """
         Parse an optional metadata key containing a time: if present, complain
         if it doesn't parse.
-        
+
         Returns a time_struct, or None if metadata key is not present or is invalid.
         """
         if key in self.metadata:
diff --git a/doc/xml-format.md b/doc/xml-format.md
index e4bbc0d4db..8138de4d7e 100644
--- a/doc/xml-format.md
+++ b/doc/xml-format.md
@@ -257,7 +257,7 @@ Supported fields at the course level:
 * "tabs" -- have custom tabs in the courseware.  See below for details on config.
 * "discussion_blackouts" -- An array of time intervals during which you want to disable a student's ability to create or edit posts in the forum. Moderators, Community TAs, and Admins are unaffected. You might use this during exam periods, but please be aware that the forum is often a very good place to catch mistakes and clarify points to students. The better long term solution would be to have better flagging/moderation mechanisms, but this is the hammer we have today. Format by example: [["2012-10-29T04:00", "2012-11-03T04:00"], ["2012-12-30T04:00", "2013-01-02T04:00"]]
 * "show_calculator" (value "Yes" if desired)
-* "days_early_for_beta" -- number of days early that students in the beta-testers group get to see course content.  Can also be specified for any other course element, and overrides values set at higher levels.
+* "days_early_for_beta" -- number of days (floating point ok) early that students in the beta-testers group get to see course content.  Can also be specified for any other course element, and overrides values set at higher levels.
 * TODO: there are others
 
 ### Grading policy file contents

From 02d5cfd14d4547a239db735d66016c3d0778a4ad Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@edx.org>
Date: Tue, 15 Jan 2013 11:36:12 -0500
Subject: [PATCH 345/541] add comment about time format conversion

---
 lms/djangoapps/courseware/access.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lms/djangoapps/courseware/access.py b/lms/djangoapps/courseware/access.py
index 64bef8fa1a..c7e09526c9 100644
--- a/lms/djangoapps/courseware/access.py
+++ b/lms/djangoapps/courseware/access.py
@@ -393,6 +393,8 @@ def _adjust_start_date_for_beta_testers(user, descriptor):
         debug("Adjust start time: user in group %s", beta_group)
         # time_structs don't support subtraction, so convert to datetimes,
         # subtract, convert back.
+        # (fun fact: datetime(*a_time_struct[:6]) is the beautiful syntax for
+        # converting time_structs into datetimes)
         start_as_datetime = datetime(*descriptor.start[:6])
         delta = timedelta(descriptor.days_early_for_beta)
         effective = start_as_datetime - delta

From c8f52deb3d4c6b5b7c5ce37823f8b477886ccf21 Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Tue, 15 Jan 2013 11:55:36 -0500
Subject: [PATCH 346/541] wire up registration closed functionality

---
 lms/templates/test_center_register.html | 76 +++++++++++++------------
 1 file changed, 39 insertions(+), 37 deletions(-)

diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index 6ffba957bb..3076924411 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -109,39 +109,35 @@
   %>
 
   % if registration:
-  
-   % if  registration.is_rejected:      
-  <section class="status message message-flash registration-rejected message-action">
-    <h3 class="message-title">Your registration for the Pearson exam has been rejected</h3>
-    <p class="message-copy">Please see your registration status details for more information.</p>
-   % endif
+    <!-- select one of four registration status banners to display -->
+    % if registration.is_accepted:
+    <section class="status message message-flash registration-processed message-action">
+      <h3 class="message-title">Your registration for the Pearson exam has been processed</h3>
+      <p class="message-copy">Your registration number is <strong>${registration.client_authorization_id}</strong>.  (Write this down! You’ll need it to schedule your exam.)</p>
+      <a href="${registration.registration_signup_url}" class="button exam-button">Schedule Pearson exam</a>
+    </section>
+    % endif
 
-   % if  registration.is_accepted:
-  <section class="status message message-flash registration-processed message-action">
-    <h3 class="message-title">Your registration for the Pearson exam has been processed</h3>
-    <p class="message-copy">Your registration number is <strong>${registration.client_authorization_id}</strong> (Write this down! You’ll need it to schedule your exam.)</p>
-    <a href="${registration.registration_signup_url}" class="button exam-button">Schedule Pearson exam</a>
-  </section>
-   % endif
+    % if registration.demographics_is_rejected:      
+    <section class="status message message-flash demographics-rejected message-action">
+      <h3 class="message-title">Your demographic information contained an error and was rejected</h3>
+      <p class="message-copy">Please check the information you provided, and correct the errors noted below.
+    </section>
+    % endif
+   
+    % if registration.registration_is_rejected:      
+    <section class="status message message-flash registration-rejected message-action">
+      <h3 class="message-title">Your registration for the Pearson exam has been rejected</h3>
+      <p class="message-copy">Please see your registration status details for more information.</p>
+    </section>
+    % endif
 
-   % if  registration.is_pending:
-  <section class="status message message-flash registration-pending">
+    % if registration.is_pending:
+   <section class="status message message-flash registration-pending">
     <h3 class="message-title">Your registration for the Pearson exam is pending</h3>
     <p class="message-copy">Once your information is processed, it will be forwarded to Pearson and you will be able to schedule an exam.</p>
-  </section>
-   % endif
-   
-   <!-- TODO: add logic for demographic error/rejected state (add this message to the page) -->
-   <section class="status message message-flash demographics-rejected message-action">
-     <h3 class="message-title">Your demographic information contained an error and was rejected</h3>
-     <p class="message-copy">Please check the information you provided, and correct the errors noted below.
-   </section>
-   
-   <!-- TODO: add logic for registration closed state (add this message to the page) -->
-   <section class="status message message-flash registration-closed">
-     <h3 class="message-title">Registration for this Pearson exam is closed</h3>
-     <p class="message-copy">Your registration status and previous information is available below, however you may not edit any of the information.
    </section>
+    % endif
 
   % endif
   
@@ -149,10 +145,16 @@
     <header>
       <h3 class="is-hidden">Registration Form</h3>
     </header>
-    <form id="testcenter_register_form" method="post" data-remote="true" action="/create_test_registration">
-    
-    <!-- TODO: add logic for registration closed state (add class of disabled to <form>) -->
-    <!-- <form id="testcenter_register_form" method="post" data-remote="true" action="/create_test_registration" class="disabled"> -->
+  % if exam_info.is_registering():  
+    <form id="testcenter_register_form" method="post" data-remote="true" action="/create_exam_registration">
+  % else:    
+    <form id="testcenter_register_form" method="post" data-remote="true" action="/create_exam_registration" class="disabled">
+      <!-- registration closed, so tell them they can't do anything: -->
+      <section class="status message message-flash registration-closed">
+        <h3 class="message-title">Registration for this Pearson exam is closed</h3>
+        <p class="message-copy">Your previous information is available below, however you may not edit any of the information.
+      </section>
+  % endif
       
       % if registration:
       <p class="instructions">
@@ -168,7 +170,7 @@
       <input id="id_email" type="hidden" name="email" value="${user.email}" />
       <input id="id_username" type="hidden" name="username" value="${user.username}" />
       <input id="id_course_id" type="hidden" name="course_id" value="${course.id}" />
-      <input id="id_course_id" type="hidden" name="exam_series_code" value="${exam_info.exam_series_code}" />
+      <input id="id_exam_series_code" type="hidden" name="exam_series_code" value="${exam_info.exam_series_code}" />
 
       <div class="form-fields-primary">
         <fieldset class="group group-form group-form-personalinformation">
@@ -283,10 +285,10 @@
 
         % if registration:
           % if registration.accommodation_request and len(registration.accommodation_request) > 0:
-        <p class="note"><span class="title">Note</span>: Your previously accomodation requests below need to be reviewed in detail <strong>and will add asignificant delay to your registration process</strong>.</p>
+        <p class="note"><span class="title">Note</span>: Your previous accommodation request below needs to be reviewed in detail <strong>and will add a significant delay to your registration process</strong>.</p>
           % endif
         % else: 
-        <p class="note"><span class="title">Note</span>: Accommodation requests are not part of your demographic information, <strong>and cannot be changed once submitted</strong>. Accomodation requests, which are reviewed on a case-by-case basis, <strong>will add significant delay to the registration process</strong>.</p>
+        <p class="note"><span class="title">Note</span>: Accommodation requests are not part of your demographic information, <strong>and cannot be changed once submitted</strong>. Accommodation requests, which are reviewed on a case-by-case basis, <strong>will add significant delay to the registration process</strong>.</p>
         % endif
                   
         <fieldset class="group group-form group-form-optional">
@@ -328,10 +330,10 @@
 
     % if registration:
       % if registration.accommodation_request and len(registration.accommodation_request) > 0:
-    <a class="actions form-fields-secondary-visibility is-hidden" href="#form-fields-secondary">Special (<abbr title="Americans with Disabilities Act">ADA</abbr>) Accommdations</a>
+    <a class="actions form-fields-secondary-visibility is-hidden" href="#form-fields-secondary">Special (<abbr title="Americans with Disabilities Act">ADA</abbr>) Accommodations</a>
       % endif
     % else: 
-    <a class="actions form-fields-secondary-visibility" href="#form-fields-secondary">Special (<abbr title="Americans with Disabilities Act">ADA</abbr>) Accommdations</a>
+    <a class="actions form-fields-secondary-visibility" href="#form-fields-secondary">Special (<abbr title="Americans with Disabilities Act">ADA</abbr>) Accommodations</a>
     % endif
   </section>
     

From d025ca248f628dbfadf7d399ae213a7de6fb5902 Mon Sep 17 00:00:00 2001
From: John Hess <mgojohn@gmail.com>
Date: Mon, 14 Jan 2013 20:42:07 -0500
Subject: [PATCH 347/541] Added instructor tools for resetting attempts on a
 single student's problem to 0 and for getting student's progress page

---
 lms/djangoapps/instructor/views.py            | 52 +++++++++++++++++++
 .../courseware/instructor_dashboard.html      | 11 ++--
 2 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/lms/djangoapps/instructor/views.py b/lms/djangoapps/instructor/views.py
index 2d58799efe..e65f358e38 100644
--- a/lms/djangoapps/instructor/views.py
+++ b/lms/djangoapps/instructor/views.py
@@ -7,6 +7,7 @@ import logging
 import os
 import requests
 import urllib
+import json
 
 from StringIO import StringIO
 
@@ -25,6 +26,7 @@ from django_comment_client.models import Role, FORUM_ROLE_ADMINISTRATOR, FORUM_R
 from django_comment_client.utils import has_forum_access
 from psychometrics import psychoanalyze
 from student.models import CourseEnrollment, CourseEnrollmentAllowed
+from courseware.models import StudentModule
 from xmodule.course_module import CourseDescriptor
 from xmodule.modulestore import Location
 from xmodule.modulestore.django import modulestore
@@ -172,6 +174,56 @@ def instructor_dashboard(request, course_id):
         track.views.server_track(request, 'dump-answer-dist-csv', {}, page='idashboard')
         return return_csv('answer_dist_{0}.csv'.format(course_id), get_answers_distribution(request, course_id))
 
+    elif "Reset student's attempts" in action:
+        # get the form data
+        unique_student_identifier=request.POST.get('unique_student_identifier','')
+        problem_to_reset=request.POST.get('problem_to_reset','')
+        
+        if problem_to_reset[-4:]==".xml": 
+            problem_to_reset=problem_to_reset[:-4]
+
+        # try to uniquely id student by email address or username
+        try:
+            if "@" in unique_student_identifier:
+                student_to_reset=User.objects.get(email=unique_student_identifier)
+            else:
+                student_to_reset=User.objects.get(username=unique_student_identifier)
+            msg+="Found a single student to reset.  "
+        except:
+            msg+="<font color='red'>Couldn't find student to reset.  </font>"
+
+        # find the module in question
+        try:
+            module_to_reset=StudentModule.objects.get(student_id=student_to_reset.id, course_id=course_id, module_state_key__iendswith="/problem/"+problem_to_reset)
+            msg+="Found module to reset.  "
+        except Exception as e:
+            msg+="<font color='red'>Couldn't find module to reset.  </font>"
+
+        # modify the problem's state
+        try:
+            # load the state json
+            problem_state=json.loads(module_to_reset.state)
+            problem_state["attempts"]=0
+
+            # save
+            module_to_reset.state=json.dumps(problem_state)
+            module_to_reset.save()
+            msg+="<font color='green'>Module state successfully reset!</font>"
+        except:
+            msg+="<font color='red'>Couldn't reset module state.  </font>"
+
+
+    elif "Get link to student's progress page" in action:
+        unique_student_identifier=request.POST.get('unique_student_identifier','')
+        try:
+            if "@" in unique_student_identifier:
+                student_to_reset=User.objects.get(email=unique_student_identifier)
+            else:
+                student_to_reset=User.objects.get(username=unique_student_identifier)
+            msg+="<a href='./progress/{0}' target='_blank'> Progress page for username: {1} with email address: {2}</a>.".format(str(student_to_reset.id),student_to_reset.username,student_to_reset.email)
+        except:
+            msg+="<font color='red'>Couldn't find student with that username.  </font>"
+
     #----------------------------------------
     # export grades to remote gradebook
 
diff --git a/lms/templates/courseware/instructor_dashboard.html b/lms/templates/courseware/instructor_dashboard.html
index 7f1912cd45..c847064439 100644
--- a/lms/templates/courseware/instructor_dashboard.html
+++ b/lms/templates/courseware/instructor_dashboard.html
@@ -138,6 +138,11 @@ function goto( mode)
 
   %endif
 
+    <H2>Student-specific grade inspection and adjustment</h2>
+    <p>edX email address or their username: </p>
+    <p><input type="text" name="unique_student_identifier">  <input type="submit" name="action" value="Get link to student's progress page"></p>
+    <p>and, if you want to reset the number of attempts for a problem, the urlname of that problem</p>
+    <p> <input type="text" name="problem_to_reset"> <input type="submit" name="action" value="Reset student's attempts">  </p>
  %endif
 
 ##----------------------------------------------------------------------------- 
@@ -260,6 +265,9 @@ function goto( mode)
 
     </form>
 
+%if msg:
+    <p></p><p>${msg}</p>
+%endif
 ##----------------------------------------------------------------------------- 
 ##----------------------------------------------------------------------------- 
 
@@ -312,9 +320,6 @@ function goto( mode)
 ##-----------------------------------------------------------------------------  
 ## always show msg
 
-%if msg:
-    <p>${msg}</p>
-%endif
 
 ##----------------------------------------------------------------------------- 
 %if modeflag.get('Admin'):

From 9ef1a4ded51e4abe0c54dc4bdeb3c7656e9920bc Mon Sep 17 00:00:00 2001
From: John Hess <mgojohn@gmail.com>
Date: Tue, 15 Jan 2013 13:27:44 -0500
Subject: [PATCH 348/541] Tracking problem resets, clearer msgs

---
 lms/djangoapps/instructor/views.py | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/lms/djangoapps/instructor/views.py b/lms/djangoapps/instructor/views.py
index e65f358e38..4008802276 100644
--- a/lms/djangoapps/instructor/views.py
+++ b/lms/djangoapps/instructor/views.py
@@ -190,24 +190,36 @@ def instructor_dashboard(request, course_id):
                 student_to_reset=User.objects.get(username=unique_student_identifier)
             msg+="Found a single student to reset.  "
         except:
-            msg+="<font color='red'>Couldn't find student to reset.  </font>"
+            student_to_reset=None
+            msg+="<font color='red'>Couldn't find student with that email or username.  </font>"
 
-        # find the module in question
-        try:
-            module_to_reset=StudentModule.objects.get(student_id=student_to_reset.id, course_id=course_id, module_state_key__iendswith="/problem/"+problem_to_reset)
-            msg+="Found module to reset.  "
-        except Exception as e:
-            msg+="<font color='red'>Couldn't find module to reset.  </font>"
+        if student_to_reset is not None:
+            # find the module in question
+            try:
+                module_to_reset=StudentModule.objects.get(student_id=student_to_reset.id, course_id=course_id, module_state_key__iendswith="/problem/"+problem_to_reset)
+                msg+="Found module to reset.  "
+            except Exception as e:
+                msg+="<font color='red'>Couldn't find module with that urlname.  </font>"
 
         # modify the problem's state
         try:
             # load the state json
             problem_state=json.loads(module_to_reset.state)
+            old_number_of_attempts=problem_state["attempts"]
             problem_state["attempts"]=0
 
             # save
             module_to_reset.state=json.dumps(problem_state)
             module_to_reset.save()
+            track.views.server_track(request, 
+                                    '{instructor} reset attempts from {old_attempts} to 0 for {student} on problem {problem} in {course}'.format(
+                                        old_attempts=old_number_of_attempts,
+                                        student=student_to_reset,
+                                        problem=module_to_reset.module_state_key,
+                                        instructor=request.user,
+                                        course=course_id),
+                                    {}, 
+                                    page='idashboard')
             msg+="<font color='green'>Module state successfully reset!</font>"
         except:
             msg+="<font color='red'>Couldn't reset module state.  </font>"

From 9a81c56254e68ac7f17241cc1f37ed40488d752e Mon Sep 17 00:00:00 2001
From: John Hess <mgojohn@gmail.com>
Date: Tue, 15 Jan 2013 13:39:14 -0500
Subject: [PATCH 349/541] Tracking progess page lookups on instructor dashboard

---
 lms/djangoapps/instructor/views.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lms/djangoapps/instructor/views.py b/lms/djangoapps/instructor/views.py
index 4008802276..37eff1689b 100644
--- a/lms/djangoapps/instructor/views.py
+++ b/lms/djangoapps/instructor/views.py
@@ -232,6 +232,13 @@ def instructor_dashboard(request, course_id):
                 student_to_reset=User.objects.get(email=unique_student_identifier)
             else:
                 student_to_reset=User.objects.get(username=unique_student_identifier)
+            track.views.server_track(request, 
+                                    '{instructor} requested progress page for {student} in {course}'.format(
+                                        student=student_to_reset,
+                                        instructor=request.user,
+                                        course=course_id),
+                                    {}, 
+                                    page='idashboard')
             msg+="<a href='./progress/{0}' target='_blank'> Progress page for username: {1} with email address: {2}</a>.".format(str(student_to_reset.id),student_to_reset.username,student_to_reset.email)
         except:
             msg+="<font color='red'>Couldn't find student with that username.  </font>"

From 7b1262f667e0328fbd2e5d9b5a2be6c679fc2f1e Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Tue, 15 Jan 2013 14:31:02 -0500
Subject: [PATCH 350/541] Fix up authentication, other things

---
 lms/djangoapps/courseware/tabs.py | 38 ++++++++++++++++---------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/lms/djangoapps/courseware/tabs.py b/lms/djangoapps/courseware/tabs.py
index 18d6612cc6..eac059afff 100644
--- a/lms/djangoapps/courseware/tabs.py
+++ b/lms/djangoapps/courseware/tabs.py
@@ -112,27 +112,29 @@ def _staff_grading(tab, user, course, active_page):
     return []
 
 def _peer_grading(tab, user, course, active_page):
-    link = reverse('peer_grading', args=[course.id])
-    peer_gs = PeerGradingService(settings.PEER_GRADING_INTERFACE)
-    pending_grading=False
-    tab_name = "Peer grading"
-    img_path= ""
-    try:
-        notifications = json.loads(peer_gs.get_notifications(course.id,unique_id_for_user(user)))
-        log.debug(notifications)
+    if user.is_authenticated():
+        link = reverse('peer_grading', args=[course.id])
+        peer_gs = PeerGradingService(settings.PEER_GRADING_INTERFACE)
+        pending_grading=False
+        tab_name = "Peer grading"
+        img_path= ""
+        try:
+            notifications = json.loads(peer_gs.get_notifications(course.id,unique_id_for_user(user)))
+            log.debug(notifications)
 
-        if notifications['success']:
-            if notifications['student_needs_to_peer_grade']:
-                pending_grading=True
-    except:
-        #Non catastrophic error, so no real action
-        log.info("Problem with getting notifications from peer grading service.")
+            if notifications['success']:
+                if notifications['student_needs_to_peer_grade']:
+                    pending_grading=True
+        except:
+            #Non catastrophic error, so no real action
+            log.info("Problem with getting notifications from peer grading service.")
 
-    if pending_grading:
-        img_path = "/static/images/slider-handle.png"
+        if pending_grading:
+            img_path = "/static/images/slider-handle.png"
 
-    tab = [CourseTab(tab_name, link, active_page == "peer_grading", True, img_path)]
-    return tab
+        tab = [CourseTab(tab_name, link, active_page == "peer_grading", pending_grading, img_path)]
+        return tab
+    return []
 
 #### Validators
 

From 301293f8b0ec80018ac74b2c2e5484a715d415c5 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Tue, 15 Jan 2013 14:33:38 -0500
Subject: [PATCH 351/541] Remove debug statement, fix active page issue on
 problem page

---
 lms/djangoapps/courseware/tabs.py                    | 2 --
 lms/templates/peer_grading/peer_grading_problem.html | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/lms/djangoapps/courseware/tabs.py b/lms/djangoapps/courseware/tabs.py
index eac059afff..36b11d9795 100644
--- a/lms/djangoapps/courseware/tabs.py
+++ b/lms/djangoapps/courseware/tabs.py
@@ -120,8 +120,6 @@ def _peer_grading(tab, user, course, active_page):
         img_path= ""
         try:
             notifications = json.loads(peer_gs.get_notifications(course.id,unique_id_for_user(user)))
-            log.debug(notifications)
-
             if notifications['success']:
                 if notifications['student_needs_to_peer_grade']:
                     pending_grading=True
diff --git a/lms/templates/peer_grading/peer_grading_problem.html b/lms/templates/peer_grading/peer_grading_problem.html
index d493e84ace..9f23c0f0b1 100644
--- a/lms/templates/peer_grading/peer_grading_problem.html
+++ b/lms/templates/peer_grading/peer_grading_problem.html
@@ -9,7 +9,7 @@
 
 <%block name="title"><title>${course.number} Peer Grading.</title></%block>
 
-<%include file="/courseware/course_navigation.html" args="active_page='staff_grading'" />
+<%include file="/courseware/course_navigation.html" args="active_page='peer_grading'" />
 
 <%block name="js_extra">
   <%static:js group='peer_grading'/>

From 9c7f2cf6047dde39040739e0ff1c5fe6951192fc Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@edx.org>
Date: Tue, 15 Jan 2013 14:44:09 -0500
Subject: [PATCH 352/541] WIP -- do not merge

---
 lms/djangoapps/instructor/views.py                 | 13 ++++++++++---
 lms/templates/courseware/instructor_dashboard.html |  6 +++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/lms/djangoapps/instructor/views.py b/lms/djangoapps/instructor/views.py
index e6aa6c2f2e..9a5a73e4e3 100644
--- a/lms/djangoapps/instructor/views.py
+++ b/lms/djangoapps/instructor/views.py
@@ -314,14 +314,14 @@ def instructor_dashboard(request, course_id):
         users = request.POST['betausers']
         log.debug("users: {0!r}".format(users))
         group = get_beta_group(course)
-        for username_or_email in users.split():
+        for username_or_email in _split_by_comma_and_whitespace(users):
             msg += "<p>{0}</p>".format(
                 add_user_to_group(request, username_or_email, group, 'beta testers', 'beta-tester'))
 
     elif action == 'Remove beta testers':
         users = request.POST['betausers']
         group = get_beta_group(course)
-        for username_or_email in users.split():
+        for username_or_email in _split_by_comma_and_whitespace(users):
             msg += "<p>{0}</p>".format(
                 remove_user_from_group(request, username_or_email, group, 'beta testers', 'beta-tester'))
 
@@ -793,11 +793,18 @@ def grade_summary(request, course_id):
 # enrollment
 
 
+def _split_by_comma_and_whitespace(s):
+    """
+    Split a string both by on commas and whitespice.
+    """
+    # Note: split() with no args removes empty strings from output
+    return [x.split() for x in s.split(',')]
+
 def _do_enroll_students(course, course_id, students, overload=False):
     """Do the actual work of enrolling multiple students, presented as a string
     of emails separated by commas or returns"""
 
-    ns = [x.split('\n') for x in students.split(',')]
+    ns = _split_by_comma_and_whitespace(students)
     new_students = [item for sublist in ns for item in sublist]
     new_students = [str(s.strip()) for s in new_students]
     new_students_lc = [x.lower() for x in new_students]
diff --git a/lms/templates/courseware/instructor_dashboard.html b/lms/templates/courseware/instructor_dashboard.html
index 6bff32fc48..84c70226ec 100644
--- a/lms/templates/courseware/instructor_dashboard.html
+++ b/lms/templates/courseware/instructor_dashboard.html
@@ -61,7 +61,7 @@ function goto( mode)
           %endif
           <a href="#" onclick="goto('Admin');" class="${modeflag.get('Admin')}">Admin</a> |
           <a href="#" onclick="goto('Forum Admin');" class="${modeflag.get('Forum Admin')}">Forum Admin</a> |
-          <a href="#" onclick="goto('Enrollment');" class="${modeflag.get('Enrollment')}">Enrollment</a>
+          <a href="#" onclick="goto('Enrollment');" class="${modeflag.get('Enrollment')}">Enrollment</a> |
           <a href="#" onclick="goto('Manage Groups');" class="${modeflag.get('Manage Groups')}">Manage Groups</a> ]
     </h2>
 
@@ -254,7 +254,7 @@ function goto( mode)
   
   %endif
 
-  <p>Add students: enter emails, separated by returns or commas;</p>
+  <p>Add students: enter emails, separated by new lines or commas;</p>
   <textarea rows="6" cols="70" name="enroll_multiple"></textarea>
   <input type="submit" name="action" value="Enroll multiple students">
 
@@ -268,7 +268,7 @@ function goto( mode)
     <p>
     <input type="submit" name="action" value="List beta testers">
     <p>
-    Enter usernames or emails for students who should be beta-testers, one per line.  They will get to
+    Enter usernames or emails for students who should be beta-testers, one per line, or separated by commas.  They will get to
     see course materials early, as configured via the <tt>days_early_for_beta</tt> option in the course policy.
     </p>
     <p>

From a4e53d7a7f78dab143b8ee3154530872c8e2f86f Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Tue, 15 Jan 2013 14:52:39 -0500
Subject: [PATCH 353/541] pearson registration - restyled and tweaked markup
 for registration closed message and styled disabled labels appropriately

---
 .../multicourse/_testcenter-register.scss     | 33 +++++++++++++------
 lms/templates/test_center_register.html       | 12 +++----
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/lms/static/sass/multicourse/_testcenter-register.scss b/lms/static/sass/multicourse/_testcenter-register.scss
index e5e168f6b7..961fffd5d0 100644
--- a/lms/static/sass/multicourse/_testcenter-register.scss
+++ b/lms/static/sass/multicourse/_testcenter-register.scss
@@ -294,10 +294,10 @@ $red: rgb(178, 6, 16);
 			}
 
 			.field {
-				opacity: 0.5;
+				opacity: 0.6;
 
-				.label {
-					cursor: default;
+				.label, label {
+					cursor: auto;
 				}
 			}
 
@@ -646,7 +646,6 @@ $red: rgb(178, 6, 16);
 
 		// registration status
 		&.message-flash {
-			display: block;
 			@include border-radius(3px);
 			position: relative;
 			margin: 0 0 ($baseline*2) 0;
@@ -699,7 +698,6 @@ $red: rgb(178, 6, 16);
 			}
 		}
 
-
 		// submission error
 		&.submission-error {
 			@include box-sizing(border-box);
@@ -766,16 +764,31 @@ $red: rgb(178, 6, 16);
 				color: $blue;
 			}
 		}
+
+		// specific - registration closed
+		&.registration-closed {
+			@include border-bottom-radius(0);
+			margin-top: 0;
+			border-bottom: 1px solid $light-gray;
+			padding: $baseline;
+			background: tint($light-gray,50%);
+
+			.message-title {
+				font-weight: bold;
+			}
+
+			.message-copy {
+
+			}
+		}
 	}
 
+	.is-shown {
+		display: block;
+	}
 
 	// hidden
 	.is-hidden {
 		display: none;
 	}
-
-	// temp
-	.output-raw {
-		display: none;
-	}
 }
\ No newline at end of file
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index 3076924411..6ff1d1caec 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -111,7 +111,7 @@
   % if registration:
     <!-- select one of four registration status banners to display -->
     % if registration.is_accepted:
-    <section class="status message message-flash registration-processed message-action">
+    <section class="status message message-flash registration-processed message-action is-shown">
       <h3 class="message-title">Your registration for the Pearson exam has been processed</h3>
       <p class="message-copy">Your registration number is <strong>${registration.client_authorization_id}</strong>.  (Write this down! You’ll need it to schedule your exam.)</p>
       <a href="${registration.registration_signup_url}" class="button exam-button">Schedule Pearson exam</a>
@@ -119,21 +119,21 @@
     % endif
 
     % if registration.demographics_is_rejected:      
-    <section class="status message message-flash demographics-rejected message-action">
+    <section class="status message message-flash demographics-rejected message-action is-shown">
       <h3 class="message-title">Your demographic information contained an error and was rejected</h3>
       <p class="message-copy">Please check the information you provided, and correct the errors noted below.
     </section>
     % endif
    
     % if registration.registration_is_rejected:      
-    <section class="status message message-flash registration-rejected message-action">
+    <section class="status message message-flash registration-rejected message-action is-shown">
       <h3 class="message-title">Your registration for the Pearson exam has been rejected</h3>
       <p class="message-copy">Please see your registration status details for more information.</p>
     </section>
     % endif
 
     % if registration.is_pending:
-   <section class="status message message-flash registration-pending">
+   <section class="status message message-flash registration-pending is-shown">
     <h3 class="message-title">Your registration for the Pearson exam is pending</h3>
     <p class="message-copy">Once your information is processed, it will be forwarded to Pearson and you will be able to schedule an exam.</p>
    </section>
@@ -150,10 +150,10 @@
   % else:    
     <form id="testcenter_register_form" method="post" data-remote="true" action="/create_exam_registration" class="disabled">
       <!-- registration closed, so tell them they can't do anything: -->
-      <section class="status message message-flash registration-closed">
+      <div class="status message registration-closed is-shown">
         <h3 class="message-title">Registration for this Pearson exam is closed</h3>
         <p class="message-copy">Your previous information is available below, however you may not edit any of the information.
-      </section>
+      </div>
   % endif
       
       % if registration:

From 540232f54db93a6de1e51a0cc24363fa49559569 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Tue, 15 Jan 2013 14:31:11 -0500
Subject: [PATCH 354/541] revised minor syntax/line indents on faq scss and js

---
 lms/static/js/faq.js                          |  6 +++---
 lms/static/sass/multicourse/_about_pages.scss | 15 +++++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/lms/static/js/faq.js b/lms/static/js/faq.js
index ce0ac7e875..dc6e22b1fb 100644
--- a/lms/static/js/faq.js
+++ b/lms/static/js/faq.js
@@ -3,8 +3,8 @@ $(document).ready(function() {
     var question_id;
 
     $('.response').click(function(){
-        $(this).toggleClass('opened');
-	answer = $(this).find(".answer");
-        answer.slideToggle('fast');
+      $(this).toggleClass('opened');
+      answer = $(this).find(".answer");
+      answer.slideToggle('fast');
     });
 });
diff --git a/lms/static/sass/multicourse/_about_pages.scss b/lms/static/sass/multicourse/_about_pages.scss
index 4e38faec6b..03ed6be5c4 100644
--- a/lms/static/sass/multicourse/_about_pages.scss
+++ b/lms/static/sass/multicourse/_about_pages.scss
@@ -197,8 +197,8 @@
           background: url('/static/images/bullet-closed.png') no-repeat left 0.25em;
           font-family: $sans-serif;
           font-weight: 700;
-          margin-bottom: 15px;
-          padding-left: 16px;
+          margin-bottom: 10px;
+          padding-left: 20px;
           cursor: pointer;
         }
 
@@ -210,12 +210,15 @@
           li {
             line-height: 1.6em;
           }
-
         }
-      }
 
-      .opened h3 {
-        background: url('/static/images/bullet-open.png') no-repeat left 0.25em;
+        // opened states
+        &.opened {
+
+          h3 {
+            background: url('/static/images/bullet-open.png') no-repeat left 0.25em;
+          }
+        }
       }
     }
   }

From ef2b06940981aa3812f1f1e1d22ef467dce7d7f1 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Tue, 15 Jan 2013 15:34:09 -0500
Subject: [PATCH 355/541] Add staff grading notifications

---
 lms/djangoapps/courseware/tabs.py             | 20 ++++++++++++++++++-
 .../staff_grading_service.py                  |  7 +++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/lms/djangoapps/courseware/tabs.py b/lms/djangoapps/courseware/tabs.py
index 36b11d9795..47730f77cc 100644
--- a/lms/djangoapps/courseware/tabs.py
+++ b/lms/djangoapps/courseware/tabs.py
@@ -22,6 +22,7 @@ from courseware.access import has_access
 from static_replace import replace_urls
 
 from open_ended_grading.peer_grading_service import PeerGradingService
+from open_ended_grading.staff_grading_service import StaffGradingService
 from student.models import unique_id_for_user
 
 log = logging.getLogger(__name__)
@@ -108,7 +109,24 @@ def _textbooks(tab, user, course, active_page):
 def _staff_grading(tab, user, course, active_page):
     if has_access(user, course, 'staff'):
         link = reverse('staff_grading', args=[course.id])
-        return [CourseTab('Staff grading', link, active_page == "staff_grading")]
+        staff_gs = StaffGradingService(settings.STAFF_GRADING_INTERFACE)
+        pending_grading=False
+        tab_name = "Staff grading"
+        img_path= ""
+        try:
+            notifications = json.loads(staff_gs.get_notifications(course.id))
+            if notifications['success']:
+                if notifications['staff_needs_to_grade']:
+                    pending_grading=True
+        except:
+            #Non catastrophic error, so no real action
+            log.info("Problem with getting notifications from staff grading service.")
+
+        if pending_grading:
+            img_path = "/static/images/slider-handle.png"
+
+        tab = [CourseTab(tab_name, link, active_page == "staff_grading", pending_grading, img_path)]
+        return tab
     return []
 
 def _peer_grading(tab, user, course, active_page):
diff --git a/lms/djangoapps/open_ended_grading/staff_grading_service.py b/lms/djangoapps/open_ended_grading/staff_grading_service.py
index 5c6cec17eb..0db17e2ef4 100644
--- a/lms/djangoapps/open_ended_grading/staff_grading_service.py
+++ b/lms/djangoapps/open_ended_grading/staff_grading_service.py
@@ -66,6 +66,7 @@ class StaffGradingService(GradingService):
         self.get_next_url = self.url + '/get_next_submission/'
         self.save_grade_url = self.url + '/save_grade/'
         self.get_problem_list_url = self.url + '/get_problem_list/'
+        self.get_notifications_url = self.url + "/get_notifications/"
 
 
     def get_problem_list(self, course_id, grader_id):
@@ -132,6 +133,12 @@ class StaffGradingService(GradingService):
 
         return self.post(self.save_grade_url, data=data)
 
+    def get_notifications(self, course_id):
+        params = {'course_id': course_id}
+        response = self.get(self.get_notifications_url, params)
+        return response
+
+
 # don't initialize until staff_grading_service() is called--means that just
 # importing this file doesn't create objects that may not have the right config
 _service = None

From 8aa033f601219852f8f764134eea2bf72314b342 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Tue, 15 Jan 2013 15:40:23 -0500
Subject: [PATCH 356/541] Add peer and staff grading required display,
 notifications

---
 lms/static/coffee/src/staff_grading/staff_grading.coffee | 2 +-
 lms/templates/peer_grading/peer_grading.html             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lms/static/coffee/src/staff_grading/staff_grading.coffee b/lms/static/coffee/src/staff_grading/staff_grading.coffee
index 7039fd1358..d36cf45c64 100644
--- a/lms/static/coffee/src/staff_grading/staff_grading.coffee
+++ b/lms/static/coffee/src/staff_grading/staff_grading.coffee
@@ -318,7 +318,7 @@ class StaffGrading
 
   problem_link:(problem) ->
     link = $('<a>').attr('href', "javascript:void(0)").append(
-      "#{problem.problem_name} (#{problem.num_graded} graded, #{problem.num_pending} pending)")
+      "#{problem.problem_name} (#{problem.num_graded} graded, #{problem.num_pending} pending, required to grade #{problem.num_required} more)")
         .click =>
           @get_next_submission problem.location
 
diff --git a/lms/templates/peer_grading/peer_grading.html b/lms/templates/peer_grading/peer_grading.html
index 2eb33cae05..598c803245 100644
--- a/lms/templates/peer_grading/peer_grading.html
+++ b/lms/templates/peer_grading/peer_grading.html
@@ -29,7 +29,7 @@
                 <ul class="problem-list">
                 %for problem in problem_list:
                     <li>
-                    <a href="${ajax_url}problem?location=${problem['location']}">${problem['problem_name']} (${problem['num_graded']} graded, ${problem['num_pending']} pending)</a>
+                    <a href="${ajax_url}problem?location=${problem['location']}">${problem['problem_name']} (${problem['num_graded']} graded, ${problem['num_pending']} pending, required to grade ${problem['num_required']} more)</a>
                     </li>
                 %endfor
                 </ul>

From ef0f973ca40a8e5abce6e6a9ff5077958552f3e0 Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Tue, 15 Jan 2013 16:00:10 -0500
Subject: [PATCH 357/541] display client_candidate_id when registration
 accepted; strip whitespace from accommodation_request; cosmetic cleanup on
 pearson management commands.

---
 .../management/commands/pearson_export_cdd.py |  5 ++--
 .../management/commands/pearson_export_ead.py |  8 +++---
 .../commands/pearson_make_tc_registration.py  | 16 +++++++----
 .../commands/pearson_make_tc_user.py          |  2 +-
 common/djangoapps/student/models.py           | 27 ++++++++++---------
 lms/templates/dashboard.html                  |  2 +-
 lms/templates/test_center_register.html       |  2 +-
 7 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/common/djangoapps/student/management/commands/pearson_export_cdd.py b/common/djangoapps/student/management/commands/pearson_export_cdd.py
index fedf6dfae1..67230c7f74 100644
--- a/common/djangoapps/student/management/commands/pearson_export_cdd.py
+++ b/common/djangoapps/student/management/commands/pearson_export_cdd.py
@@ -2,7 +2,6 @@ import csv
 from collections import OrderedDict
 from datetime import datetime
 from os.path import isdir
-from fs.path import pathjoin
 from optparse import make_option
 
 from django.core.management.base import BaseCommand
@@ -68,7 +67,7 @@ class Command(BaseCommand):
         # used in the system.
         dest = args[0]
         if isdir(dest):
-            destfile = pathjoin(dest, uploaded_at.strftime("cdd-%Y%m%d-%H%M%S.dat"))
+            destfile = os.path.join(dest, uploaded_at.strftime("cdd-%Y%m%d-%H%M%S.dat"))
         else:
             destfile = dest
         
@@ -100,4 +99,4 @@ class Command(BaseCommand):
                     tcu.save()
 
 
-        
\ No newline at end of file
+        
diff --git a/common/djangoapps/student/management/commands/pearson_export_ead.py b/common/djangoapps/student/management/commands/pearson_export_ead.py
index 0e5ffb0243..de3bfc04ee 100644
--- a/common/djangoapps/student/management/commands/pearson_export_ead.py
+++ b/common/djangoapps/student/management/commands/pearson_export_ead.py
@@ -1,8 +1,7 @@
 import csv
 from collections import OrderedDict
 from datetime import datetime
-from os.path import isdir
-from fs.path import pathjoin
+from os.path import isdir, join
 from optparse import make_option
 
 from django.core.management.base import BaseCommand
@@ -61,7 +60,7 @@ class Command(BaseCommand):
         # used in the system.
         dest = args[0]
         if isdir(dest):
-            destfile = pathjoin(dest, uploaded_at.strftime("ead-%Y%m%d-%H%M%S.dat"))
+            destfile = join(dest, uploaded_at.strftime("ead-%Y%m%d-%H%M%S.dat"))
         else:
             destfile = dest
 
@@ -90,6 +89,5 @@ class Command(BaseCommand):
                     tcr.save()
 
 
-  
 
-        
\ No newline at end of file
+        
diff --git a/common/djangoapps/student/management/commands/pearson_make_tc_registration.py b/common/djangoapps/student/management/commands/pearson_make_tc_registration.py
index 5536844cab..81a478d19d 100644
--- a/common/djangoapps/student/management/commands/pearson_make_tc_registration.py
+++ b/common/djangoapps/student/management/commands/pearson_make_tc_registration.py
@@ -37,11 +37,13 @@ class Command(BaseCommand):
             '--eligibility_appointment_date_first',
             action='store',
             dest='eligibility_appointment_date_first',
-        ),        
+            help='use YYYY-MM-DD format if overriding existing course values, or YYYY-MM-DDTHH:MM if not using an existing course.'
+        ),
         make_option(
             '--eligibility_appointment_date_last',
             action='store',
             dest='eligibility_appointment_date_last',
+            help='use YYYY-MM-DD format if overriding existing course values, or YYYY-MM-DDTHH:MM if not using an existing course.'
         ),
         # internal values:
         make_option(
@@ -67,11 +69,11 @@ class Command(BaseCommand):
             '--ignore_registration_dates',
             action='store_true',
             dest='ignore_registration_dates',
-            help='find exam info for course based on exam_series_code, even if it is not active.'
+            help='find exam info for course based on exam_series_code, even if the exam is not active.'
         ),   
     )
     args = "<student_username course_id>"
-    help = "Create a TestCenterRegistration entry for a given Student"
+    help = "Create or modify a TestCenterRegistration entry for a given Student"
 
     @staticmethod
     def is_valid_option(option_name):
@@ -86,11 +88,15 @@ class Command(BaseCommand):
 
         our_options = dict((k, v) for k, v in options.items()
                            if Command.is_valid_option(k) and v is not None)
-        student = User.objects.get(username=username)
+        try:
+            student = User.objects.get(username=username)
+        except User.DoesNotExist:
+            raise CommandError("User \"{}\" does not exist".format(username))
+
         try:
             testcenter_user = TestCenterUser.objects.get(user=student)
         except TestCenterUser.DoesNotExist:
-            raise CommandError("User {%s} does not exist".format(student))
+            raise CommandError("User \"{}\" does not have an existing demographics record".format(username))
             
         # check to see if a course_id was specified, and use information from that:
         try:
diff --git a/common/djangoapps/student/management/commands/pearson_make_tc_user.py b/common/djangoapps/student/management/commands/pearson_make_tc_user.py
index 57ee78e391..da9bfc3bd0 100644
--- a/common/djangoapps/student/management/commands/pearson_make_tc_user.py
+++ b/common/djangoapps/student/management/commands/pearson_make_tc_user.py
@@ -125,7 +125,7 @@ class Command(BaseCommand):
         ),   
     )
     args = "<student_username>"
-    help = "Create a TestCenterUser entry for a given Student"
+    help = "Create or modify a TestCenterUser entry for a given Student"
 
     @staticmethod
     def is_valid_option(option_name):
diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index bfa7077176..d8e38170c8 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -229,13 +229,13 @@ class TestCenterUser(models.Model):
         return False    
                        
     @staticmethod
-    def _generate_edx_id():
+    def _generate_edx_id(prefix):
         NUM_DIGITS = 12
-        return u"edX{:012}".format(randint(1, 10**NUM_DIGITS-1))
+        return u"{}{:012}".format(prefix, randint(1, 10**NUM_DIGITS-1))
     
     @staticmethod
     def _generate_candidate_id():
-        return TestCenterUser._generate_edx_id()
+        return TestCenterUser._generate_edx_id("edX")
         
     @staticmethod
     def create(user):
@@ -283,15 +283,12 @@ class TestCenterUserForm(ModelForm):
         except UnicodeEncodeError:
             return False
         return True
-    
-    def check_country_code(self, fieldname):
-        code = self.cleaned_data[fieldname]
+        
+    def clean_country(self):
+        code = self.cleaned_data['country']
         if code and len(code) != 3:
             raise forms.ValidationError(u'Must be three characters (ISO 3166-1):  e.g. USA, CAN, MNG')
         return code
-        
-    def clean_country(self):
-        return self.check_country_code('country')
                 
     def clean(self):
         cleaned_data = super(TestCenterUserForm, self).clean()
@@ -434,7 +431,7 @@ class TestCenterRegistration(models.Model):
     def create(testcenter_user, exam, accommodation_request):
         registration = TestCenterRegistration(testcenter_user = testcenter_user)
         registration.course_id = exam.course_id
-        registration.accommodation_request = accommodation_request
+        registration.accommodation_request = accommodation_request.strip()
         registration.exam_series_code = exam.exam_series_code
         registration.eligibility_appointment_date_first = strftime("%Y-%m-%d", exam.first_eligible_appointment_date)
         registration.eligibility_appointment_date_last = strftime("%Y-%m-%d", exam.last_eligible_appointment_date)
@@ -444,7 +441,7 @@ class TestCenterRegistration(models.Model):
 
     @staticmethod
     def _generate_authorization_id():
-        return TestCenterUser._generate_edx_id()
+        return TestCenterUser._generate_edx_id("edXexam")
         
     @staticmethod
     def _create_client_authorization_id():
@@ -526,13 +523,19 @@ class TestCenterRegistrationForm(ModelForm):
     class Meta:
         model = TestCenterRegistration
         fields = ( 'accommodation_request', 'accommodation_code' )
+
+    def clean_accommodation_request(self):
+        code = self.cleaned_data['accommodation_request']
+        if code and len(code) > 0:
+            return code.strip()
+        return code
         
     def update_and_save(self):
         registration = self.save(commit=False)
         # create additional values here:
         registration.user_updated_at = datetime.utcnow()
         registration.save()
-        log.info("Updated registration information for user's test center exam registration: username \"{}\" course \"{}\", examcode \"{}\"".format(registration.testcenter_user.username, registration.course_id, registration.exam_series_code)) 
+        log.info("Updated registration information for user's test center exam registration: username \"{}\" course \"{}\", examcode \"{}\"".format(registration.testcenter_user.user.username, registration.course_id, registration.exam_series_code)) 
 
     # TODO: add validation code for values added to accommodation_code field.
     
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index 34c8d0ecc3..0182a8edf1 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -237,7 +237,7 @@
                     % if registration.is_accepted:  
                 <div class="message message-status is-shown exam-schedule">
                    <a href="${registration.registration_signup_url}" class="button exam-button">Schedule Pearson exam</a>
-                   <p class="exam-registration-number"><a href="${testcenter_register_target}" id="exam_register_link">Registration</a> number: <strong>${registration.client_authorization_id}</strong></p>
+                   <p class="exam-registration-number"><a href="${testcenter_register_target}" id="exam_register_link">Registration</a> number: <strong>${registration.client_candidate_id}</strong></p>
                    <p class="message-copy">Write this down! You’ll need it to schedule your exam.</p>
                 </div>
                     % endif
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index 6ff1d1caec..03883d907c 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -113,7 +113,7 @@
     % if registration.is_accepted:
     <section class="status message message-flash registration-processed message-action is-shown">
       <h3 class="message-title">Your registration for the Pearson exam has been processed</h3>
-      <p class="message-copy">Your registration number is <strong>${registration.client_authorization_id}</strong>.  (Write this down! You’ll need it to schedule your exam.)</p>
+      <p class="message-copy">Your registration number is <strong>${registration.client_candidate_id}</strong>.  (Write this down! You’ll need it to schedule your exam.)</p>
       <a href="${registration.registration_signup_url}" class="button exam-button">Schedule Pearson exam</a>
     </section>
     % endif

From 3b28e328c4fd6d21ef8af683e35cb1296ef4278e Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Tue, 15 Jan 2013 17:54:10 -0500
Subject: [PATCH 358/541] disable export of testcenter_exam from course module
 (and add test).

---
 .../lib/xmodule/xmodule/tests/test_export.py  |  4 ++
 common/lib/xmodule/xmodule/xml_module.py      | 10 ++++-
 .../data/test_exam_registration/README.md     |  2 +
 .../data/test_exam_registration/course.xml    |  1 +
 .../course/2012_Fall.xml                      | 15 +++++++
 .../test_exam_registration/html/toylab.html   |  3 ++
 .../test_exam_registration/html/toylab.xml    |  1 +
 .../policies/2012_Fall.json                   | 42 +++++++++++++++++++
 .../roots/2012_Fall.xml                       |  1 +
 lms/envs/common.py                            |  1 +
 10 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 common/test/data/test_exam_registration/README.md
 create mode 120000 common/test/data/test_exam_registration/course.xml
 create mode 100644 common/test/data/test_exam_registration/course/2012_Fall.xml
 create mode 100644 common/test/data/test_exam_registration/html/toylab.html
 create mode 100644 common/test/data/test_exam_registration/html/toylab.xml
 create mode 100644 common/test/data/test_exam_registration/policies/2012_Fall.json
 create mode 100644 common/test/data/test_exam_registration/roots/2012_Fall.xml

diff --git a/common/lib/xmodule/xmodule/tests/test_export.py b/common/lib/xmodule/xmodule/tests/test_export.py
index 7605155a6c..f92d58db03 100644
--- a/common/lib/xmodule/xmodule/tests/test_export.py
+++ b/common/lib/xmodule/xmodule/tests/test_export.py
@@ -124,3 +124,7 @@ class RoundTripTestCase(unittest.TestCase):
     def test_graphicslidertool_roundtrip(self):
         #Test graphicslidertool xmodule to see if it exports correctly
         self.check_export_roundtrip(DATA_DIR,"graphic_slider_tool")
+
+    def test_exam_registration_roundtrip(self):
+        # Test exam_registration xmodule to see if it exports correctly
+        self.check_export_roundtrip(DATA_DIR,"test_exam_registration")
diff --git a/common/lib/xmodule/xmodule/xml_module.py b/common/lib/xmodule/xmodule/xml_module.py
index bb5b44c67f..9ad36f633d 100644
--- a/common/lib/xmodule/xmodule/xml_module.py
+++ b/common/lib/xmodule/xmodule/xml_module.py
@@ -94,12 +94,18 @@ class XmlDescriptor(XModuleDescriptor):
         'start', 'due', 'graded', 'display_name', 'url_name', 'hide_from_toc',
         'ispublic', 	# if True, then course is listed for all users; see
         'xqa_key',	# for xqaa server access
+        # information about testcenter exams is a dict (of dicts), not a string, 
+        # so it cannot be easily exportable as a course element's attribute. 
+        'testcenter_info',
         # VS[compat] Remove once unused.
         'name', 'slug')
 
     metadata_to_strip = ('data_dir',
-           # VS[compat] -- remove the below attrs once everything is in the CMS
-           'course', 'org', 'url_name', 'filename')
+        # information about testcenter exams is a dict (of dicts), not a string, 
+        # so it cannot be easily exportable as a course element's attribute. 
+        'testcenter_info',
+        # VS[compat] -- remove the below attrs once everything is in the CMS
+        'course', 'org', 'url_name', 'filename')
 
     # A dictionary mapping xml attribute names AttrMaps that describe how
     # to import and export them
diff --git a/common/test/data/test_exam_registration/README.md b/common/test/data/test_exam_registration/README.md
new file mode 100644
index 0000000000..5097fe8798
--- /dev/null
+++ b/common/test/data/test_exam_registration/README.md
@@ -0,0 +1,2 @@
+Simple course with test center exam information included in policy.json.
+
diff --git a/common/test/data/test_exam_registration/course.xml b/common/test/data/test_exam_registration/course.xml
new file mode 120000
index 0000000000..49041310f6
--- /dev/null
+++ b/common/test/data/test_exam_registration/course.xml
@@ -0,0 +1 @@
+roots/2012_Fall.xml
\ No newline at end of file
diff --git a/common/test/data/test_exam_registration/course/2012_Fall.xml b/common/test/data/test_exam_registration/course/2012_Fall.xml
new file mode 100644
index 0000000000..77eca9f46c
--- /dev/null
+++ b/common/test/data/test_exam_registration/course/2012_Fall.xml
@@ -0,0 +1,15 @@
+<course>
+  <chapter url_name="Overview">
+    <videosequence url_name="Toy_Videos">
+      <html url_name="toylab"/>
+      <video url_name="Video_Resources" youtube="1.0:1bK-WdDi6Qw"/>
+    </videosequence>
+    <video url_name="Welcome" youtube="1.0:p2Q6BrNhdh8"/>
+  </chapter>
+  <chapter url_name="Ch2">
+     <html url_name="test_html">
+         <h2>Welcome</h2>
+     </html>
+  </chapter>
+
+</course>
diff --git a/common/test/data/test_exam_registration/html/toylab.html b/common/test/data/test_exam_registration/html/toylab.html
new file mode 100644
index 0000000000..81df84bd63
--- /dev/null
+++ b/common/test/data/test_exam_registration/html/toylab.html
@@ -0,0 +1,3 @@
+<b>Lab 2A: Superposition Experiment</b>
+
+<p>Isn't the toy course great?</p>
diff --git a/common/test/data/test_exam_registration/html/toylab.xml b/common/test/data/test_exam_registration/html/toylab.xml
new file mode 100644
index 0000000000..ab78aeb494
--- /dev/null
+++ b/common/test/data/test_exam_registration/html/toylab.xml
@@ -0,0 +1 @@
+<html filename="toylab.html"/>
\ No newline at end of file
diff --git a/common/test/data/test_exam_registration/policies/2012_Fall.json b/common/test/data/test_exam_registration/policies/2012_Fall.json
new file mode 100644
index 0000000000..49af7d1527
--- /dev/null
+++ b/common/test/data/test_exam_registration/policies/2012_Fall.json
@@ -0,0 +1,42 @@
+{
+    "course/2012_Fall": {
+        "graceperiod": "2 days 5 hours 59 minutes 59 seconds",
+        "start": "2011-07-17T12:00",
+        "display_name": "Toy Course",
+	"testcenter_info": {
+            "Midterm_Exam": {
+                "Exam_Series_Code": "Midterm_Exam",
+                "First_Eligible_Appointment_Date": "2012-11-09T00:00",
+                "Last_Eligible_Appointment_Date": "2012-11-09T23:59"
+            },
+            "Final_Exam": {
+                 "Exam_Series_Code": "mit6002xfall12a",
+                 "Exam_Display_Name": "Final Exam",
+                 "First_Eligible_Appointment_Date": "2013-01-25T00:00",
+                 "Last_Eligible_Appointment_Date": "2013-01-25T23:59",
+                 "Registration_Start_Date": "2013-01-01T00:00",
+                 "Registration_End_Date": "2013-01-21T23:59"
+            }
+	}
+    },
+    "chapter/Overview": {
+        "display_name": "Overview"
+    },
+    "chapter/Ch2": {
+       "display_name": "Chapter 2",
+       "start": "2015-07-17T12:00"
+    },
+    "videosequence/Toy_Videos": {
+        "display_name": "Toy Videos",
+        "format": "Lecture Sequence"
+    },
+    "html/toylab": {
+        "display_name": "Toy lab"
+    },
+    "video/Video_Resources": {
+        "display_name": "Video Resources"
+    },
+    "video/Welcome": {
+        "display_name": "Welcome"
+    }
+}
diff --git a/common/test/data/test_exam_registration/roots/2012_Fall.xml b/common/test/data/test_exam_registration/roots/2012_Fall.xml
new file mode 100644
index 0000000000..30dd5e0180
--- /dev/null
+++ b/common/test/data/test_exam_registration/roots/2012_Fall.xml
@@ -0,0 +1 @@
+<course org="edX" course="test_start_date" url_name="2012_Fall"/>
\ No newline at end of file
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 4fe4a5a3dd..330c8fd304 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -343,6 +343,7 @@ MOCK_STAFF_GRADING = False
 ################################# Pearson TestCenter config  ################
 
 PEARSONVUE_SIGNINPAGE_URL = "https://www1.pearsonvue.com/testtaker/signin/SignInPage/EDX"
+# TESTCENTER_ACCOMMODATION_REQUEST_EMAIL = "exam-help@edx.org"
 
 ################################# Peer grading config  #####################
 

From cc31c7951781c15f400f99272d9bb68270470900 Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Tue, 15 Jan 2013 18:15:54 -0500
Subject: [PATCH 359/541] fixes for first round of code review

---
 common/djangoapps/student/models.py | 39 ++++++++++++++---------------
 common/djangoapps/student/views.py  |  9 ++++---
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index d8e38170c8..8220e5507c 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -221,9 +221,9 @@ class TestCenterUser(models.Model):
     def email(self):
         return self.user.email
     
-    def needs_update(self, dict):
+    def needs_update(self, fields):
         for fieldname in TestCenterUser.user_provided_fields():
-            if fieldname in dict and self.__getattribute__(fieldname) != dict[fieldname]:
+            if fieldname in fields and getattr(self, fieldname) != fields[fieldname]:
                 return True
             
         return False    
@@ -237,14 +237,14 @@ class TestCenterUser(models.Model):
     def _generate_candidate_id():
         return TestCenterUser._generate_edx_id("edX")
         
-    @staticmethod
-    def create(user):
-        testcenter_user = TestCenterUser(user=user)
+    @classmethod
+    def create(cls, user):
+        testcenter_user = cls(user=user)
         # testcenter_user.candidate_id remains unset    
         # assign an ID of our own:
-        cand_id = TestCenterUser._generate_candidate_id()
+        cand_id = cls._generate_candidate_id()
         while TestCenterUser.objects.filter(client_candidate_id=cand_id).exists():
-            cand_id = TestCenterUser._generate_candidate_id()
+            cand_id = cls._generate_candidate_id()
         testcenter_user.client_candidate_id = cand_id  
         return testcenter_user
 
@@ -276,14 +276,6 @@ class TestCenterUserForm(ModelForm):
         
     # add validation:
     
-    @staticmethod
-    def can_encode_as_latin(fieldvalue):
-        try:
-            fieldvalue.encode('iso-8859-1')
-        except UnicodeEncodeError:
-            return False
-        return True
-        
     def clean_country(self):
         code = self.cleaned_data['country']
         if code and len(code) != 3:
@@ -291,6 +283,13 @@ class TestCenterUserForm(ModelForm):
         return code
                 
     def clean(self):
+        def _can_encode_as_latin(fieldvalue):
+            try:
+                fieldvalue.encode('iso-8859-1')
+            except UnicodeEncodeError:
+                return False
+            return True
+        
         cleaned_data = super(TestCenterUserForm, self).clean()
         
         # check for interactions between fields:
@@ -312,7 +311,7 @@ class TestCenterUserForm(ModelForm):
         # check encoding for all fields:
         cleaned_data_fields = [fieldname for fieldname in cleaned_data]
         for fieldname in cleaned_data_fields:
-            if not TestCenterUserForm.can_encode_as_latin(cleaned_data[fieldname]):
+            if not _can_encode_as_latin(cleaned_data[fieldname]):
                 self._errors[fieldname] = self.error_class([u'Must only use characters in Latin-1 (iso-8859-1) encoding'])                
                 del cleaned_data[fieldname]
 
@@ -427,15 +426,15 @@ class TestCenterRegistration(models.Model):
         # TODO: figure out if this should really go in the database (with a default value).
         return 1
     
-    @staticmethod
-    def create(testcenter_user, exam, accommodation_request):
-        registration = TestCenterRegistration(testcenter_user = testcenter_user)
+    @classmethod
+    def create(cls, testcenter_user, exam, accommodation_request):
+        registration = cls(testcenter_user = testcenter_user)
         registration.course_id = exam.course_id
         registration.accommodation_request = accommodation_request.strip()
         registration.exam_series_code = exam.exam_series_code
         registration.eligibility_appointment_date_first = strftime("%Y-%m-%d", exam.first_eligible_appointment_date)
         registration.eligibility_appointment_date_last = strftime("%Y-%m-%d", exam.last_eligible_appointment_date)
-        registration.client_authorization_id = TestCenterRegistration._create_client_authorization_id()
+        registration.client_authorization_id = cls._create_client_authorization_id()
         # accommodation_code remains blank for now, along with Pearson confirmation information
         return registration
 
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 2c427d25bb..8696c2ba28 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -471,8 +471,9 @@ def _do_create_account(post_vars):
     try:
         profile.year_of_birth = int(post_vars['year_of_birth'])
     except (ValueError, KeyError):
-        profile.year_of_birth = None  # If they give us garbage, just ignore it instead
-                                # of asking them to put an integer.
+        # If they give us garbage, just ignore it instead
+        # of asking them to put an integer.
+        profile.year_of_birth = None  
     try:
         profile.save()
     except Exception:
@@ -615,7 +616,7 @@ def exam_registration_info(user, course):
     
     exam_code = exam_info.exam_series_code
     registrations = get_testcenter_registration(user, course.id, exam_code)
-    if len(registrations) > 0:
+    if registrations:
         registration = registrations[0]
     else:
         registration = None
@@ -705,7 +706,7 @@ def create_exam_registration(request, post_override=None):
     exam = course.current_test_center_exam
     exam_code = exam.exam_series_code
     registrations = get_testcenter_registration(user, course_id, exam_code)
-    if len(registrations) > 0:
+    if registrations:
         registration = registrations[0]
         # NOTE: we do not bother to check here to see if the registration has changed,
         # because at the moment there is no way for a user to change anything about their

From b188c8e722fa2e1f4218867f6f0cde084a15dd31 Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@mitx.mit.edu>
Date: Tue, 15 Jan 2013 18:19:54 -0500
Subject: [PATCH 360/541] fix bug in string splitting.

---
 lms/djangoapps/instructor/views.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lms/djangoapps/instructor/views.py b/lms/djangoapps/instructor/views.py
index 9a5a73e4e3..2a80b387d1 100644
--- a/lms/djangoapps/instructor/views.py
+++ b/lms/djangoapps/instructor/views.py
@@ -2,6 +2,7 @@
 
 from collections import defaultdict
 import csv
+import itertools
 import json
 import logging
 import os
@@ -798,14 +799,15 @@ def _split_by_comma_and_whitespace(s):
     Split a string both by on commas and whitespice.
     """
     # Note: split() with no args removes empty strings from output
-    return [x.split() for x in s.split(',')]
+    lists = [x.split() for x in s.split(',')]
+    # return all of them
+    return itertools.chain(*lists)
 
 def _do_enroll_students(course, course_id, students, overload=False):
     """Do the actual work of enrolling multiple students, presented as a string
     of emails separated by commas or returns"""
 
-    ns = _split_by_comma_and_whitespace(students)
-    new_students = [item for sublist in ns for item in sublist]
+    new_students = _split_by_comma_and_whitespace(students)
     new_students = [str(s.strip()) for s in new_students]
     new_students_lc = [x.lower() for x in new_students]
 

From cc1b50ee4a97e6d4ab5c00bf61337f7b1a139dbf Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Wed, 16 Jan 2013 11:24:20 -0500
Subject: [PATCH 361/541] use new-style class for TestCenterExam

---
 common/lib/xmodule/xmodule/course_module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py
index 697499b65e..499247cc2d 100644
--- a/common/lib/xmodule/xmodule/course_module.py
+++ b/common/lib/xmodule/xmodule/course_module.py
@@ -377,7 +377,7 @@ class CourseDescriptor(SequenceDescriptor):
         """
         return self.metadata.get('end_of_course_survey_url')
 
-    class TestCenterExam:
+    class TestCenterExam(object):
         def __init__(self, course_id, exam_name, exam_info):
             self.course_id = course_id
             self.exam_name = exam_name

From 5d66490065110126cbc9b27939b2ffdb09a931ac Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@edx.org>
Date: Wed, 16 Jan 2013 12:15:23 -0500
Subject: [PATCH 362/541] Add a try/catch so that Askbot removal doesn't die if
 there's no Askbot to remove from auth_user

---
 .../student/migrations/0021_remove_askbot.py  | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/common/djangoapps/student/migrations/0021_remove_askbot.py b/common/djangoapps/student/migrations/0021_remove_askbot.py
index 89f7208f40..83ad6791f2 100644
--- a/common/djangoapps/student/migrations/0021_remove_askbot.py
+++ b/common/djangoapps/student/migrations/0021_remove_askbot.py
@@ -26,14 +26,17 @@ class Migration(SchemaMigration):
 
     def forwards(self, orm):
         "Kill the askbot"
-        # For MySQL, we're batching the alters together for performance reasons
-        if db.backend_name == 'mysql':
-            drops = ["drop `{0}`".format(col) for col in ASKBOT_AUTH_USER_COLUMNS]
-            statement = "alter table `auth_user` {0};".format(", ".join(drops))
-            db.execute(statement)
-        else:
-            for column in ASKBOT_AUTH_USER_COLUMNS:
-                db.delete_column('auth_user', column)            
+        try:
+            # For MySQL, we're batching the alters together for performance reasons
+            if db.backend_name == 'mysql':
+                drops = ["drop `{0}`".format(col) for col in ASKBOT_AUTH_USER_COLUMNS]
+                statement = "alter table `auth_user` {0};".format(", ".join(drops))
+                db.execute(statement)
+            else:
+                for column in ASKBOT_AUTH_USER_COLUMNS:
+                    db.delete_column('auth_user', column)
+        except Exception as ex:
+            print "Couldn't remove askbot because of {0} -- it was probably never here to begin with.".format(ex)            
 
     def backwards(self, orm):
         raise RuntimeError("Cannot reverse this migration: there's no going back to Askbot.")

From e38b44157a483ed609222f7067e6312e1d93254b Mon Sep 17 00:00:00 2001
From: Ashley Penney <apenney@edx.org>
Date: Wed, 16 Jan 2013 14:09:48 -0500
Subject: [PATCH 363/541] Lets explicitly make the virtualenvs for now.

---
 jenkins/test.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/jenkins/test.sh b/jenkins/test.sh
index e960313d76..6dec341f10 100755
--- a/jenkins/test.sh
+++ b/jenkins/test.sh
@@ -28,12 +28,12 @@ export PYTHONIOENCODING=UTF-8
 
 GIT_BRANCH=${GIT_BRANCH/HEAD/master}
 
-# Temporary workaround for pip/numpy bug. (Jenkin's is unable to pip install numpy successfully, scipy fails to install afterwards.
-# We tried pip 1.1, 1.2, all sorts of varieties but it's apparently a pip bug of some kind.
-wget -O /tmp/numpy.tar.gz http://pypi.python.org/packages/source/n/numpy/numpy-1.6.2.tar.gz#md5=95ed6c9dcc94af1fc1642ea2a33c1bba
-tar -zxvf /tmp/numpy.tar.gz -C /tmp/
-python /tmp/numpy-1.6.2/setup.py install
+if [ ! -d /mnt/virtualenvs/"$JOB_NAME" ]; then
+    mkdir -p /mnt/virtualenvs/"$JOB_NAME"
+    virtualenv /mnt/virtualenvs/"$JOB_NAME"
+fi
 
+source /mnt/virtualenvs/"$JOB_NAME"/bin/activate
 pip install -q -r pre-requirements.txt
 pip install -q -r test-requirements.txt
 yes w | pip install -q -r requirements.txt

From 1d6b1be888b22edddf06cb549677d9d492cb3688 Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Wed, 16 Jan 2013 14:30:30 -0500
Subject: [PATCH 364/541] fix missing indirection in log message

---
 common/djangoapps/student/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index 8220e5507c..6506e8b638 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -272,7 +272,7 @@ class TestCenterUserForm(ModelForm):
         # create additional values here:
         new_user.user_updated_at = datetime.utcnow()
         new_user.save()
-        log.info("Updated demographic information for user's test center exam registration: username \"{}\" ".format(new_user.username)) 
+        log.info("Updated demographic information for user's test center exam registration: username \"{}\" ".format(new_user.user.username)) 
         
     # add validation:
     

From 9dd9727bb8d38d45d7da2ef0f3ffe080f4a84c57 Mon Sep 17 00:00:00 2001
From: Ashley Penney <apenney@edx.org>
Date: Wed, 16 Jan 2013 14:52:54 -0500
Subject: [PATCH 365/541] Another minor tweak to limit these tests to the cms.

---
 jenkins/test.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jenkins/test.sh b/jenkins/test.sh
index 6dec341f10..b4befa6d5f 100755
--- a/jenkins/test.sh
+++ b/jenkins/test.sh
@@ -45,7 +45,9 @@ TESTS_FAILED=0
 rake test_lms[false] || TESTS_FAILED=1
 rake test_common/lib/capa || TESTS_FAILED=1
 rake test_common/lib/xmodule || TESTS_FAILED=1
-rake phantomjs_jasmine_lms || true
+if [[ "${JOB_NAME}" == "*cms*" ]]; then
+    rake phantomjs_jasmine_lms || true
+fi
 # Don't run the studio tests until feature/cale/cms-master is merged in
 # rake phantomjs_jasmine_cms || true
 rake coverage:xml coverage:html

From b16fa043710b85984ae36cfba876f8e260bf1da3 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Wed, 16 Jan 2013 15:08:23 -0500
Subject: [PATCH 366/541] pearson registration - resolved box-sizing display
 issue that caused form fields to not show text/be editable in Firefox/Mozilla

---
 lms/static/sass/multicourse/_testcenter-register.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lms/static/sass/multicourse/_testcenter-register.scss b/lms/static/sass/multicourse/_testcenter-register.scss
index 961fffd5d0..6d85fc167f 100644
--- a/lms/static/sass/multicourse/_testcenter-register.scss
+++ b/lms/static/sass/multicourse/_testcenter-register.scss
@@ -232,8 +232,9 @@ $red: rgb(178, 6, 16);
 				}
 
 				input, textarea {
+					height: 100%;
 					width: 100%;
-					padding: $baseline ($baseline*.75);					
+					padding: ($baseline/2);					
 
 					&.long {
 						width: 100%;

From 0193cc597646ad4be1d0a3ca417acb0027c86591 Mon Sep 17 00:00:00 2001
From: Ashley Penney <apenney@edx.org>
Date: Wed, 16 Jan 2013 15:08:55 -0500
Subject: [PATCH 367/541] Remove this altogether.

---
 jenkins/test.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/jenkins/test.sh b/jenkins/test.sh
index b4befa6d5f..7d946a24cd 100755
--- a/jenkins/test.sh
+++ b/jenkins/test.sh
@@ -45,9 +45,6 @@ TESTS_FAILED=0
 rake test_lms[false] || TESTS_FAILED=1
 rake test_common/lib/capa || TESTS_FAILED=1
 rake test_common/lib/xmodule || TESTS_FAILED=1
-if [[ "${JOB_NAME}" == "*cms*" ]]; then
-    rake phantomjs_jasmine_lms || true
-fi
 # Don't run the studio tests until feature/cale/cms-master is merged in
 # rake phantomjs_jasmine_cms || true
 rake coverage:xml coverage:html

From 1de67be788603405de8dfe3f6c478739b6ac0c80 Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Wed, 16 Jan 2013 15:43:15 -0500
Subject: [PATCH 368/541] clear upload_status if user makes changes to
 TestCenterUser or TestCenterRegistration (so the change is pending, rather
 than rejected)

---
 common/djangoapps/student/models.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index 6506e8b638..7b4a5fb9be 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -271,6 +271,7 @@ class TestCenterUserForm(ModelForm):
         new_user = self.save(commit=False)
         # create additional values here:
         new_user.user_updated_at = datetime.utcnow()
+        new_user.upload_status = ''
         new_user.save()
         log.info("Updated demographic information for user's test center exam registration: username \"{}\" ".format(new_user.user.username)) 
         
@@ -533,6 +534,7 @@ class TestCenterRegistrationForm(ModelForm):
         registration = self.save(commit=False)
         # create additional values here:
         registration.user_updated_at = datetime.utcnow()
+        registration.upload_status = ''
         registration.save()
         log.info("Updated registration information for user's test center exam registration: username \"{}\" course \"{}\", examcode \"{}\"".format(registration.testcenter_user.user.username, registration.course_id, registration.exam_series_code)) 
 

From e68e612ee120394f7731e740437a880d0f63a7d8 Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Wed, 16 Jan 2013 16:40:28 -0500
Subject: [PATCH 369/541] Return 404 in begin_exam_registration when course or
 exam are not valid

---
 common/djangoapps/student/views.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 8696c2ba28..f00e45d1fd 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -632,15 +632,18 @@ def begin_exam_registration(request, course_id):
     user = request.user
 
     try:
-        course = (course_from_id(course_id))
+        course = course_from_id(course_id)
     except ItemNotFoundError:
-        # TODO: do more than just log!!  The rest will fail, so we should fail right now.
-        log.error("User {0} enrolled in non-existent course {1}"
-                      .format(user.username, course_id))
+        log.error("User {0} enrolled in non-existent course {1}".format(user.username, course_id))
+        raise Http404
 
     # get the exam to be registered for:
     # (For now, we just assume there is one at most.)
+    # if there is no exam now (because someone bookmarked this stupid page),
+    # then return a 404:
     exam_info = course.current_test_center_exam
+    if exam_info is None:
+        raise Http404
 
     # determine if the user is registered for this course:
     registration = exam_registration_info(user, course)

From f7f563db9b7b4549d25ec7c1b846e659cede0249 Mon Sep 17 00:00:00 2001
From: John Hess <mgojohn@gmail.com>
Date: Wed, 16 Jan 2013 16:44:25 -0500
Subject: [PATCH 370/541] Use reverse() to lookup student progress page, use
 index to lookup module_state_key

---
 lms/djangoapps/instructor/views.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lms/djangoapps/instructor/views.py b/lms/djangoapps/instructor/views.py
index 37eff1689b..63279235db 100644
--- a/lms/djangoapps/instructor/views.py
+++ b/lms/djangoapps/instructor/views.py
@@ -196,7 +196,11 @@ def instructor_dashboard(request, course_id):
         if student_to_reset is not None:
             # find the module in question
             try:
-                module_to_reset=StudentModule.objects.get(student_id=student_to_reset.id, course_id=course_id, module_state_key__iendswith="/problem/"+problem_to_reset)
+                (org, course_name, run)=course_id.split("/")
+                module_state_key="i4x://"+org+"/"+course_name+"/problem/"+problem_to_reset
+                module_to_reset=StudentModule.objects.get(student_id=student_to_reset.id, 
+                                                          course_id=course_id, 
+                                                          module_state_key=module_state_key)
                 msg+="Found module to reset.  "
             except Exception as e:
                 msg+="<font color='red'>Couldn't find module with that urlname.  </font>"
@@ -232,6 +236,7 @@ def instructor_dashboard(request, course_id):
                 student_to_reset=User.objects.get(email=unique_student_identifier)
             else:
                 student_to_reset=User.objects.get(username=unique_student_identifier)
+            progress_url=reverse('student_progress',kwargs={'course_id':course_id,'student_id': student_to_reset.id})
             track.views.server_track(request, 
                                     '{instructor} requested progress page for {student} in {course}'.format(
                                         student=student_to_reset,
@@ -239,7 +244,7 @@ def instructor_dashboard(request, course_id):
                                         course=course_id),
                                     {}, 
                                     page='idashboard')
-            msg+="<a href='./progress/{0}' target='_blank'> Progress page for username: {1} with email address: {2}</a>.".format(str(student_to_reset.id),student_to_reset.username,student_to_reset.email)
+            msg+="<a href='{0}' target='_blank'> Progress page for username: {1} with email address: {2}</a>.".format(progress_url,student_to_reset.username,student_to_reset.email)
         except:
             msg+="<font color='red'>Couldn't find student with that username.  </font>"
 

From a756776836cc9a5c76f003e991900c8e9d14c40f Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Wed, 16 Jan 2013 17:26:29 -0500
Subject: [PATCH 371/541] pearson registration - revised rejection message text
 on dashboard, synced up email edx link text, revised contact styles/markup to
 remove giant red button dashboard for rejections

---
 lms/static/sass/multicourse/_dashboard.scss |  8 ++++++++
 lms/templates/dashboard.html                | 11 ++---------
 lms/templates/test_center_register.html     |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss
index c22bc14105..4555a426d3 100644
--- a/lms/static/sass/multicourse/_dashboard.scss
+++ b/lms/static/sass/multicourse/_dashboard.scss
@@ -426,6 +426,14 @@
           font-size: 1.2rem;
           font-weight: bold;
         }
+
+        strong {
+          font-weight: 700;
+        
+          a {
+            font-weight: 700;
+          }
+        }
       }
 
       .actions {
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index 0182a8edf1..8ec58a6a28 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -243,22 +243,15 @@
                     % endif
                     % if  registration.is_rejected:	    
                 <div class="message message-status is-shown exam-schedule">
-                  <p class="message-copy">Your 
-                    <a href="${testcenter_register_target}" id="exam_register_link">registration for the Pearson exam</a>
-     has been rejected. Please check the information you provided, and try to correct any demographic errors.  Otherwise
-     contact edX for further help.</p>
-                   <a href="mailto:exam-help@edx.org?subject=Pearson VUE Exam - ${get_course_about_section(course, 'university')} ${course.number}" class="button contact-button">Contact exam-help@edx.org</a>
+                  <p class="message-copy"><strong>Your registration for the Pearson exam has been rejected. Please <a href="${testcenter_register_target}" id="exam_register_link">see your registration status details</a></strong>. Otherwise <a class="contact-link" href="mailto:exam-help@edx.org?subject=Pearson VUE Exam - ${get_course_about_section(course, 'university')} ${course.number}">contact edX at exam-help@edx.org</a> for further help.</p>
                 </div>
                     % endif
                    	% if not registration.is_accepted and not registration.is_rejected:	    
 	            <div class="message message-status is-shown">
-    	              <p class="message-copy">Your 
-                    <a href="${testcenter_register_target}" id="exam_register_link">registration for the Pearson exam</a>
-     is pending. Within a few days, you should see a confirmation number here, which can be used to schedule your exam.</p>
+    	              <p class="message-copy"><strong>Your <a href="${testcenter_register_target}" id="exam_register_link">registration for the Pearson exam</a> is pending</strong>. Within a few days, you should see a confirmation number here, which can be used to schedule your exam.</p>
                 </div>
                     % endif
                 % endif
-
             % endif   
 
             <%
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index 03883d907c..4e1cece8c9 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -128,7 +128,7 @@
     % if registration.registration_is_rejected:      
     <section class="status message message-flash registration-rejected message-action is-shown">
       <h3 class="message-title">Your registration for the Pearson exam has been rejected</h3>
-      <p class="message-copy">Please see your registration status details for more information.</p>
+      <p class="message-copy">Please see your <strong>registration status</strong> details for more information.</p>
     </section>
     % endif
 

From fea6feb04fa434ecb07905caa123ea14879ce1bc Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Wed, 16 Jan 2013 17:39:33 -0500
Subject: [PATCH 372/541] Strip whitespace off of registration demographics
 before validation

---
 common/djangoapps/student/views.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index f00e45d1fd..1a9648835e 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -678,11 +678,18 @@ def create_exam_registration(request, post_override=None):
     username = post_vars['username']
     user = User.objects.get(username=username)
     course_id = post_vars['course_id']
-    course = (course_from_id(course_id))  # assume it will be found....
+    course = course_from_id(course_id)  # assume it will be found....
+
+    # make sure that any demographic data values received from the page have been stripped.
+    # Whitespace is not an acceptable response for any of these values
+    demographic_data = {}
+    for fieldname in TestCenterUser.user_provided_fields():
+        if fieldname in post_vars:
+            demographic_data[fieldname] = (post_vars[fieldname]).strip()
         
     try:
         testcenter_user = TestCenterUser.objects.get(user=user)
-        needs_updating = testcenter_user.needs_update(post_vars) 
+        needs_updating = testcenter_user.needs_update(demographic_data) 
         log.info("User {0} enrolled in course {1} {2}updating demographic info for exam registration".format(user.username, course_id, "" if needs_updating else "not "))
     except TestCenterUser.DoesNotExist:
         # do additional initialization here:
@@ -694,7 +701,7 @@ def create_exam_registration(request, post_override=None):
     if needs_updating:
         # first perform validation on the user information 
         # using a Django Form.
-        form = TestCenterUserForm(instance=testcenter_user, data=post_vars)
+        form = TestCenterUserForm(instance=testcenter_user, data=demographic_data)
         if form.is_valid():
             form.update_and_save()
         else:

From 4a59125bf900146cfbd033cb72bda91597a02e2b Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Wed, 16 Jan 2013 17:51:31 -0500
Subject: [PATCH 373/541] add pearson import confirmation tool

---
 .../commands/pearson_import_conf_zip.py       | 131 ++++++++++++++++++
 1 file changed, 131 insertions(+)
 create mode 100644 common/djangoapps/student/management/commands/pearson_import_conf_zip.py

diff --git a/common/djangoapps/student/management/commands/pearson_import_conf_zip.py b/common/djangoapps/student/management/commands/pearson_import_conf_zip.py
new file mode 100644
index 0000000000..7fbc1ab484
--- /dev/null
+++ b/common/djangoapps/student/management/commands/pearson_import_conf_zip.py
@@ -0,0 +1,131 @@
+import csv
+
+from zipfile import ZipFile
+from time import strptime, strftime
+
+from collections import OrderedDict
+from datetime import datetime
+from os.path import isdir
+from optparse import make_option
+
+from django.core.management.base import BaseCommand, CommandError
+
+from student.models import TestCenterUser, TestCenterRegistration
+
+class Command(BaseCommand):
+    
+    
+    args = '<input zip file>'
+    help = """
+    Import Pearson confirmation files and update TestCenterUser and TestCenterRegistration tables
+    with status.
+    """
+    def handle(self, *args, **kwargs):
+        if len(args) < 1:
+            print Command.help
+            return
+
+        source_zip = args[0]
+        # TODO: check that it's a zip
+        
+        
+        # loop through all files in zip, and process them based on filename prefix:
+        with ZipFile(source_zip, 'r') as zipfile:
+            for fileinfo in zipfile.infolist():
+                with zipfile.open(fileinfo) as zipentry:
+                    if fileinfo.filename.startswith("eac-"):
+                        self.process_eac(zipentry)
+                    elif fileinfo.filename.startswith("vcdc-"):
+                        self.process_vcdc(zipentry)
+                    else:
+                        raise CommandError("Unrecognized confirmation file type \"{}\" in confirmation zip file \"{}\"".format(fileinfo.filename, zipfile))
+        
+    def process_eac(self, eacfile):       
+        print "processing eac"
+        reader = csv.DictReader(eacfile, delimiter="\t")
+        for row in reader:
+            client_authorization_id = row['ClientAuthorizationID']
+            if client_authorization_id is not None:
+                try:
+                    registration = TestCenterRegistration.objects.get(client_authorization_id=client_authorization_id)
+                    print "Found authorization record for user {}".format(registration.testcenter_user.user.username)
+                    # now update the record:
+                    registration.upload_status = row['Status']
+                    registration.upload_error_message =  row['Message']
+                    try:
+                        registration.processed_at = strftime('%Y-%m-%d %H:%M:%S', strptime(row['Date'], '%Y/%m/%d %H:%M:%S'))
+                    except ValueError as ve:
+                        print "Bad Date value found for {}: message {}".format(client_authorization_id, ve)
+                    # store the Authorization Id if one is provided.  (For debugging)
+                    if row['AuthorizationID']:
+                        try:
+                            registration.authorization_id = int(row['AuthorizationID'])
+                        except ValueError as ve:
+                            print "Bad AuthorizationID value found for {}: message {}".format(client_authorization_id, ve)
+                                
+                    registration.confirmed_at = datetime.utcnow()
+                    registration.save()
+                except TestCenterRegistration.DoesNotExist:
+                    print " Failed to find record for client_auth_id {}".format(client_authorization_id)
+        
+    def process_vcdc(self, vcdcfile):       
+        print "processing vcdc"
+        reader = csv.DictReader(vcdcfile, delimiter="\t")
+        for row in reader:
+            client_candidate_id = row['ClientCandidateID']
+            if client_candidate_id is not None:
+                try:
+                    tcuser = TestCenterUser.objects.get(client_candidate_id=client_candidate_id)
+                    print "Found demographics record for user {}".format(tcuser.user.username)
+                    # now update the record:
+                    tcuser.upload_status = row['Status']
+                    tcuser.upload_error_message =  row['Message']
+                    try:
+                        tcuser.processed_at = strftime('%Y-%m-%d %H:%M:%S', strptime(row['Date'], '%Y/%m/%d %H:%M:%S'))
+                    except ValueError as ve:
+                        print "Bad Date value found for {}: message {}".format(client_candidate_id, ve)
+                    # store the Authorization Id if one is provided.  (For debugging)
+                    if row['CandidateID']:
+                        try:
+                            tcuser.candidate_id = int(row['CandidateID'])
+                        except ValueError as ve:
+                            print "Bad CandidateID value found for {}: message {}".format(client_candidate_id, ve)
+                    tcuser.confirmed_at = datetime.utcnow()
+                    tcuser.save()
+                except TestCenterUser.DoesNotExist:
+                    print " Failed to find record for client_candidate_id {}".format(client_candidate_id)
+        
+        
+#    def _try_parse_time(self, key):
+#        """
+#        Parse an optional metadata key containing a time: if present, complain
+#        if it doesn't parse.
+#        Return None if not present or invalid.
+#        """
+#        if key in self.exam_info:
+#                try:
+#                    return parse_time(self.exam_info[key])
+#                except ValueError as e:
+#                    msg = "Exam {0} in course {1} loaded with a bad exam_info key '{2}': '{3}'".format(self.exam_name, self.course_id, self.exam_info[key], e)
+#                    log.warning(msg)
+#                return None
+#        
+#        with open(destfile, "wb") as outfile:
+#            writer = csv.DictWriter(outfile,
+#                                    Command.CSV_TO_MODEL_FIELDS,
+#                                    delimiter="\t",
+#                                    quoting=csv.QUOTE_MINIMAL,
+#                                    extrasaction='ignore')
+#            writer.writeheader()
+#            for tcu in TestCenterUser.objects.order_by('id'):
+#                if dump_all or tcu.needs_uploading:
+#                    record = dict((csv_field, ensure_encoding(getattr(tcu, model_field)))
+#                                  for csv_field, model_field
+#                                  in Command.CSV_TO_MODEL_FIELDS.items())
+#                    record["LastUpdate"] = record["LastUpdate"].strftime("%Y/%m/%d %H:%M:%S")
+#                    writer.writerow(record)
+#                    tcu.uploaded_at = uploaded_at
+#                    tcu.save()
+
+
+        

From 1d36e7baf9cc2426413806379d0dc1f03184ebcd Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 17 Jan 2013 14:21:52 +0200
Subject: [PATCH 374/541] now we invoke gst consturctor as callback to
 javascript_loader, so dependencies are loaded first

---
 .../lib/xmodule/xmodule/js/src/graphical_slider_tool/gst.js   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst.js
index 1434d05f70..73252455d0 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst.js
@@ -14,7 +14,9 @@ window.GraphicalSliderTool = function (el) {
         // with a unique DOM ID), we will iterate over all children, and for
         // each match, we will call GstMain module.
         $(el).children('.graphical_slider_tool').each(function (index, value) {
-            GstMain($(value).attr('id'));
+            JavascriptLoader.executeModuleScripts($(value), function(){
+                GstMain($(value).attr('id'));
+            });
         });
     });
 };

From f22af62f2c6425bea3ff2fc29983862350bbb110 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 17 Jan 2013 14:22:13 +0200
Subject: [PATCH 375/541] removed jstat, added javascript_loader

---
 common/lib/xmodule/xmodule/gst_module.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index 3b8d96ee81..ef1be96c84 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -24,11 +24,10 @@ class GraphicalSliderToolModule(XModule):
     '''
 
     js = {
+      'coffee': [resource_string(__name__, 'js/src/javascript_loader.coffee')],
       'js': [
         # 3rd party libraries used by graphic slider tool.
         # TODO - where to store them - outside xmodule?
-        resource_string(__name__, 'js/src/graphical_slider_tool/jstat-1.0.0.min.js'),
-
         resource_string(__name__, 'js/src/graphical_slider_tool/gst_main.js'),
         resource_string(__name__, 'js/src/graphical_slider_tool/state.js'),
         resource_string(__name__, 'js/src/graphical_slider_tool/logme.js'),
@@ -38,8 +37,8 @@ class GraphicalSliderToolModule(XModule):
         resource_string(__name__, 'js/src/graphical_slider_tool/graph.js'),
         resource_string(__name__, 'js/src/graphical_slider_tool/el_output.js'),
         resource_string(__name__, 'js/src/graphical_slider_tool/g_label_el_output.js'),
-
         resource_string(__name__, 'js/src/graphical_slider_tool/gst.js')
+
       ]
     }
     js_module_name = "GraphicalSliderTool"

From 176be15998e085e9d5cade2466216bec75b8d1b0 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 17 Jan 2013 14:25:28 +0200
Subject: [PATCH 376/541] removed unnecssary debug information

---
 .../xmodule/xmodule/js/src/graphical_slider_tool/graph.js   | 4 ++--
 .../xmodule/js/src/graphical_slider_tool/gst_main.js        | 2 +-
 .../xmodule/xmodule/js/src/graphical_slider_tool/sliders.js | 6 +++---
 .../xmodule/xmodule/js/src/graphical_slider_tool/state.js   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 2520f0b12f..5b6223df43 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -401,7 +401,7 @@ define('Graph', ['logme'], function (logme) {
                     return false;
                 }
             } else {
-                logme('MESSAGE: "xticks" were not specified. Using defaults.');
+                // logme('MESSAGE: "xticks" were not specified. Using defaults.');
 
                 return false;
             }
@@ -416,7 +416,7 @@ define('Graph', ['logme'], function (logme) {
                     return false;
                 }
             } else {
-                logme('MESSAGE: "yticks" were not specified. Using defaults.');
+                // logme('MESSAGE: "yticks" were not specified. Using defaults.');
 
                 return false;
             }
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
index 34b54b4216..3d9f511ca9 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
@@ -19,7 +19,7 @@ define(
         if ($('#' + gstId).attr('data-processed') !== 'processed') {
             $('#' + gstId).attr('data-processed', 'processed');
         } else {
-            logme('MESSAGE: Already processed GST with ID ' + gstId + '. Skipping.');
+            // logme('MESSAGE: Already processed GST with ID ' + gstId + '. Skipping.');
 
             return;
         }
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
index 6201da8237..e73ca1c57e 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
@@ -20,9 +20,9 @@ define('Sliders', ['logme'], function (logme) {
             } else if (sliderDiv.length > 1) {
                 logme('ERROR: Found more than one slider for the parameter "' + paramName + '".');
                 logme('sliderDiv.length = ', sliderDiv.length);
-            } else {
-                logme('MESSAGE: Did not find a slider for the parameter "' + paramName + '".');
-            }
+            } // else {
+            //     logme('MESSAGE: Did not find a slider for the parameter "' + paramName + '".');
+            // }
         }
 
         function createSlider(sliderDiv, paramName) {
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
index 8b534fd19d..91a78f62ff 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
@@ -24,7 +24,7 @@ define('State', ['logme'], function (logme) {
         dynamicElByElId = {};
 
         stateInst += 1;
-        logme('MESSAGE: Creating state instance # ' + stateInst + '.');
+        // logme('MESSAGE: Creating state instance # ' + stateInst + '.');
 
         // Initially, there are no parameters to track. So, we will instantiate
         // an empty object.

From 48cbf38a412a8d53e21198d4a2dae66806da8f39 Mon Sep 17 00:00:00 2001
From: Chris Dodge <cdodge@edx.org>
Date: Thu, 17 Jan 2013 09:36:09 -0500
Subject: [PATCH 377/541] resolve merge conflicts

---
 common/lib/xmodule/setup.py                 |  4 +--
 common/lib/xmodule/xmodule/course_module.py | 34 +++++++++------------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/common/lib/xmodule/setup.py b/common/lib/xmodule/setup.py
index 82fdccb560..29227c3188 100644
--- a/common/lib/xmodule/setup.py
+++ b/common/lib/xmodule/setup.py
@@ -39,8 +39,8 @@ setup(
             "course_info = xmodule.html_module:CourseInfoDescriptor",
             "static_tab = xmodule.html_module:StaticTabDescriptor",
             "custom_tag_template = xmodule.raw_module:RawDescriptor",
-            "about = xmodule.html_module:AboutDescriptor"
-            "graphical_slider_tool = xmodule.gst_module:GraphicalSliderToolDescriptor",
+            "about = xmodule.html_module:AboutDescriptor",
+            "graphical_slider_tool = xmodule.gst_module:GraphicalSliderToolDescriptor"
         ]
     }
 )
diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py
index ea669df36b..a25433035e 100644
--- a/common/lib/xmodule/xmodule/course_module.py
+++ b/common/lib/xmodule/xmodule/course_module.py
@@ -128,6 +128,20 @@ class CourseDescriptor(SequenceDescriptor):
         self.syllabus_present = self.system.resources_fs.exists(path('syllabus'))
         self.set_grading_policy(self.definition['data'].get('grading_policy', None))
 
+        self.test_center_exams = []
+        test_center_info = self.metadata.get('testcenter_info')
+        if test_center_info is not None:
+            for exam_name in test_center_info:
+                try:
+                    exam_info = test_center_info[exam_name]
+                    self.test_center_exams.append(self.TestCenterExam(self.id, exam_name, exam_info))
+                except Exception as err:
+                    # If we can't parse the test center exam info, don't break
+                    # the rest of the courseware.
+                    msg = 'Error %s: Unable to load test-center exam info for exam "%s" of course "%s"' % (err, exam_name, self.id)
+                    log.error(msg)
+                    continue
+
     def defaut_grading_policy(self):
         """
         Return a dict which is a copy of the default grading policy
@@ -228,26 +242,6 @@ class CourseDescriptor(SequenceDescriptor):
         if policy_dir:
             paths = [policy_dir + '/grading_policy.json'] + paths
 
-<<<<<<< HEAD
-=======
-        self.test_center_exams = []
-        test_center_info = self.metadata.get('testcenter_info')
-        if test_center_info is not None:
-            for exam_name in test_center_info:
-                try:
-                    exam_info = test_center_info[exam_name]
-                    self.test_center_exams.append(self.TestCenterExam(self.id, exam_name, exam_info))
-                except Exception as err:
-                    # If we can't parse the test center exam info, don't break
-                    # the rest of the courseware.
-                    msg = 'Error %s: Unable to load test-center exam info for exam "%s" of course "%s"' % (err, exam_name, self.id)
-                    log.error(msg)
-                    continue
-
-
-    def set_grading_policy(self, policy_str):
-        """Parse the policy specified in policy_str, and save it"""
->>>>>>> master
         try:
             policy = json.loads(cls.read_grading_policy(paths, system))
         except ValueError:

From fcf92a371de88ffe221488cae1535d0a6981bab0 Mon Sep 17 00:00:00 2001
From: Chris Dodge <cdodge@edx.org>
Date: Thu, 17 Jan 2013 09:48:10 -0500
Subject: [PATCH 378/541] fix up testing failures post merge

---
 lms/djangoapps/courseware/tests/tests.py | 40 ++++++++++++------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/lms/djangoapps/courseware/tests/tests.py b/lms/djangoapps/courseware/tests/tests.py
index b32e6c56e0..bf8a65126d 100644
--- a/lms/djangoapps/courseware/tests/tests.py
+++ b/lms/djangoapps/courseware/tests/tests.py
@@ -291,29 +291,29 @@ class PageLoader(ActivateLoginTestCase):
                 #print descriptor.__class__, descriptor.location
                 resp = self.client.get(reverse('jump_to',
                                        kwargs={'course_id': course_id,
-                                               'location': descriptor.location.url()}))
+                                               'location': descriptor.location.url()}), follow=True)
                 msg = str(resp.status_code)
 
-            if resp.status_code != 200:
-                msg = "ERROR " + msg  + ": " + descriptor.location.url()
-                all_ok = False
-                num_bad += 1
-            elif resp.redirect_chain[0][1] != 302:
-                msg = "ERROR on redirect from " + descriptor.location.url()
-                all_ok = False
-                num_bad += 1
+                if resp.status_code != 200:
+                    msg = "ERROR " + msg  + ": " + descriptor.location.url()
+                    all_ok = False
+                    num_bad += 1
+                elif resp.redirect_chain[0][1] != 302:
+                    msg = "ERROR on redirect from " + descriptor.location.url()
+                    all_ok = False
+                    num_bad += 1
 
-            # check content to make sure there were no rendering failures
-            content = resp.content
-            if content.find("this module is temporarily unavailable")>=0:
-                msg = "ERROR unavailable module "
-                all_ok = False
-                num_bad += 1
-            elif isinstance(descriptor, ErrorDescriptor):
-                msg = "ERROR error descriptor loaded: "
-                msg = msg + descriptor.definition['data']['error_msg']
-                all_ok = False
-                num_bad += 1
+                # check content to make sure there were no rendering failures
+                content = resp.content
+                if content.find("this module is temporarily unavailable")>=0:
+                    msg = "ERROR unavailable module "
+                    all_ok = False
+                    num_bad += 1
+                elif isinstance(descriptor, ErrorDescriptor):
+                    msg = "ERROR error descriptor loaded: "
+                    msg = msg + descriptor.definition['data']['error_msg']
+                    all_ok = False
+                    num_bad += 1
 
             print msg
             self.assertTrue(all_ok)  # fail fast

From 80b2f45ac58674ce9f92c7920f1bddebbbb1d7e1 Mon Sep 17 00:00:00 2001
From: Brian Wilson <brian@edx.org>
Date: Thu, 17 Jan 2013 10:14:55 -0500
Subject: [PATCH 379/541] move pearson_import to another branch

---
 .../commands/pearson_import_conf_zip.py       | 131 ------------------
 1 file changed, 131 deletions(-)
 delete mode 100644 common/djangoapps/student/management/commands/pearson_import_conf_zip.py

diff --git a/common/djangoapps/student/management/commands/pearson_import_conf_zip.py b/common/djangoapps/student/management/commands/pearson_import_conf_zip.py
deleted file mode 100644
index 7fbc1ab484..0000000000
--- a/common/djangoapps/student/management/commands/pearson_import_conf_zip.py
+++ /dev/null
@@ -1,131 +0,0 @@
-import csv
-
-from zipfile import ZipFile
-from time import strptime, strftime
-
-from collections import OrderedDict
-from datetime import datetime
-from os.path import isdir
-from optparse import make_option
-
-from django.core.management.base import BaseCommand, CommandError
-
-from student.models import TestCenterUser, TestCenterRegistration
-
-class Command(BaseCommand):
-    
-    
-    args = '<input zip file>'
-    help = """
-    Import Pearson confirmation files and update TestCenterUser and TestCenterRegistration tables
-    with status.
-    """
-    def handle(self, *args, **kwargs):
-        if len(args) < 1:
-            print Command.help
-            return
-
-        source_zip = args[0]
-        # TODO: check that it's a zip
-        
-        
-        # loop through all files in zip, and process them based on filename prefix:
-        with ZipFile(source_zip, 'r') as zipfile:
-            for fileinfo in zipfile.infolist():
-                with zipfile.open(fileinfo) as zipentry:
-                    if fileinfo.filename.startswith("eac-"):
-                        self.process_eac(zipentry)
-                    elif fileinfo.filename.startswith("vcdc-"):
-                        self.process_vcdc(zipentry)
-                    else:
-                        raise CommandError("Unrecognized confirmation file type \"{}\" in confirmation zip file \"{}\"".format(fileinfo.filename, zipfile))
-        
-    def process_eac(self, eacfile):       
-        print "processing eac"
-        reader = csv.DictReader(eacfile, delimiter="\t")
-        for row in reader:
-            client_authorization_id = row['ClientAuthorizationID']
-            if client_authorization_id is not None:
-                try:
-                    registration = TestCenterRegistration.objects.get(client_authorization_id=client_authorization_id)
-                    print "Found authorization record for user {}".format(registration.testcenter_user.user.username)
-                    # now update the record:
-                    registration.upload_status = row['Status']
-                    registration.upload_error_message =  row['Message']
-                    try:
-                        registration.processed_at = strftime('%Y-%m-%d %H:%M:%S', strptime(row['Date'], '%Y/%m/%d %H:%M:%S'))
-                    except ValueError as ve:
-                        print "Bad Date value found for {}: message {}".format(client_authorization_id, ve)
-                    # store the Authorization Id if one is provided.  (For debugging)
-                    if row['AuthorizationID']:
-                        try:
-                            registration.authorization_id = int(row['AuthorizationID'])
-                        except ValueError as ve:
-                            print "Bad AuthorizationID value found for {}: message {}".format(client_authorization_id, ve)
-                                
-                    registration.confirmed_at = datetime.utcnow()
-                    registration.save()
-                except TestCenterRegistration.DoesNotExist:
-                    print " Failed to find record for client_auth_id {}".format(client_authorization_id)
-        
-    def process_vcdc(self, vcdcfile):       
-        print "processing vcdc"
-        reader = csv.DictReader(vcdcfile, delimiter="\t")
-        for row in reader:
-            client_candidate_id = row['ClientCandidateID']
-            if client_candidate_id is not None:
-                try:
-                    tcuser = TestCenterUser.objects.get(client_candidate_id=client_candidate_id)
-                    print "Found demographics record for user {}".format(tcuser.user.username)
-                    # now update the record:
-                    tcuser.upload_status = row['Status']
-                    tcuser.upload_error_message =  row['Message']
-                    try:
-                        tcuser.processed_at = strftime('%Y-%m-%d %H:%M:%S', strptime(row['Date'], '%Y/%m/%d %H:%M:%S'))
-                    except ValueError as ve:
-                        print "Bad Date value found for {}: message {}".format(client_candidate_id, ve)
-                    # store the Authorization Id if one is provided.  (For debugging)
-                    if row['CandidateID']:
-                        try:
-                            tcuser.candidate_id = int(row['CandidateID'])
-                        except ValueError as ve:
-                            print "Bad CandidateID value found for {}: message {}".format(client_candidate_id, ve)
-                    tcuser.confirmed_at = datetime.utcnow()
-                    tcuser.save()
-                except TestCenterUser.DoesNotExist:
-                    print " Failed to find record for client_candidate_id {}".format(client_candidate_id)
-        
-        
-#    def _try_parse_time(self, key):
-#        """
-#        Parse an optional metadata key containing a time: if present, complain
-#        if it doesn't parse.
-#        Return None if not present or invalid.
-#        """
-#        if key in self.exam_info:
-#                try:
-#                    return parse_time(self.exam_info[key])
-#                except ValueError as e:
-#                    msg = "Exam {0} in course {1} loaded with a bad exam_info key '{2}': '{3}'".format(self.exam_name, self.course_id, self.exam_info[key], e)
-#                    log.warning(msg)
-#                return None
-#        
-#        with open(destfile, "wb") as outfile:
-#            writer = csv.DictWriter(outfile,
-#                                    Command.CSV_TO_MODEL_FIELDS,
-#                                    delimiter="\t",
-#                                    quoting=csv.QUOTE_MINIMAL,
-#                                    extrasaction='ignore')
-#            writer.writeheader()
-#            for tcu in TestCenterUser.objects.order_by('id'):
-#                if dump_all or tcu.needs_uploading:
-#                    record = dict((csv_field, ensure_encoding(getattr(tcu, model_field)))
-#                                  for csv_field, model_field
-#                                  in Command.CSV_TO_MODEL_FIELDS.items())
-#                    record["LastUpdate"] = record["LastUpdate"].strftime("%Y/%m/%d %H:%M:%S")
-#                    writer.writerow(record)
-#                    tcu.uploaded_at = uploaded_at
-#                    tcu.save()
-
-
-        

From 00f83d03a026dc49a0aab993c35cd99d8c87a048 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s=20Rocha?= <rocha@edx.org>
Date: Wed, 16 Jan 2013 17:03:27 -0500
Subject: [PATCH 380/541] Restore /faq page, and moved new content to /help

---
 lms/static/js/{faq.js => help.js}             |   0
 lms/static/sass/multicourse/_about_pages.scss |  23 +-
 lms/static/sass/multicourse/_help.scss        |  88 +++--
 lms/templates/static_templates/faq.html       | 300 +++-------------
 lms/templates/static_templates/help.html      | 320 ++++++++++++++++--
 5 files changed, 397 insertions(+), 334 deletions(-)
 rename lms/static/js/{faq.js => help.js} (100%)

diff --git a/lms/static/js/faq.js b/lms/static/js/help.js
similarity index 100%
rename from lms/static/js/faq.js
rename to lms/static/js/help.js
diff --git a/lms/static/sass/multicourse/_about_pages.scss b/lms/static/sass/multicourse/_about_pages.scss
index 03ed6be5c4..a72a77c89f 100644
--- a/lms/static/sass/multicourse/_about_pages.scss
+++ b/lms/static/sass/multicourse/_about_pages.scss
@@ -194,30 +194,9 @@
         margin-bottom: 40px;
 
         h3 {
-          background: url('/static/images/bullet-closed.png') no-repeat left 0.25em;
           font-family: $sans-serif;
           font-weight: 700;
-          margin-bottom: 10px;
-          padding-left: 20px;
-          cursor: pointer;
-        }
-
-        .answer {
-          display: none;
-          color: #3c3c3c;
-          padding-left: 16px;
-          font-family: $serif;
-          li {
-            line-height: 1.6em;
-          }
-        }
-
-        // opened states
-        &.opened {
-
-          h3 {
-            background: url('/static/images/bullet-open.png') no-repeat left 0.25em;
-          }
+          margin-bottom: 15px;
         }
       }
     }
diff --git a/lms/static/sass/multicourse/_help.scss b/lms/static/sass/multicourse/_help.scss
index ca1011951e..9cc0030efb 100644
--- a/lms/static/sass/multicourse/_help.scss
+++ b/lms/static/sass/multicourse/_help.scss
@@ -1,36 +1,78 @@
 .static-container.help {
+
   section.questions {
-    float: left;
-    width: flex-grid(9);
-    margin-right: flex-gutter();
+    @include clearfix;
 
-    article {
-      margin-bottom: 40px;
+    nav.categories {
+      border: 1px solid rgb(220,220,220);
+      @include box-sizing(border-box);
+      float: left;
+      margin-left: flex-gutter();
+      padding: 20px;
+      width: flex-grid(3);
 
-      h2 {
-        border-bottom: 1px solid rgb(220,220,220);
-        margin-bottom: 40px;
-        padding-bottom: 20px;
+      a {
+        display: block;
+        letter-spacing: 1px;
+        margin: 0px -20px;
+        padding: 12px 0px 12px 20px;
+        text-align: left;
+
+        &:hover {
+          background: rgb(245,245,245);
+          text-decoration: none;
+        }
       }
     }
-  }
 
-  section.emails {
-    border: 1px solid rgb(220,220,220);
-    @include box-sizing(border-box);
-    float: left;
-    padding: 20px;
-    width: flex-grid(3);
+    .responses {
+      float: left;
+      width: flex-grid(9);
 
-    ul {
-      margin-left: 0;
-      padding-left: 0;
-      list-style: none;
+      .category {
+        padding-top: 40px;
 
-      li {
-        margin-bottom: 1em;
+        &:first-child {
+          padding-top: 0px;
+        }
+
+        > h2 {
+          border-bottom: 1px solid rgb(220,220,220);
+          margin-bottom: 40px;
+          padding-bottom: 20px;
+        }
+      }
+
+      .response {
+        margin-bottom: 40px;
+
+        h3 {
+          background: url('/static/images/bullet-closed.png') no-repeat left 0.25em;
+          font-family: $sans-serif;
+          font-weight: 700;
+          margin-bottom: 10px;
+          padding-left: 20px;
+          cursor: pointer;
+        }
+
+        .answer {
+          display: none;
+          color: #3c3c3c;
+          padding-left: 16px;
+          font-family: $serif;
+          li {
+            line-height: 1.6em;
+          }
+        }
+
+        // opened states
+        &.opened {
+
+          h3 {
+            background: url('/static/images/bullet-open.png') no-repeat left 0.25em;
+          }
+        }
       }
     }
   }
 }
-
diff --git a/lms/templates/static_templates/faq.html b/lms/templates/static_templates/faq.html
index e91f3d0519..b0543df264 100644
--- a/lms/templates/static_templates/faq.html
+++ b/lms/templates/static_templates/faq.html
@@ -5,10 +5,6 @@
 
 <%block name="title"><title>FAQ</title></%block>
 
-<%block name="js_extra">
-<script src="${static.url('js/faq.js')}"></script>
-</%block>
-
 <section class="container about">
   <nav>
     <a href="${reverse('about_edx')}">Vision</a>
@@ -17,298 +13,80 @@
     <a href="${reverse('contact')}">Contact</a>
   </nav>
 
+
   <section class="faq">
     <section class="responses">
+      <section id="the-organization" class="category">
+        <h2>Organization</h2>
+        <article class="response">
+          <h3>What is edX?</h3>
+          <p>edX is a not-for-profit enterprise of its founding partners, the Massachusetts Institute of Technology (MIT) and Harvard University that offers online learning to on-campus students and to millions of people around the world. To do so, edX is building an open-source online learning platform and hosts an online web portal at <a href="http://www.edx.org">www.edx.org</a> for online education.</p>
+          <p>EdX currently offers HarvardX, <em>MITx</em> and BerkeleyX classes online for free. Beginning in fall 2013, edX will offer WellesleyX and GeorgetownX classes online for free. The University of Texas System includes nine universities and six health institutions. The edX institutions aim to extend their collective reach to build a global community of online students. Along with offering online courses, the three universities undertake research on how students learn and how technology can transform learning both on-campus and online throughout the world.</p>
+        </article>
 
-      <section id="edx_basics_faq" class="category">
-        <h2>edX Basics</h2>
         <article class="response">
-          <h3 class="question">How do I sign up to take a class?</h3>
-          <div class ="answer" id="edx_basics_faq_answer_0">
-            <p>Simply create an edX account (it's free) and then register for the course of your choice (also free). Follow the prompts on the edX website.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">What does it cost to take a class? Is this really free?</h3>
-          <div class ="answer" id="edx_basics_faq_answer_1">
-            <p>EdX courses are free for everyone. All you need is an Internet connection.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">What happens after I sign up for a course?</h3>
-          <div class ="answer" id="edx_basics_faq_answer_2">
-            <p>You will receive an activation email. Follow the prompts in that email to activate your account. You will need to log in each time you access your course(s). Once the course begins, it’s time to hit the virtual books. You can access the lectures, homework, tutorials, etc., for each week, one week at a time.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">Who can take an edX course?</h3>
-          <div class ="answer" id="edx_basics_faq_answer_3">
-            <p>You, your mom, your little brother, your grandfather -- anyone with Internet access can take an edX course. Free.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">Are the courses only offered in English?</h3>
-          <div class ="answer" id="edx_basics_faq_answer_4">
-            <p>Some edX courses include a translation of the lecture in the text bar to the right of the video. Some have the specific option of requesting a course in other languages. Please check your course to determine foreign language options.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">When will there be more courses on other subjects?</h3>
-          <div class ="answer" id="edx_basics_faq_answer_5">
-            <p>We are continually reviewing and creating courses to add to the edX platform. Please check the website for future course announcements. You can also "friend" edX on Facebook – you’ll receive updates and announcements.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">How can I help edX?</h3>
-          <div class ="answer" id="edx_basics_faq_answer_6">
-            <p>You may not realize it, but just by taking a course you are helping edX. That’s because the edX platform has been specifically designed to not only teach, but also gather data about learning. EdX will utilize this data to find out how to improve education online and on-campus.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">When does my course start and/or finish?</h3>
-          <div class ="answer" id="edx_basics_faq_answer_7">
-            <p>You can find the start and stop dates for each course on each course description page.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">Is there a walk-through of a sample course session?</h3>
-          <div class ="answer" id="edx_basics_faq_answer_8">
-            <p> There are video introductions for every course that will give you a good sense of how the course works and what to expect.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">I don't have the prerequisites for a course that I am interested in. Can I still take the course?</h3>
-          <div class ="answer" id="edx_basics_faq_answer_9">
-            <p>We do not check students for prerequisites, so you are allowed to attempt the course. However, if you do not know prerequisite subjects before taking a class, you will have to learn the prerequisite material on your own over the semester, which can be an extremely difficult task.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">What happens if I have to quit a course, are there any penalties, will I be able to take another course in the future?</h3>
-          <div class ="answer" id="edx_basics_faq_answer_10">
-            <p>You may unregister from an edX course at anytime, there are absolutely no penalties associated with incomplete edX studies, and you may register for the same course (provided we are still offering it) at a later time.</p>
-          </div>
+          <h3>Will edX be adding additional X Universities?</h3>
+          <p>More than 200 institutions from around the world have expressed interest in collaborating with edX since Harvard and MIT announced its creation in May. EdX is focused above all on quality and developing the best not-for-profit model for online education. In addition to providing online courses on the edX platform, the "X University" Consortium will be a forum in which members can share experiences around online learning. Harvard, MIT, UC Berkeley, the University of Texas system and the other consortium members will work collaboratively to establish the "X University" Consortium, whose membership will expand to include additional "X Universities". Each member of the consortium will offer courses on the edX platform as an "X University." The gathering of many universities' educational content together on one site will enable learners worldwide to access the offered course content of any participating university from a single website, and to use a set of online educational tools shared by all participating universities.</p>
+          <p>edX will actively explore the addition of other institutions from around the world to the edX platform, and looks forward to adding more "X Universities."</p>
         </article>
       </section>
 
-      <section id="classes_faq" class="category">
-        <h2>The Classes</h2>
+      <section id="students" class="category">
+        <h2>Students</h2>
         <article class="response">
-          <h3 class="question">How much work will I have to do to pass my course?</h3>
-          <div class ="answer" id="classes_faq_answer_0">
-            <p>The projected hours of study required for each course are described on the specific course description page.</p>
-          </div>
+          <h3>Who can take edX courses? Will there be an admissions process?</h3>
+          <p>EdX will be available to anyone in the world with an internet connection, and in general, there will not be an admissions process.</p>
         </article>
         <article class="response">
-          <h3 class="question">What should I do before I take a course (prerequisites)?</h3>
-          <div class ="answer" id="classes_faq_answer_1">
-            <p>Each course is different – some have prerequisites, and some don’t. Take a look at your specific course’s recommended prerequisites. If you do not have a particular prerequisite, you may still take the course.</p>
-          </div>
+          <h3>Will certificates be awarded?</h3>
+          <p>Yes. Online learners who demonstrate mastery of subjects can earn a certificate of completion. Certificates will be issued by edX under the name of the underlying "X University" from where the course originated, i.e. HarvardX, <em>MITx</em> or BerkeleyX.  For the courses in Fall 2012, those certificates will be free.  There is a plan to charge a modest fee for certificates in the future.</p>
         </article>
         <article class="response">
-          <h3 class="question">What books should I read? (I am interested in reading materials before the class starts).</h3>
-          <div class ="answer" id="classes_faq_answer_2">
-            <p>Take a look at the specific course prerequisites. All required academic materials will be provided during the course, within the browser. Some of the course descriptions may list additional resources. For supplemental reading material before or during the course, you can post a question on the course’s Discussion Forum to ask your online coursemates for suggestions.</p>
-          </div>
+          <h3>What will the scope of the online courses be? How many? Which faculty?</h3>
+          <p>Our goal is to offer a wide variety of courses across disciplines. There are currently <a href="/courses">nine courses</a> offered for Fall 2012.</p>
         </article>
         <article class="response">
-          <h3 class="question"> Can I download the book for my course?</h3>
-          <div class ="answer" id="classes_faq_answer_3">
-            <p>EdX book content may only be viewed within the browser, and downloading it violates copyright laws. If you need or want a hard copy of the book, we recommend that you purchase a copy.</p>
-          </div>
+          <h3>Who is the learner? Domestic or international? Age range?</h3>
+          <p>Improving teaching and learning for students on our campuses is one of our primary goals. Beyond that, we don't have a target group of potential learners, as the goal is to make these courses available to anyone in the world - from any demographic - who has interest in advancing their own knowledge. The only requirement is to have a computer with an internet connection. More than 150,000 students from over 160 countries registered for MITx's first course, 6.002x: Circuits and Electronics. The age range of students certified in this course was from 14 to 74 years-old.</p>
         </article>
         <article class="response">
-          <h3 class="question">Can I take more than one course at a time?</h3>
-          <div class ="answer" id="classes_faq_answer_4">
-            <p>You may take multiple edX courses, however we recommend checking the requirements on each course description page to determine your available study hours and the demands of the intended courses.</p>
-          </div>
+          <h3>Will participating universities' standards apply to all courses offered on the edX platform?</h3>
+          <p>Yes: the reach changes exponentially, but the rigor remains the same.</p>
         </article>
         <article class="response">
-          <h3 class="question">How do I log in to take an edX class?</h3>
-          <div class ="answer" id="classes_faq_answer_5">
-            <p>Once you sign up for a course and activate your account, click on the "Log In" button on the edx.org home page. You will need to type in your email address and edX password each time you log in.</p>
-          </div>
+          <h3>How do you intend to test whether this approach is improving learning?</h3>
+          <p>Edx institutions have assembled faculty members who will collect and analyze data to assess results and the impact edX is having on learning.</p>
         </article>
         <article class="response">
-          <h3 class="question">What time is the class?</h3>
-          <div class ="answer" id="classes_faq_answer_6">
-            <p>EdX classes take place at your convenience. Prefer to sleep in and study late? No worries. Videos and problem sets are available 24 hours a day, which means you can watch video and complete work whenever you have spare time. You simply log in to your course via the Internet and work through the course material, one week at a time.</p>
-          </div>
+          <h3>How may I apply to study with edX?</h3>
+          <p>Simply complete the online <a href="#signup-modal" rel="leanModal">signup form</a>.  Enrolling will create your unique student record in the edX database, allow you to register for classes, and to receive a certificate on successful completion.</p>
         </article>
         <article class="response">
-          <h3 class="question">If I miss a week, how does this affect my grade?</h3>
-          <div class ="answer" id="classes_faq_answer_7">
-            <p>It is certainly possible to pass an edX course if you miss a week; however, coursework is progressive, so you should review and study what you may have missed. You can check your progress dashboard in the course to see your course average along the way if you have any concerns.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">How can I meet/find other students?</h3>
-          <div class ="answer" id="classes_faq_answer_8">
-            <p>All edX courses have Discussion Forums where you can chat with and help each other within the framework of the Honor Code.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">How can I talk to professors, fellows and teaching assistants?</h3>
-          <div class ="answer" id="classes_faq_answer_9">
-            <p>The Discussion Forums are the best place to reach out to the edX teaching team for your class, and you don’t have to wait in line or rearrange your schedule to fit your professor’s – just post your questions. The response isn’t always immediate, but it’s usually pretty darned quick.</p>
-          </div>
+          <h3>How may another university participate in edX? </h3>
+          <p>If you are from a university interested in discussing edX, please email <a href="mailto:university@edx.org">university@edx.org</a></p>
         </article>
       </section>
 
-      <section id="getting_help_faq" class="category">
-        <h2>Getting Help</h2>
+      <section id="technology-platform" class="category">
+        <h2>Technology Platform</h2>
         <article class="response">
-          <h3 class="question">Can I re-take a course?</h3>
-          <div class ="answer" id="getting_help_faq_answer_0">
-            <p>Good news: there are unlimited "mulligans" in edX. You may re-take edX courses as often as you wish. Your performance in any particular offering of a course will not effect your standing in future offerings of any edX course, including future offerings of the same course.</p>
-          </div>
+          <h3>What technology will edX use?</h3>
+          <p>The edX open-source online learning platform will feature interactive learning designed specifically for the web. Features will include: self-paced learning, online discussion groups, wiki-based collaborative learning, assessment of learning as a student progresses through a course, and online laboratories and other interactive learning tools. The platform will also serve as a laboratory from which data will be gathered to better understand how students learn. Because it is open source, the platform will be continuously improved by a worldwide community of collaborators, with new features added as needs arise.</p>
+          <p>The first version of the technology was used in the first <em>MITx</em> course, 6.002x Circuits and Electronics, which launched in Spring, 2012.</p>
         </article>
         <article class="response">
-          <h3 class="question">Enrollment for a course that I am interested in is open, but the course has already started. Can I still enroll?</h3>
-          <div class ="answer" id="getting_help_faq_answer_1">
-            <p>Yes, but you will not be able to turn in any assignments or exams that have already been due. If it is early in the course, you might still be able to earn enough points for a certificate, but you will have to check with the course in question in order to find out more.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">Is there an exam at the end?</h3>
-          <div class ="answer" id="getting_help_faq_answer_2">
-            <p>Different courses have slightly different structures. Please check the course material description to see if there is a final exam or final project.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">Will the same courses be offered again in the future?</h3>
-          <div class ="answer" id="getting_help_faq_answer_3">
-            <p>Existing edX courses will be re-offered, and more courses added.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">Will I get a certificate for taking an edX course?</h3>
-          <div class ="answer" id="getting_help_faq_answer_4">
-            <p>Online learners who receive a passing grade for a course will receive a certificate of mastery from edX and the underlying X University that offered the course. For example, a certificate of mastery for MITx’s 6.002x Circuits & Electronics will come from edX and MITx.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">How are edX certificates delivered?</h3>
-          <div class ="answer" id="getting_help_faq_answer_5">
-            <p>EdX certificates are delivered online through edx.org. So be sure to check your email in the weeks following the final grading – you will be able to download and print your certificate.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">What is the difference between a proctored certificate and an honor code certificate?</h3>
-          <div class ="answer" id="getting_help_faq_answer_6">
-            <p>A proctored certificate is given to students who take and pass an exam under proctored conditions. An honor-code certificate is given to students who have completed all of the necessary online coursework associated with a course and have signed <link> the edX honor code </link>.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">Yes. The requirements for both certificates can be independently satisfied.</h3>
-          <div class ="answer" id="getting_help_faq_answer_7">
-            <p>It is certainly possible to pass an edX course if you miss a week; however, coursework is progressive, so you should review and study what you may have missed. You can check your progress dashboard in the course to see your course average along the way if you have any concerns.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">Will my grade be shown on my certificate?</h3>
-          <div class ="answer" id="getting_help_faq_answer_8">
-            <p>No. Grades are not displayed on either honor code or proctored certificates.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">How can I talk to professors, fellows and teaching assistants?</h3>
-          <div class ="answer" id="getting_help_faq_answer_9">
-            <p>The Discussion Forums are the best place to reach out to the edX teaching team for your class, and you don’t have to wait in line or rearrange your schedule to fit your professor’s – just post your questions. The response isn’t always immediate, but it’s usually pretty darned quick.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">The only certificates distributed with grades by edX were for the initial prototype course.</h3>
-          <div class ="answer" id="getting_help_faq_answer_10">
-            <p>You may unregister from an edX course at anytime, there are absolutely no penalties associated with incomplete edX studies, and you may register for the same course (provided we are still offering it) at a later time.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">Will my university accept my edX coursework for credit?</h3>
-          <div class ="answer" id="getting_help_faq_answer_11">
-            <p>Each educational institution makes its own decision regarding whether to accept edX coursework for credit. Check with your university for its policy.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">I lost my edX certificate – can you resend it to me?</h3>
-          <div class ="answer" id="getting_help_faq_answer_12">
-            <p>Please log back in to your account to find certificates from the same profile page where they were originally posted. You will be able to re-print your certificate from there.</p>
-          </div>
-        </article>
-      </section>
-
-      <section id="open_source_faq" class="category">
-        <h2>edX & Open Source</h2>
-        <article class="response">
-          <h3 class="question">What’s open source?</h3>
-          <div class ="answer" id="open_source_faq_answer_0">
-            <p>Open source is a philosophy that generally refers to making software freely available for use or modification as users see fit. In exchange for use of the software, users generally add their contributions to the software, making it a public collaboration. The edX platform will be made available as open source code in order to allow world talent to improve and share it on an ongoing basis.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">When/how can I get the open-source platform technology?</h3>
-          <div class ="answer" id="open_source_faq_answer_1">
-            <p>We are still building the edX technology platform and will be making announcements in the future about its availability.</p>
-          </div>
-        </article>
-      </section>
-
-      <section id="other_help_faq" class="category">
-        <h2>Other Help Questions - Account Questions</h2>
-        <article class="response">
-          <h3 class="question">My username is taken.</h3>
-          <div class ="answer" id="other_help_faq_answer_0">
-            <p>Now’s your chance to be creative: please try a different, more unique username – for example, try adding a random number to the end.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">Why does my password show on my course login page?</h3>
-          <div class ="answer" id="other_help_faq_answer_1">
-            <p>Oops! This may be because of the way you created your account. For example, you may have mistakenly typed your password into the login box.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">I am having login problems (password/email unrecognized).</h3>
-          <div class ="answer" id="other_help_faq_answer_2">
-            <p>Please check your browser’s settings to make sure that you have the current version of Firefox or Chrome, and then try logging in again. If you find access impossible, you may simply create a new account using an alternate email address – the old, unused account will disappear later.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">I did not receive an activation email.</h3>
-          <div class ="answer" id="other_help_faq_answer_3">
-            <p>If you did not receive an activation email it may be because:</p>
-            <ul>
-              <li>There was a typo in your email address.</li>
-              <li>Your spam filter may have caught the activation email. Please check your spam folder. </li>
-              <li>You may be using an older browser. We recommend downloading the current version of Firefox or Chrome. </li>
-              <li>JavaScript is disabled in your browser. Please check your browser settings and confirm that JavaScript is enabled. </li>
-            </ul>
-            <p>If you continue to have problems activating your account, we recommend that you try creating a new account. There is no need to do anything about the old account. If it is not activated through the link in the email, it will disappear later.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">Can I delete my account?</h3>
-          <div class ="answer" id="other_help_faq_answer_4">
-            <p>There’s no need to delete you account. An old, unused edX account with no course completions associated with it will disappear.</p>
-          </div>
-        </article>
-        <article class="response">
-          <h3 class="question">I am experiencing problems with the display. E.g., There are tools missing from the course display, or I am unable to view video.</h3>
-          <div class ="answer" id="other_help_faq_answer_5">
-            <p>Please check your browser and settings. We recommend downloading the current version of Firefox or Chrome. Alternatively, you may re-register with a different email account. There is no need to delete the old account, as it will disappear if unused.</p>
-          </div>
+          <h3>How is this different from what other universities are doing online?</h3>
+          <p>EdX is a not-for-profit enterprise built upon the shared educational missions of its founding partners, Harvard University and MIT. The edX platform will be available as open source. Also, a primary goal of edX is to improve teaching and learning on campus by experimenting with blended models of learning and by supporting faculty in conducting significant research on how students learn.</p>
         </article>
       </section>
 
     </section>
 
     <nav class="categories">
-      <a href="#edx_basics_faq">edX Basics</a>
-      <a href="#classes_faq">The Classes</a>
-      <a href="#getting_help_faq">Getting Help</a>
-      <a href="#open_source_faq">edX & Open source</a>
-      <a href="#other_help_faq">Other Help Questions - Account Questions</a>
+      <a href="#organization">Organization</a>
+      <a href="#students">Students</a>
+      <a href="#technology-platform">Technology Platform</a>
     </nav>
-
   </section>
 </section>
 
diff --git a/lms/templates/static_templates/help.html b/lms/templates/static_templates/help.html
index 7d1748776c..04c9164289 100644
--- a/lms/templates/static_templates/help.html
+++ b/lms/templates/static_templates/help.html
@@ -5,40 +5,304 @@
 
 <%block name="title"><title>edX Help</title></%block>
 
+<%block name="js_extra">
+<script src="${static.url('js/help.js')}"></script>
+</%block>
+
 <section class="static-container help">
   <h1>Help</h1>
   <hr class="horizontal-divider">
 
   <section class="questions">
-    <article class="response">
-      <h2>I tried to sign up, but it says the username is already taken.</h2>
-      <p>If you have previously signed up for an MITx account, you already have an edX account and can log in with your existing username and password. If you don’t have an MITx account and received this error, it's possible that someone else has already signed up with that username. Please try a different, more unique username &ndash; for example, try adding a random number to the end.</p>
-    </article>
-    <article class="response">
-      <h2>How will I know that the course I have signed up for has started?</h2>
-      <p>The start date for each course is listed on the right-hand side of the Course About page.</p>
-    </article>
-    <article class="response">
-      <h2>I just signed up into edX. I have not received any form of acknowledgement that I have enrolled.</h2>
-      <p>You should receive a single activation e-mail. If you did not, it may be because:</p>
-      <ul>
-        <li>There was a typo in your e-mail address.</li>
-        <li>The activation e-mail was caught by your spam filter. Please check your spam folder.</li>
-        <li>You may be using an older browser. We recommend downloading the current version of Firefox or Chrome.</li>
-        <li>JavaScript is disabled in your browser. Please confirm it is enabled.</li>
-        <li>If you run into issues, try recreating your account. There is no need to do anything about the old account, if any. If it is not activated through the link in the e-mail, it will disappear later.</li>
-      </ul>
-    </article>
-  </section>
+    <section class="responses">
+      <section id="edx_basics_faq" class="category">
+        <h2>edX Basics</h2>
+        <article class="response">
+          <h3 class="question">How do I sign up to take a class?</h3>
+          <div class ="answer" id="edx_basics_faq_answer_0">
+            <p>Simply create an edX account (it's free) and then register for the course of your choice (also free). Follow the prompts on the edX website.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">What does it cost to take a class? Is this really free?</h3>
+          <div class ="answer" id="edx_basics_faq_answer_1">
+            <p>EdX courses are free for everyone. All you need is an Internet connection.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">What happens after I sign up for a course?</h3>
+          <div class ="answer" id="edx_basics_faq_answer_2">
+            <p>You will receive an activation email. Follow the prompts in that email to activate your account. You will need to log in each time you access your course(s). Once the course begins, it’s time to hit the virtual books. You can access the lectures, homework, tutorials, etc., for each week, one week at a time.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">Who can take an edX course?</h3>
+          <div class ="answer" id="edx_basics_faq_answer_3">
+            <p>You, your mom, your little brother, your grandfather -- anyone with Internet access can take an edX course. Free.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">Are the courses only offered in English?</h3>
+          <div class ="answer" id="edx_basics_faq_answer_4">
+            <p>Some edX courses include a translation of the lecture in the text bar to the right of the video. Some have the specific option of requesting a course in other languages. Please check your course to determine foreign language options.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">When will there be more courses on other subjects?</h3>
+          <div class ="answer" id="edx_basics_faq_answer_5">
+            <p>We are continually reviewing and creating courses to add to the edX platform. Please check the website for future course announcements. You can also "friend" edX on Facebook – you’ll receive updates and announcements.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">How can I help edX?</h3>
+          <div class ="answer" id="edx_basics_faq_answer_6">
+            <p>You may not realize it, but just by taking a course you are helping edX. That’s because the edX platform has been specifically designed to not only teach, but also gather data about learning. EdX will utilize this data to find out how to improve education online and on-campus.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">When does my course start and/or finish?</h3>
+          <div class ="answer" id="edx_basics_faq_answer_7">
+            <p>You can find the start and stop dates for each course on each course description page.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">Is there a walk-through of a sample course session?</h3>
+          <div class ="answer" id="edx_basics_faq_answer_8">
+            <p> There are video introductions for every course that will give you a good sense of how the course works and what to expect.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">I don't have the prerequisites for a course that I am interested in. Can I still take the course?</h3>
+          <div class ="answer" id="edx_basics_faq_answer_9">
+            <p>We do not check students for prerequisites, so you are allowed to attempt the course. However, if you do not know prerequisite subjects before taking a class, you will have to learn the prerequisite material on your own over the semester, which can be an extremely difficult task.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">What happens if I have to quit a course, are there any penalties, will I be able to take another course in the future?</h3>
+          <div class ="answer" id="edx_basics_faq_answer_10">
+            <p>You may unregister from an edX course at anytime, there are absolutely no penalties associated with incomplete edX studies, and you may register for the same course (provided we are still offering it) at a later time.</p>
+          </div>
+        </article>
+      </section>
 
-  <section class="emails">
-    <h2>Help email</h2>
+      <section id="classes_faq" class="category">
+        <h2>The Classes</h2>
+        <article class="response">
+          <h3 class="question">How much work will I have to do to pass my course?</h3>
+          <div class ="answer" id="classes_faq_answer_0">
+            <p>The projected hours of study required for each course are described on the specific course description page.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">What should I do before I take a course (prerequisites)?</h3>
+          <div class ="answer" id="classes_faq_answer_1">
+            <p>Each course is different – some have prerequisites, and some don’t. Take a look at your specific course’s recommended prerequisites. If you do not have a particular prerequisite, you may still take the course.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">What books should I read? (I am interested in reading materials before the class starts).</h3>
+          <div class ="answer" id="classes_faq_answer_2">
+            <p>Take a look at the specific course prerequisites. All required academic materials will be provided during the course, within the browser. Some of the course descriptions may list additional resources. For supplemental reading material before or during the course, you can post a question on the course’s Discussion Forum to ask your online coursemates for suggestions.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question"> Can I download the book for my course?</h3>
+          <div class ="answer" id="classes_faq_answer_3">
+            <p>EdX book content may only be viewed within the browser, and downloading it violates copyright laws. If you need or want a hard copy of the book, we recommend that you purchase a copy.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">Can I take more than one course at a time?</h3>
+          <div class ="answer" id="classes_faq_answer_4">
+            <p>You may take multiple edX courses, however we recommend checking the requirements on each course description page to determine your available study hours and the demands of the intended courses.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">How do I log in to take an edX class?</h3>
+          <div class ="answer" id="classes_faq_answer_5">
+            <p>Once you sign up for a course and activate your account, click on the "Log In" button on the edx.org home page. You will need to type in your email address and edX password each time you log in.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">What time is the class?</h3>
+          <div class ="answer" id="classes_faq_answer_6">
+            <p>EdX classes take place at your convenience. Prefer to sleep in and study late? No worries. Videos and problem sets are available 24 hours a day, which means you can watch video and complete work whenever you have spare time. You simply log in to your course via the Internet and work through the course material, one week at a time.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">If I miss a week, how does this affect my grade?</h3>
+          <div class ="answer" id="classes_faq_answer_7">
+            <p>It is certainly possible to pass an edX course if you miss a week; however, coursework is progressive, so you should review and study what you may have missed. You can check your progress dashboard in the course to see your course average along the way if you have any concerns.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">How can I meet/find other students?</h3>
+          <div class ="answer" id="classes_faq_answer_8">
+            <p>All edX courses have Discussion Forums where you can chat with and help each other within the framework of the Honor Code.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">How can I talk to professors, fellows and teaching assistants?</h3>
+          <div class ="answer" id="classes_faq_answer_9">
+            <p>The Discussion Forums are the best place to reach out to the edX teaching team for your class, and you don’t have to wait in line or rearrange your schedule to fit your professor’s – just post your questions. The response isn’t always immediate, but it’s usually pretty darned quick.</p>
+          </div>
+        </article>
+      </section>
+
+      <section id="getting_help_faq" class="category">
+        <h2>Getting Help</h2>
+        <article class="response">
+          <h3 class="question">Can I re-take a course?</h3>
+          <div class ="answer" id="getting_help_faq_answer_0">
+            <p>Good news: there are unlimited "mulligans" in edX. You may re-take edX courses as often as you wish. Your performance in any particular offering of a course will not effect your standing in future offerings of any edX course, including future offerings of the same course.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">Enrollment for a course that I am interested in is open, but the course has already started. Can I still enroll?</h3>
+          <div class ="answer" id="getting_help_faq_answer_1">
+            <p>Yes, but you will not be able to turn in any assignments or exams that have already been due. If it is early in the course, you might still be able to earn enough points for a certificate, but you will have to check with the course in question in order to find out more.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">Is there an exam at the end?</h3>
+          <div class ="answer" id="getting_help_faq_answer_2">
+            <p>Different courses have slightly different structures. Please check the course material description to see if there is a final exam or final project.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">Will the same courses be offered again in the future?</h3>
+          <div class ="answer" id="getting_help_faq_answer_3">
+            <p>Existing edX courses will be re-offered, and more courses added.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">Will I get a certificate for taking an edX course?</h3>
+          <div class ="answer" id="getting_help_faq_answer_4">
+            <p>Online learners who receive a passing grade for a course will receive a certificate of mastery from edX and the underlying X University that offered the course. For example, a certificate of mastery for MITx’s 6.002x Circuits & Electronics will come from edX and MITx.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">How are edX certificates delivered?</h3>
+          <div class ="answer" id="getting_help_faq_answer_5">
+            <p>EdX certificates are delivered online through edx.org. So be sure to check your email in the weeks following the final grading – you will be able to download and print your certificate.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">What is the difference between a proctored certificate and an honor code certificate?</h3>
+          <div class ="answer" id="getting_help_faq_answer_6">
+            <p>A proctored certificate is given to students who take and pass an exam under proctored conditions. An honor-code certificate is given to students who have completed all of the necessary online coursework associated with a course and have signed <link> the edX honor code </link>.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">Yes. The requirements for both certificates can be independently satisfied.</h3>
+          <div class ="answer" id="getting_help_faq_answer_7">
+            <p>It is certainly possible to pass an edX course if you miss a week; however, coursework is progressive, so you should review and study what you may have missed. You can check your progress dashboard in the course to see your course average along the way if you have any concerns.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">Will my grade be shown on my certificate?</h3>
+          <div class ="answer" id="getting_help_faq_answer_8">
+            <p>No. Grades are not displayed on either honor code or proctored certificates.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">How can I talk to professors, fellows and teaching assistants?</h3>
+          <div class ="answer" id="getting_help_faq_answer_9">
+            <p>The Discussion Forums are the best place to reach out to the edX teaching team for your class, and you don’t have to wait in line or rearrange your schedule to fit your professor’s – just post your questions. The response isn’t always immediate, but it’s usually pretty darned quick.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">The only certificates distributed with grades by edX were for the initial prototype course.</h3>
+          <div class ="answer" id="getting_help_faq_answer_10">
+            <p>You may unregister from an edX course at anytime, there are absolutely no penalties associated with incomplete edX studies, and you may register for the same course (provided we are still offering it) at a later time.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">Will my university accept my edX coursework for credit?</h3>
+          <div class ="answer" id="getting_help_faq_answer_11">
+            <p>Each educational institution makes its own decision regarding whether to accept edX coursework for credit. Check with your university for its policy.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">I lost my edX certificate – can you resend it to me?</h3>
+          <div class ="answer" id="getting_help_faq_answer_12">
+            <p>Please log back in to your account to find certificates from the same profile page where they were originally posted. You will be able to re-print your certificate from there.</p>
+          </div>
+        </article>
+      </section>
+
+      <section id="open_source_faq" class="category">
+        <h2>edX & Open Source</h2>
+        <article class="response">
+          <h3 class="question">What’s open source?</h3>
+          <div class ="answer" id="open_source_faq_answer_0">
+            <p>Open source is a philosophy that generally refers to making software freely available for use or modification as users see fit. In exchange for use of the software, users generally add their contributions to the software, making it a public collaboration. The edX platform will be made available as open source code in order to allow world talent to improve and share it on an ongoing basis.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">When/how can I get the open-source platform technology?</h3>
+          <div class ="answer" id="open_source_faq_answer_1">
+            <p>We are still building the edX technology platform and will be making announcements in the future about its availability.</p>
+          </div>
+        </article>
+      </section>
+
+      <section id="other_help_faq" class="category">
+        <h2>Other Help Questions - Account Questions</h2>
+        <article class="response">
+          <h3 class="question">My username is taken.</h3>
+          <div class ="answer" id="other_help_faq_answer_0">
+            <p>Now’s your chance to be creative: please try a different, more unique username – for example, try adding a random number to the end.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">Why does my password show on my course login page?</h3>
+          <div class ="answer" id="other_help_faq_answer_1">
+            <p>Oops! This may be because of the way you created your account. For example, you may have mistakenly typed your password into the login box.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">I am having login problems (password/email unrecognized).</h3>
+          <div class ="answer" id="other_help_faq_answer_2">
+            <p>Please check your browser’s settings to make sure that you have the current version of Firefox or Chrome, and then try logging in again. If you find access impossible, you may simply create a new account using an alternate email address – the old, unused account will disappear later.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">I did not receive an activation email.</h3>
+          <div class ="answer" id="other_help_faq_answer_3">
+            <p>If you did not receive an activation email it may be because:</p>
+            <ul>
+              <li>There was a typo in your email address.</li>
+              <li>Your spam filter may have caught the activation email. Please check your spam folder. </li>
+              <li>You may be using an older browser. We recommend downloading the current version of Firefox or Chrome. </li>
+              <li>JavaScript is disabled in your browser. Please check your browser settings and confirm that JavaScript is enabled. </li>
+            </ul>
+            <p>If you continue to have problems activating your account, we recommend that you try creating a new account. There is no need to do anything about the old account. If it is not activated through the link in the email, it will disappear later.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">Can I delete my account?</h3>
+          <div class ="answer" id="other_help_faq_answer_4">
+            <p>There’s no need to delete you account. An old, unused edX account with no course completions associated with it will disappear.</p>
+          </div>
+        </article>
+        <article class="response">
+          <h3 class="question">I am experiencing problems with the display. E.g., There are tools missing from the course display, or I am unable to view video.</h3>
+          <div class ="answer" id="other_help_faq_answer_5">
+            <p>Please check your browser and settings. We recommend downloading the current version of Firefox or Chrome. Alternatively, you may re-register with a different email account. There is no need to delete the old account, as it will disappear if unused.</p>
+          </div>
+        </article>
+      </section>
+
+    </section>
+
+    <nav class="categories">
+      <a href="#edx_basics_faq">edX Basics</a>
+      <a href="#classes_faq">The Classes</a>
+      <a href="#getting_help_faq">Getting Help</a>
+      <a href="#open_source_faq">edX & Open source</a>
+      <a href="#other_help_faq">Other Help Questions - Account Questions</a>
+    </nav>
 
-    <ul>
-      <li><p>System-related questions: <a href="mailto:technical@edx.org">technical@edx.org</a></p></li>
-      <li><p>Content-related questions: <a href="mailto:content@edx.org">content@edx.org</a></p></li>
-      <li><p>Bug reports: <a href="mailto:bugs@edx.org">bugs@edx.org</a></p></li>
-      <li><p>Suggestions: <a href="mailto:suggestions@edx.org">suggestions@edx.org</a></p></li>
-    </ul>
   </section>
 </section>

From 1be58c62e3a92256800b276cd3096f677d7ae969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s=20Rocha?= <rocha@edx.org>
Date: Wed, 16 Jan 2013 17:06:01 -0500
Subject: [PATCH 381/541] Update /faq page: change certificate of completion to
 mastery

---
 lms/templates/static_templates/faq.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/templates/static_templates/faq.html b/lms/templates/static_templates/faq.html
index b0543df264..91ac16e90c 100644
--- a/lms/templates/static_templates/faq.html
+++ b/lms/templates/static_templates/faq.html
@@ -39,7 +39,7 @@
         </article>
         <article class="response">
           <h3>Will certificates be awarded?</h3>
-          <p>Yes. Online learners who demonstrate mastery of subjects can earn a certificate of completion. Certificates will be issued by edX under the name of the underlying "X University" from where the course originated, i.e. HarvardX, <em>MITx</em> or BerkeleyX.  For the courses in Fall 2012, those certificates will be free.  There is a plan to charge a modest fee for certificates in the future.</p>
+          <p>Yes. Online learners who demonstrate mastery of subjects can earn a certificate of mastery. Certificates will be issued by edX under the name of the underlying "X University" from where the course originated, i.e. HarvardX, <em>MITx</em> or BerkeleyX.  For the courses in Fall 2012, those certificates will be free.  There is a plan to charge a modest fee for certificates in the future.</p>
         </article>
         <article class="response">
           <h3>What will the scope of the online courses be? How many? Which faculty?</h3>

From 9fdb4d092374c72cd9f953cc6daeb45894e420e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s=20Rocha?= <rocha@edx.org>
Date: Wed, 16 Jan 2013 17:08:54 -0500
Subject: [PATCH 382/541] Replace front page video

[#154]
---
 lms/templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/templates/index.html b/lms/templates/index.html
index e986566dec..d08ba09e61 100644
--- a/lms/templates/index.html
+++ b/lms/templates/index.html
@@ -164,7 +164,7 @@
 
 <section id="video-modal" class="modal home-page-video-modal video-modal">
   <div class="inner-wrapper">
-    <iframe width="640" height="360" src="http://www.youtube.com/embed/IlNU60ZKj3I?showinfo=0" frameborder="0" allowfullscreen></iframe>
+    <iframe width="640" height="360" src="http://www.youtube.com/embed/XNaiOGxWeto?showinfo=0" frameborder="0" allowfullscreen></iframe>
   </div>
 </section>
 

From 59b328f4b2a9769e08be8a2eae935f049782d6dc Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Thu, 17 Jan 2013 10:49:57 -0500
Subject: [PATCH 383/541] pearson registration - removed telephone/fax
 placeholder attributes since they can't represent both domestic and
 international formatting easily

---
 lms/templates/test_center_register.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index 4e1cece8c9..1b45497ad7 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -246,25 +246,25 @@
             <li class="field-group phoneinfo">
               <div class="field required" id="field-phone">
                 <label for="phone">Phone Number</label>
-                <input id="phone" type="tel" name="phone" value="${testcenteruser.phone}" placeholder="e.g. 1-55-555-5555" />              
+                <input id="phone" type="tel" name="phone" value="${testcenteruser.phone}" />              
               </div>
               <div class="field" id="field-extension">
                 <label for="extension">Extension</label>
-                <input id="extension" class="short" type="tel" name="extension" value="${testcenteruser.extension}" placeholder="e.g. 555" />
+                <input id="extension" class="short" type="tel" name="extension" value="${testcenteruser.extension}"  />
               </div>
               <div class="field required" id="field-phone_country_code">
                 <label for="phone_country_code">Phone Country Code</label>
-                <input id="phone_country_code" class="short" type="text" name="phone_country_code" value="${testcenteruser.phone_country_code}" placeholder="e.g. 1, 44, 976" />
+                <input id="phone_country_code" class="short" type="text" name="phone_country_code" value="${testcenteruser.phone_country_code}" />
               </div>
             </li>
             <li class="field-group faxinfo">
               <div class="field" id="field-fax">
                 <label for="fax">Fax Number</label>
-                <input id="fax" type="tel" class="short" name="fax" value="${testcenteruser.fax}" placeholder="e.g. 1-55-555-5555" />
+                <input id="fax" type="tel" class="short" name="fax" value="${testcenteruser.fax}" />
               </div>
               <div class="field" id="field-fax_country_code">
                 <label for="fax_country_code">Fax Country Code</label>
-                <input id="fax_country_code" class="short" type="text" name="fax_country_code" value="${testcenteruser.fax_country_code}" placeholder="e.g. 1, 44, 976" />
+                <input id="fax_country_code" class="short" type="text" name="fax_country_code" value="${testcenteruser.fax_country_code}" />
               </div>
             </li>
             <li class="field" id="field-company_name">

From fdd395e0b31f79206d7fbda25196d505c83b8347 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Thu, 17 Jan 2013 10:50:58 -0500
Subject: [PATCH 384/541] pearson registration - synced up link text for
 emailing edx

---
 lms/templates/test_center_register.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index 1b45497ad7..f6c53c0e89 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -474,7 +474,7 @@
     
     <div class="details details-contact">
       <h4>Questions</h4>
-      <p>If you have a specific question pertaining to your registration, you may contact <a class="contact-link" href="${exam_help_href}">exam-help@edx.org</a>.</p>
+      <p>If you have a specific question pertaining to your registration, you may <a class="contact-link" href="${exam_help_href}">contact edX at exam-help@edx.org</a>.</p>
     </div>
   </aside>
 </section>

From 45bb511e1557360f3490ef07aefad47ddbeeda79 Mon Sep 17 00:00:00 2001
From: Chris Dodge <cdodge@edx.org>
Date: Thu, 17 Jan 2013 12:06:21 -0500
Subject: [PATCH 385/541] remove obsolete test (per Vik)

---
 common/lib/xmodule/xmodule/tests/test_import.py | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/common/lib/xmodule/xmodule/tests/test_import.py b/common/lib/xmodule/xmodule/tests/test_import.py
index 90ec112f19..554e89ac74 100644
--- a/common/lib/xmodule/xmodule/tests/test_import.py
+++ b/common/lib/xmodule/xmodule/tests/test_import.py
@@ -339,19 +339,6 @@ class ImportTestCase(unittest.TestCase):
 
         self.assertRaises(etree.XMLSyntaxError, system.process_xml, bad_xml)
 
-    def test_selfassessment_import(self):
-        '''
-        Check to see if definition_from_xml in self_assessment_module.py
-        works properly.  Pulls data from the self_assessment directory in the test data directory.
-        '''
-
-        modulestore = XMLModuleStore(DATA_DIR, course_dirs=['self_assessment'])
-
-        sa_id = "edX/sa_test/2012_Fall"
-        location = Location(["i4x", "edX", "sa_test", "selfassessment", "SampleQuestion"])
-        sa_sample = modulestore.get_instance(sa_id, location)
-        #10 attempts is hard coded into SampleQuestion, which is the url_name of a selfassessment xml tag
-        self.assertEqual(sa_sample.metadata['attempts'], '10')
 
     def test_graphicslidertool_import(self):
         '''

From 2d55f871eebb83833f194139c9199484dac5153f Mon Sep 17 00:00:00 2001
From: Ashley Penney <apenney@edx.org>
Date: Thu, 17 Jan 2013 15:51:26 -0500
Subject: [PATCH 386/541] While this is a pain for content developer local
 environment updates it breaks the LMS in EC2 which is vastly more important. 
 We'll jsut have to address helping individual content people with installing
 MySQL if needed. This is a real dependency in production and I think those
 belong in here.

---
 requirements.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 08cfe57e2e..bc019ab54c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -51,8 +51,7 @@ pygraphviz==1.1
 pil==1.1.7
 nltk==2.0.4
 dogstatsd-python==0.2.1
-# Taking out MySQL-python for now because it requires mysql to be installed, so breaks updates on content folks' envs.
-# MySQL-python
+MySQL-python==1.2.4c1
 sphinx==1.1.3
 Shapely==1.2.16
 ipython==0.13.1

From 66a3e9621bc30b3c9a3dc4ea49110eab5071bafd Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Thu, 17 Jan 2013 17:04:28 -0500
Subject: [PATCH 387/541] studio - removed editor type icon and text for all
 components except for problems

---
 cms/static/sass/_unit.scss | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss
index 5edce2419c..43acdc1eea 100644
--- a/cms/static/sass/_unit.scss
+++ b/cms/static/sass/_unit.scss
@@ -51,6 +51,8 @@
   }
 
   .components {
+
+
     > li {
       position: relative;
       z-index: 10;
@@ -118,6 +120,24 @@
           }
         }
 
+        .new-component-templates {
+          display: none;
+          padding: 20px;
+          @include clearfix;
+
+          .cancel-button {
+            @include white-button;
+          }
+
+          // specific menu types
+          &.new-component-problem {
+
+            .ss-icon, .editor-indicator {
+              display: inline-block;
+            }
+          }
+        }
+        
         .new-component-type,
         .new-component-template {
           @include clearfix;
@@ -177,7 +197,11 @@
               position: relative;
               top: 3px;
               font-size: 12px;
-              opacity: 0.1;
+              opacity: 0.3;
+            }
+
+            .ss-icon, .editor-indicator {
+              display: none;
             }
 
             &:hover {
@@ -214,16 +238,6 @@
           }
           
         }
-        
-        .new-component-templates {
-          display: none;
-          padding: 20px;
-          @include clearfix;
-
-          .cancel-button {
-            @include white-button;
-          }
-        }
       }
     }
   }

From 5b82a68c184db662dcf72d627132422401b79a1b Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Thu, 17 Jan 2013 17:06:07 -0500
Subject: [PATCH 388/541] studio - removing extra line/whitespace in sass

---
 cms/static/sass/_unit.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss
index 43acdc1eea..d8ca1117e9 100644
--- a/cms/static/sass/_unit.scss
+++ b/cms/static/sass/_unit.scss
@@ -52,7 +52,6 @@
 
   .components {
 
-
     > li {
       position: relative;
       z-index: 10;
@@ -137,7 +136,7 @@
             }
           }
         }
-        
+
         .new-component-type,
         .new-component-template {
           @include clearfix;

From eaa6701c6fd3914653b6989455ac8b162bd9e2fa Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Thu, 17 Jan 2013 17:13:31 -0500
Subject: [PATCH 389/541] Remove mitxmako dependencies, make rubric and oechild
 inherit fro object

---
 .../xmodule/combined_open_ended_module.py     | 14 +++++------
 .../xmodule/combined_open_ended_rubric.py     |  9 +++----
 .../lib/xmodule/xmodule/open_ended_module.py  | 25 +++++++++----------
 common/lib/xmodule/xmodule/openendedchild.py  |  4 +--
 .../xmodule/xmodule/self_assessment_module.py |  4 +--
 5 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index a88acc6ffd..5c8a88d9f7 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -22,8 +22,6 @@ from xmodule.modulestore import Location
 import self_assessment_module
 import open_ended_module
 
-from mitxmako.shortcuts import render_to_string
-
 log = logging.getLogger("mitx.courseware")
 
 # Set the default number of max attempts.  Should be 1 for production
@@ -319,7 +317,7 @@ class CombinedOpenEndedModule(XModule):
         Output: HTML rendered directly via Mako
         """
         context = self.get_context()
-        html = render_to_string('combined_open_ended.html', context)
+        html = self.system.render_template('combined_open_ended.html', context)
         return html
 
     def get_html_base(self):
@@ -369,17 +367,17 @@ class CombinedOpenEndedModule(XModule):
             self.static_data, instance_state=task_state)
         last_response = task.latest_answer()
         last_score = task.latest_score()
-        last_post_assessment = task.latest_post_assessment()
+        last_post_assessment = task.latest_post_assessment(self.system)
         last_post_feedback = ""
         if task_type == "openended":
-            last_post_assessment = task.latest_post_assessment(short_feedback=False, join_feedback=False)
+            last_post_assessment = task.latest_post_assessment(self.system, short_feedback=False, join_feedback=False)
             if isinstance(last_post_assessment, list):
                 eval_list = []
                 for i in xrange(0, len(last_post_assessment)):
-                    eval_list.append(task.format_feedback_with_evaluation(last_post_assessment[i]))
+                    eval_list.append(task.format_feedback_with_evaluation(self.system, last_post_assessment[i]))
                 last_post_evaluation = "".join(eval_list)
             else:
-                last_post_evaluation = task.format_feedback_with_evaluation(last_post_assessment)
+                last_post_evaluation = task.format_feedback_with_evaluation(self.system, last_post_assessment)
             last_post_assessment = last_post_evaluation
         last_correctness = task.is_last_response_correct()
         max_score = task.max_score()
@@ -442,7 +440,7 @@ class CombinedOpenEndedModule(XModule):
         self.update_task_states()
         response_dict = self.get_last_response(task_number)
         context = {'results': response_dict['post_assessment'], 'task_number': task_number + 1}
-        html = render_to_string('combined_open_ended_results.html', context)
+        html = self.system.render_template('combined_open_ended_results.html', context)
         return {'html': html, 'success': True}
 
     def handle_ajax(self, dispatch, get):
diff --git a/common/lib/xmodule/xmodule/combined_open_ended_rubric.py b/common/lib/xmodule/xmodule/combined_open_ended_rubric.py
index 0b2ca1ca2c..e4daf11f1d 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_rubric.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_rubric.py
@@ -1,16 +1,15 @@
-from mitxmako.shortcuts import render_to_string
 import logging
 from lxml import etree
 
 log=logging.getLogger(__name__)
 
-class CombinedOpenEndedRubric:
+class CombinedOpenEndedRubric(object):
 
     @staticmethod
-    def render_rubric(rubric_xml):
+    def render_rubric(rubric_xml, system):
         try:
             rubric_categories = CombinedOpenEndedRubric.extract_rubric_categories(rubric_xml)
-            html = render_to_string('open_ended_rubric.html', {'rubric_categories'  : rubric_categories})
+            html = system.render_template('open_ended_rubric.html', {'rubric_categories'  : rubric_categories})
         except:
             log.exception("Could not parse the rubric.")
             html = rubric_xml
@@ -64,7 +63,7 @@ class CombinedOpenEndedRubric:
 
         if has_score:
             if scorexml.tag != 'score':
-                raise Exception("[extract_category]: expected score tag, got {0} instead".format(scorexml.tag))
+                raise Exception("[extract_category]mitxmako: expected score tag, got {0} instead".format(scorexml.tag))
 
         for option in optionsxml:
             if option.tag != "option":
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index 11f96c9848..0eaad34bad 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -30,7 +30,6 @@ from xmodule.modulestore import Location
 from capa.util import *
 import openendedchild
 
-from mitxmako.shortcuts import render_to_string
 from numpy import median
 
 from datetime import datetime
@@ -256,7 +255,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         @param system: Modulesystem
         @return: Boolean True (not useful currently)
         """
-        new_score_msg = self._parse_score_msg(score_msg)
+        new_score_msg = self._parse_score_msg(score_msg, system)
         if not new_score_msg['valid']:
             score_msg['feedback'] = 'Invalid grader reply. Please contact the course staff.'
 
@@ -370,7 +369,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         return u"\n".join([feedback_list_part1, feedback_list_part2])
 
-    def _format_feedback(self, response_items):
+    def _format_feedback(self, response_items, system):
         """
         Input:
             Dictionary called feedback.  Must contain keys seen below.
@@ -382,13 +381,13 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         rubric_feedback=""
         feedback = self._convert_longform_feedback_to_html(response_items)
         if response_items['rubric_scores_complete']==True:
-            rubric_feedback = CombinedOpenEndedRubric.render_rubric(response_items['rubric_xml'])
+            rubric_feedback = CombinedOpenEndedRubric.render_rubric(response_items['rubric_xml'], system)
 
         if not response_items['success']:
             return system.render_template("open_ended_error.html",
                 {'errors': feedback})
 
-        feedback_template = render_to_string("open_ended_feedback.html", {
+        feedback_template = system.render_template("open_ended_feedback.html", {
             'grader_type': response_items['grader_type'],
             'score': "{0} / {1}".format(response_items['score'], self.max_score()),
             'feedback': feedback,
@@ -398,7 +397,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         return feedback_template
 
 
-    def _parse_score_msg(self, score_msg, join_feedback=True):
+    def _parse_score_msg(self, score_msg, system, join_feedback=True):
         """
          Grader reply is a JSON-dump of the following dict
            { 'correct': True/False,
@@ -450,7 +449,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
                     'rubric_scores_complete' : score_result['rubric_scores_complete'],
                     'rubric_xml' : score_result['rubric_xml'],
                 }
-                feedback_items.append(self._format_feedback(new_score_result))
+                feedback_items.append(self._format_feedback(new_score_result, system))
             if join_feedback:
                 feedback = "".join(feedback_items)
             else:
@@ -458,7 +457,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             score = int(median(score_result['score']))
         else:
             #This is for instructor and ML grading
-            feedback = self._format_feedback(score_result)
+            feedback = self._format_feedback(score_result, system)
             score = score_result['score']
 
         self.submission_id = score_result['submission_id']
@@ -466,7 +465,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         return {'valid': True, 'score': score, 'feedback': feedback}
 
-    def latest_post_assessment(self, short_feedback=False, join_feedback=True):
+    def latest_post_assessment(self, system, short_feedback=False, join_feedback=True):
         """
         Gets the latest feedback, parses, and returns
         @param short_feedback: If the long feedback is wanted or not
@@ -475,7 +474,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         if not self.history:
             return ""
 
-        feedback_dict = self._parse_score_msg(self.history[-1].get('post_assessment', ""), join_feedback=join_feedback)
+        feedback_dict = self._parse_score_msg(self.history[-1].get('post_assessment', ""), system, join_feedback=join_feedback)
         if not short_feedback:
             return feedback_dict['feedback'] if feedback_dict['valid'] else ''
         if feedback_dict['valid']:
@@ -483,14 +482,14 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
                 json.loads(self.history[-1].get('post_assessment', "")))
         return short_feedback if feedback_dict['valid'] else ''
 
-    def format_feedback_with_evaluation(self, feedback):
+    def format_feedback_with_evaluation(self, system, feedback):
         """
         Renders a given html feedback into an evaluation template
         @param feedback: HTML feedback
         @return: Rendered html
         """
         context = {'msg': feedback, 'id': "1", 'rows': 50, 'cols': 50}
-        html = render_to_string('open_ended_evaluation.html', context)
+        html = system.render_template('open_ended_evaluation.html', context)
         return html
 
     def handle_ajax(self, dispatch, get, system):
@@ -582,7 +581,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         if self.state != self.INITIAL:
             latest = self.latest_answer()
             previous_answer = latest if latest is not None else self.initial_display
-            post_assessment = self.latest_post_assessment()
+            post_assessment = self.latest_post_assessment(system)
             score = self.latest_score()
             correct = 'correct' if self.is_submission_correct(score) else 'incorrect'
         else:
diff --git a/common/lib/xmodule/xmodule/openendedchild.py b/common/lib/xmodule/xmodule/openendedchild.py
index 2ba9528237..88fed61c6d 100644
--- a/common/lib/xmodule/xmodule/openendedchild.py
+++ b/common/lib/xmodule/xmodule/openendedchild.py
@@ -35,7 +35,7 @@ MAX_ATTEMPTS = 1
 # Overriden by max_score specified in xml.
 MAX_SCORE = 1
 
-class OpenEndedChild():
+class OpenEndedChild(object):
     """
     States:
 
@@ -123,7 +123,7 @@ class OpenEndedChild():
             return None
         return self.history[-1].get('score')
 
-    def latest_post_assessment(self):
+    def latest_post_assessment(self, system):
         """None if not available"""
         if not self.history:
             return ""
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index 940b61c557..3d88cb95f6 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -122,7 +122,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         if self.state == self.INITIAL:
             return ''
 
-        rubric_html  = CombinedOpenEndedRubric.render_rubric(self.rubric)
+        rubric_html  = CombinedOpenEndedRubric.render_rubric(self.rubric, system)
 
         # we'll render it
         context = {'rubric': rubric_html,
@@ -147,7 +147,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
 
         if self.state == self.DONE:
             # display the previous hint
-            latest = self.latest_post_assessment()
+            latest = self.latest_post_assessment(system)
             hint = latest if latest is not None else ''
         else:
             hint = ''

From 18dc59c93ac9f6e2f5d427f07239ac3ef46c82f5 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Thu, 17 Jan 2013 17:18:10 -0500
Subject: [PATCH 390/541] Error message fix

---
 common/lib/xmodule/xmodule/combined_open_ended_rubric.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_rubric.py b/common/lib/xmodule/xmodule/combined_open_ended_rubric.py
index e4daf11f1d..c2e0297038 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_rubric.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_rubric.py
@@ -63,7 +63,7 @@ class CombinedOpenEndedRubric(object):
 
         if has_score:
             if scorexml.tag != 'score':
-                raise Exception("[extract_category]mitxmako: expected score tag, got {0} instead".format(scorexml.tag))
+                raise Exception("[extract_category]: expected score tag, got {0} instead".format(scorexml.tag))
 
         for option in optionsxml:
             if option.tag != "option":

From ef69b738c99705faac63d0ed780bd32684eaca9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s=20Rocha?= <rocha@edx.org>
Date: Thu, 17 Jan 2013 21:31:05 -0500
Subject: [PATCH 391/541] Sort courses announcement date

If there is no announcement date (in the policy metadata) then use a
heuristic to sort them.

If there is an announcement date, the use it in the heuristic to
determine if the course is new or not.
---
 common/djangoapps/student/views.py            | 45 +++++------
 common/lib/xmodule/xmodule/course_module.py   | 76 ++++++++++++------
 .../xmodule/tests/test_course_module.py       | 77 +++++++++++++------
 lms/djangoapps/courseware/courses.py          | 16 ++++
 lms/djangoapps/courseware/views.py            | 15 ++--
 5 files changed, 149 insertions(+), 80 deletions(-)

diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 1a9648835e..61b49e6022 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -27,7 +27,7 @@ from bs4 import BeautifulSoup
 from django.core.cache import cache
 
 from django_future.csrf import ensure_csrf_cookie, csrf_exempt
-from student.models import (Registration, UserProfile, TestCenterUser, TestCenterUserForm, 
+from student.models import (Registration, UserProfile, TestCenterUser, TestCenterUserForm,
                             TestCenterRegistration, TestCenterRegistrationForm,
                             PendingNameChange, PendingEmailChange,
                             CourseEnrollment, unique_id_for_user,
@@ -42,7 +42,7 @@ from xmodule.modulestore.django import modulestore
 #from datetime import date
 from collections import namedtuple
 
-from courseware.courses import get_courses
+from courseware.courses import get_courses, sort_by_announcement
 from courseware.access import has_access
 
 from statsd import statsd
@@ -78,10 +78,7 @@ def index(request, extra_context={}, user=None):
         domain = request.META.get('HTTP_HOST')
 
     courses = get_courses(None, domain=domain)
-
-    # Sort courses by how far are they from they start day
-    key = lambda course: course.days_until_start
-    courses = sorted(courses, key=key, reverse=True)
+    courses = sort_by_announcement(courses)
 
     # Get the 3 most recent news
     top_news = _get_news(top=3)
@@ -211,7 +208,7 @@ def _cert_info(user, course, cert_status):
 def dashboard(request):
     user = request.user
     enrollments = CourseEnrollment.objects.filter(user=user)
-    
+
     # Build our courses list for the user, but ignore any courses that no longer
     # exist (because the course IDs have changed). Still, we don't delete those
     # enrollments, because it could have been a data push snafu.
@@ -473,7 +470,7 @@ def _do_create_account(post_vars):
     except (ValueError, KeyError):
         # If they give us garbage, just ignore it instead
         # of asking them to put an integer.
-        profile.year_of_birth = None  
+        profile.year_of_birth = None
     try:
         profile.save()
     except Exception:
@@ -613,7 +610,7 @@ def exam_registration_info(user, course):
     exam_info = course.current_test_center_exam
     if exam_info is None:
         return None
-    
+
     exam_code = exam_info.exam_series_code
     registrations = get_testcenter_registration(user, course.id, exam_code)
     if registrations:
@@ -621,7 +618,7 @@ def exam_registration_info(user, course):
     else:
         registration = None
     return registration
-    
+
 @login_required
 @ensure_csrf_cookie
 def begin_exam_registration(request, course_id):
@@ -647,7 +644,7 @@ def begin_exam_registration(request, course_id):
 
     # determine if the user is registered for this course:
     registration = exam_registration_info(user, course)
-        
+
     # we want to populate the registration page with the relevant information,
     # if it already exists.  Create an empty object otherwise.
     try:
@@ -655,7 +652,7 @@ def begin_exam_registration(request, course_id):
     except TestCenterUser.DoesNotExist:
         testcenteruser = TestCenterUser()
         testcenteruser.user = user
-        
+
     context = {'course': course,
                'user': user,
                'testcenteruser': testcenteruser,
@@ -672,8 +669,8 @@ def create_exam_registration(request, post_override=None):
     Called by form in test_center_register.html
     '''
     post_vars = post_override if post_override else request.POST
-    
-    # first determine if we need to create a new TestCenterUser, or if we are making any update 
+
+    # first determine if we need to create a new TestCenterUser, or if we are making any update
     # to an existing TestCenterUser.
     username = post_vars['username']
     user = User.objects.get(username=username)
@@ -686,10 +683,10 @@ def create_exam_registration(request, post_override=None):
     for fieldname in TestCenterUser.user_provided_fields():
         if fieldname in post_vars:
             demographic_data[fieldname] = (post_vars[fieldname]).strip()
-        
+
     try:
         testcenter_user = TestCenterUser.objects.get(user=user)
-        needs_updating = testcenter_user.needs_update(demographic_data) 
+        needs_updating = testcenter_user.needs_update(demographic_data)
         log.info("User {0} enrolled in course {1} {2}updating demographic info for exam registration".format(user.username, course_id, "" if needs_updating else "not "))
     except TestCenterUser.DoesNotExist:
         # do additional initialization here:
@@ -699,7 +696,7 @@ def create_exam_registration(request, post_override=None):
 
     # perform validation:
     if needs_updating:
-        # first perform validation on the user information 
+        # first perform validation on the user information
         # using a Django Form.
         form = TestCenterUserForm(instance=testcenter_user, data=demographic_data)
         if form.is_valid():
@@ -710,7 +707,7 @@ def create_exam_registration(request, post_override=None):
             response_data['field_errors'] = form.errors
             response_data['non_field_errors'] = form.non_field_errors()
             return HttpResponse(json.dumps(response_data), mimetype="application/json")
-        
+
     # create and save the registration:
     needs_saving = False
     exam = course.current_test_center_exam
@@ -720,12 +717,12 @@ def create_exam_registration(request, post_override=None):
         registration = registrations[0]
         # NOTE: we do not bother to check here to see if the registration has changed,
         # because at the moment there is no way for a user to change anything about their
-        # registration.  They only provide an optional accommodation request once, and 
+        # registration.  They only provide an optional accommodation request once, and
         # cannot make changes to it thereafter.
         # It is possible that the exam_info content has been changed, such as the
         # scheduled exam dates, but those kinds of changes should not be handled through
-        # this registration screen.   
-        
+        # this registration screen.
+
     else:
         accommodation_request = post_vars.get('accommodation_request','')
         registration = TestCenterRegistration.create(testcenter_user, exam, accommodation_request)
@@ -733,7 +730,7 @@ def create_exam_registration(request, post_override=None):
         log.info("User {0} enrolled in course {1} creating new exam registration".format(user.username, course_id))
 
     if needs_saving:
-        # do validation of registration.  (Mainly whether an accommodation request is too long.)        
+        # do validation of registration.  (Mainly whether an accommodation request is too long.)
         form = TestCenterRegistrationForm(instance=registration, data=post_vars)
         if form.is_valid():
             form.update_and_save()
@@ -743,14 +740,14 @@ def create_exam_registration(request, post_override=None):
             response_data['field_errors'] = form.errors
             response_data['non_field_errors'] = form.non_field_errors()
             return HttpResponse(json.dumps(response_data), mimetype="application/json")
-         
+
 
     # only do the following if there is accommodation text to send,
     # and a destination to which to send it.
     # TODO: still need to create the accommodation email templates
 #    if 'accommodation_request' in post_vars and 'TESTCENTER_ACCOMMODATION_REQUEST_EMAIL' in settings:
 #        d = {'accommodation_request': post_vars['accommodation_request'] }
-#        
+#
 #        # composes accommodation email
 #        subject = render_to_string('emails/accommodation_email_subject.txt', d)
 #        # Email subject *must not* contain newlines
diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py
index 499247cc2d..bc171ca5b9 100644
--- a/common/lib/xmodule/xmodule/course_module.py
+++ b/common/lib/xmodule/xmodule/course_module.py
@@ -1,4 +1,5 @@
 import logging
+from math import exp, erf
 from lxml import etree
 from path import path  # NOTE (THK): Only used for detecting presence of syllabus
 import requests
@@ -183,35 +184,66 @@ class CourseDescriptor(SequenceDescriptor):
 
     @property
     def is_new(self):
-        # The course is "new" if either if the metadata flag is_new is
-        # true or if the course has not started yet
+        """
+        Returns if the course has been flagged as new in the metadata. If
+        there is no flag, return a heuristic value considering the
+        announcement and the start dates.
+        """
         flag = self.metadata.get('is_new', None)
         if flag is None:
-            return self.days_until_start > 1
+            # Use a heuristic if the course has not been flagged
+            announcement, start, now = self._sorting_dates()
+            if announcement and (now - announcement).days < 30:
+                # The course has been announced for less that month
+                return True
+            elif (now - start).days < 1:
+                # The course has not started yet
+                return True
+            else:
+                return False
         elif isinstance(flag, basestring):
             return flag.lower() in ['true', 'yes', 'y']
         else:
             return bool(flag)
 
     @property
-    def days_until_start(self):
-        def convert_to_datetime(timestamp):
+    def sorting_score(self):
+        """
+        Returns a number that can be used to sort the courses according
+        the how "new"" they are. The "newness"" score is computed using a
+        heuristic that takes into account the announcement and
+        (advertized) start dates of the course if available.
+
+        The lower the number the "newer" the course.
+        """
+        # Make courses that have an announcement date shave a lower
+        # score than courses than don't, older courses should have a
+        # higher score.
+        announcement, start, now = self._sorting_dates()
+        scale = 300.0  # about a year
+        if announcement:
+            days = (now - announcement).days
+            score = -exp(-days/scale)
+        else:
+            days = (now - start).days
+            score = exp(days/scale)
+        return score
+
+    def _sorting_dates(self):
+        # utility function to get datetime objects for dates used to
+        # compute the is_new flag and the sorting_score
+        def to_datetime(timestamp):
             return datetime.fromtimestamp(time.mktime(timestamp))
 
-        start_date = convert_to_datetime(self.start)
+        def get_date(field):
+            timetuple = self._try_parse_time(field)
+            return to_datetime(timetuple) if timetuple else None
 
-        #  Try to use course advertised date if we can parse it
-        advertised_start = self.metadata.get('advertised_start', None)
-        if advertised_start:
-            try:
-                start_date = datetime.strptime(advertised_start,
-                                               "%Y-%m-%dT%H:%M")
-            except ValueError:
-                pass  # Invalid date, keep using 'start''
+        announcement = get_date('announcement')
+        start = get_date('advertised_start') or to_datetime(self.start)
+        now = to_datetime(time.gmtime())
 
-        now = convert_to_datetime(time.gmtime())
-        days_until_start = (start_date - now).days
-        return days_until_start
+        return announcement, start, now
 
     @lazyproperty
     def grading_context(self):
@@ -387,9 +419,9 @@ class CourseDescriptor(SequenceDescriptor):
             self.first_eligible_appointment_date = self._try_parse_time('First_Eligible_Appointment_Date')
             if self.first_eligible_appointment_date is None:
                 raise ValueError("First appointment date must be specified")
-            # TODO: If defaulting the last appointment date, it should be the 
+            # TODO: If defaulting the last appointment date, it should be the
             # *end* of the same day, not the same time.  It's going to be used as the
-            # end of the exam overall, so we don't want the exam to disappear too soon.  
+            # end of the exam overall, so we don't want the exam to disappear too soon.
             # It's also used optionally as the registration end date, so time matters there too.
             self.last_eligible_appointment_date = self._try_parse_time('Last_Eligible_Appointment_Date') # or self.first_eligible_appointment_date
             if self.last_eligible_appointment_date is None:
@@ -403,7 +435,7 @@ class CourseDescriptor(SequenceDescriptor):
                 raise ValueError("First appointment date must be before last appointment date")
             if self.registration_end_date > self.last_eligible_appointment_date:
                 raise ValueError("Registration end date must be before last appointment date")
-            
+
 
         def _try_parse_time(self, key):
             """
@@ -434,7 +466,7 @@ class CourseDescriptor(SequenceDescriptor):
         def is_registering(self):
             now = time.gmtime()
             return now >= self.registration_start_date and now <= self.registration_end_date
-            
+
         @property
         def first_eligible_appointment_date_text(self):
             return time.strftime("%b %d, %Y", self.first_eligible_appointment_date)
@@ -451,7 +483,7 @@ class CourseDescriptor(SequenceDescriptor):
     def current_test_center_exam(self):
         exams = [exam for exam in self.test_center_exams if exam.has_started_registration() and not exam.has_ended()]
         if len(exams) > 1:
-            # TODO: output some kind of warning.  This should already be 
+            # TODO: output some kind of warning.  This should already be
             # caught if we decide to do validation at load time.
             return exams[0]
         elif len(exams) == 1:
diff --git a/common/lib/xmodule/xmodule/tests/test_course_module.py b/common/lib/xmodule/xmodule/tests/test_course_module.py
index 63eaec1f61..712b095696 100644
--- a/common/lib/xmodule/xmodule/tests/test_course_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_course_module.py
@@ -1,5 +1,5 @@
 import unittest
-from time import strptime, gmtime
+from time import strptime
 from fs.memoryfs import MemoryFS
 
 from mock import Mock, patch
@@ -39,52 +39,81 @@ class DummySystem(ImportSystem):
 class IsNewCourseTestCase(unittest.TestCase):
     """Make sure the property is_new works on courses"""
     @staticmethod
-    def get_dummy_course(start, is_new=None, load_error_modules=True):
+    def get_dummy_course(start, announcement=None, is_new=None):
         """Get a dummy course"""
 
-        system = DummySystem(load_error_modules)
-        is_new = '' if is_new is None else 'is_new="{0}"'.format(is_new).lower()
+        system = DummySystem(load_error_modules=True)
+
+        def to_attrb(n, v):
+            return '' if v is None else '{0}="{1}"'.format(n, v).lower()
+
+        is_new = to_attrb('is_new', is_new)
+        announcement = to_attrb('announcement', announcement)
 
         start_xml = '''
          <course org="{org}" course="{course}"
                 graceperiod="1 day" url_name="test"
                 start="{start}"
+                {announcement}
                 {is_new}>
             <chapter url="hi" url_name="ch" display_name="CH">
                 <html url_name="h" display_name="H">Two houses, ...</html>
             </chapter>
          </course>
-         '''.format(org=ORG, course=COURSE, start=start, is_new=is_new)
+         '''.format(org=ORG, course=COURSE, start=start, is_new=is_new,
+                    announcement=announcement)
 
         return system.process_xml(start_xml)
 
     @patch('xmodule.course_module.time.gmtime')
-    def test_non_started_yet(self, gmtime_mock):
-        descriptor = self.get_dummy_course(start='2013-01-05T12:00')
+    def test_sorting_score(self, gmtime_mock):
         gmtime_mock.return_value = NOW
-        assert(descriptor.is_new == True)
-        assert(descriptor.days_until_start == 4)
+        dates = [('2012-10-01T12:00', '2012-09-01T12:00'),  # 0
+                 ('2012-12-01T12:00', '2012-11-01T12:00'),  # 1
+                 ('2013-02-01T12:00', '2012-12-01T12:00'),  # 2
+                 ('2013-02-01T12:00', '2012-11-10T12:00'),  # 3
+                 ('2013-02-01T12:00', None),                # 4
+                 ('2013-03-01T12:00', None),                # 5
+                 ('2013-04-01T12:00', None),                # 6
+                 ('2012-11-01T12:00', None),                # 7
+                 ('2012-09-01T12:00', None),                # 8
+                 ('1990-01-01T12:00', None),                # 9
+                 ('2013-01-02T12:00', None),                # 10
+                 ('2013-01-10T12:00', '2012-12-31T12:00'),  # 11
+                 ('2013-01-10T12:00', '2013-01-01T12:00'),  # 12
+        ]
+
+        data = []
+        for i, d in enumerate(dates):
+            descriptor = self.get_dummy_course(start=d[0], announcement=d[1])
+            score = descriptor.sorting_score
+            data.append((score, i))
+
+        result = [d[1] for d in sorted(data)]
+        assert(result == [12, 11, 2, 3, 1, 0, 6, 5, 4, 10, 7, 8, 9])
+
 
     @patch('xmodule.course_module.time.gmtime')
-    def test_already_started(self, gmtime_mock):
-        gmtime_mock.return_value = NOW
-
-        descriptor = self.get_dummy_course(start='2012-12-02T12:00')
-        assert(descriptor.is_new == False)
-        assert(descriptor.days_until_start < 0)
-
-    @patch('xmodule.course_module.time.gmtime')
-    def test_is_new_set(self, gmtime_mock):
+    def test_is_new(self, gmtime_mock):
         gmtime_mock.return_value = NOW
 
         descriptor = self.get_dummy_course(start='2012-12-02T12:00', is_new=True)
-        assert(descriptor.is_new == True)
-        assert(descriptor.days_until_start < 0)
+        assert(descriptor.is_new is True)
 
         descriptor = self.get_dummy_course(start='2013-02-02T12:00', is_new=False)
-        assert(descriptor.is_new == False)
-        assert(descriptor.days_until_start > 0)
+        assert(descriptor.is_new is False)
 
         descriptor = self.get_dummy_course(start='2013-02-02T12:00', is_new=True)
-        assert(descriptor.is_new == True)
-        assert(descriptor.days_until_start > 0)
+        assert(descriptor.is_new is True)
+
+        descriptor = self.get_dummy_course(start='2013-01-15T12:00')
+        assert(descriptor.is_new is True)
+
+        descriptor = self.get_dummy_course(start='2013-03-00T12:00')
+        assert(descriptor.is_new is True)
+
+        descriptor = self.get_dummy_course(start='2012-10-15T12:00')
+        assert(descriptor.is_new is False)
+
+        descriptor = self.get_dummy_course(start='2012-12-31T12:00')
+        assert(descriptor.is_new is True)
diff --git a/lms/djangoapps/courseware/courses.py b/lms/djangoapps/courseware/courses.py
index 7c0d30ebd8..1090c208d1 100644
--- a/lms/djangoapps/courseware/courses.py
+++ b/lms/djangoapps/courseware/courses.py
@@ -64,6 +64,7 @@ def course_image_url(course):
     path = course.metadata['data_dir'] + "/images/course_image.jpg"
     return try_staticfiles_lookup(path)
 
+
 def find_file(fs, dirs, filename):
     """
     Looks for a filename in a list of dirs on a filesystem, in the specified order.
@@ -80,6 +81,7 @@ def find_file(fs, dirs, filename):
             return filepath
     raise ResourceNotFoundError("Could not find {0}".format(filename))
 
+
 def get_course_about_section(course, section_key):
     """
     This returns the snippet of html to be rendered on the course about page,
@@ -234,4 +236,18 @@ def get_courses(user, domain=None):
     courses = [c for c in courses if has_access(user, c, 'see_exists')]
 
     courses = sorted(courses, key=lambda course:course.number)
+
+    return courses
+
+
+def sort_by_announcement(courses):
+    """
+    Sorts a list of courses by their announcement date. If the date is
+    not available, sort them by their start date.
+    """
+
+    # Sort courses by how far are they from they start day
+    key = lambda course: course.sorting_score
+    courses = sorted(courses, key=key)
+
     return courses
diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index 9e52e2b281..b3775eb663 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -17,7 +17,8 @@ from django.views.decorators.cache import cache_control
 
 from courseware import grades
 from courseware.access import has_access
-from courseware.courses import (get_courses, get_course_with_access, get_courses_by_university)
+from courseware.courses import (get_courses, get_course_with_access,
+                                get_courses_by_university, sort_by_announcement)
 import courseware.tabs as tabs
 from courseware.models import StudentModuleCache
 from module_render import toc_for_course, get_module, get_instance_module
@@ -67,11 +68,8 @@ def courses(request):
     '''
     Render "find courses" page.  The course selection work is done in courseware.courses.
     '''
-    courses = get_courses(request.user, domain=request.META.get('HTTP_HOST'))
-
-    # Sort courses by how far are they from they start day
-    key = lambda course: course.days_until_start
-    courses = sorted(courses, key=key, reverse=True)
+    courses = get_courses(request.user, request.META.get('HTTP_HOST'))
+    courses = sort_by_announcement(courses)
 
     return render_to_response("courseware/courses.html", {'courses': courses})
 
@@ -438,10 +436,7 @@ def university_profile(request, org_id):
     # Only grab courses for this org...
     courses = get_courses_by_university(request.user,
                                         domain=request.META.get('HTTP_HOST'))[org_id]
-
-    # Sort courses by how far are they from they start day
-    key = lambda course: course.days_until_start
-    courses = sorted(courses, key=key, reverse=True)
+    courses = sort_by_announcement(courses)
 
     context = dict(courses=courses, org_id=org_id)
     template_file = "university_profile/{0}.html".format(org_id).lower()

From c6276c8394a53f78220bf985e340777f5bcde449 Mon Sep 17 00:00:00 2001
From: Chris Dodge <cdodge@edx.org>
Date: Thu, 17 Jan 2013 23:58:07 -0500
Subject: [PATCH 392/541] only cache discussion forum info for 5 minutes before
 flushing. This is needed for Studio backed courses that can add new
 discussion items at any point in time. Also we need to also set metadata
 fields (which are basically the same as what gets passed in the XML) as the
 forums expect those values as metadata

---
 .../xmodule/templates/discussion/default.yaml |  3 +++
 lms/djangoapps/django_comment_client/utils.py | 23 +++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/common/lib/xmodule/xmodule/templates/discussion/default.yaml b/common/lib/xmodule/xmodule/templates/discussion/default.yaml
index fa6dcbff54..d34e6378e6 100644
--- a/common/lib/xmodule/xmodule/templates/discussion/default.yaml
+++ b/common/lib/xmodule/xmodule/templates/discussion/default.yaml
@@ -1,6 +1,9 @@
 ---
 metadata:
     display_name: Discussion Tag
+    for: Topic-Level Student-Visible Label 
+    id: 6002x_group_discussion_by_this 
+    discussion_category: Week 1
 data: |
   <discussion for="Topic-Level Student-Visible Label" id="6002x_group_discussion_by_this" discussion_category="Week 1" />
 children: []
diff --git a/lms/djangoapps/django_comment_client/utils.py b/lms/djangoapps/django_comment_client/utils.py
index 1f39ebfcfd..3094367491 100644
--- a/lms/djangoapps/django_comment_client/utils.py
+++ b/lms/djangoapps/django_comment_client/utils.py
@@ -2,6 +2,7 @@ from collections import defaultdict
 import logging
 import time
 import urllib
+from datetime import datetime
 
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
@@ -63,22 +64,19 @@ def get_discussion_id_map(course):
         return a dict of the form {category: modules}
     """
     global _DISCUSSIONINFO
-    if not _DISCUSSIONINFO[course.id]:
-        initialize_discussion_info(course)
+    initialize_discussion_info(course)
     return _DISCUSSIONINFO[course.id]['id_map']
 
 def get_discussion_title(course, discussion_id):
     global _DISCUSSIONINFO
-    if not _DISCUSSIONINFO[course.id]:
-        initialize_discussion_info(course)
+    initialize_discussion_info(course)
     title = _DISCUSSIONINFO[course.id]['id_map'].get(discussion_id, {}).get('title', '(no title)')
     return title
 
 def get_discussion_category_map(course):
 
     global _DISCUSSIONINFO
-    if not _DISCUSSIONINFO[course.id]:
-        initialize_discussion_info(course)
+    initialize_discussion_info(course)
     return filter_unstarted_categories(_DISCUSSIONINFO[course.id]['category_map'])
 
 def filter_unstarted_categories(category_map):
@@ -131,8 +129,18 @@ def sort_map_entries(category_map):
 def initialize_discussion_info(course):
 
     global _DISCUSSIONINFO
+
+    # only cache in-memory discussion information for 10 minutes
+    # this is because we need a short-term hack fix for
+    # mongo-backed courseware whereby new discussion modules can be added
+    # without LMS service restart
+
     if _DISCUSSIONINFO[course.id]:
-        return
+        timestamp = _DISCUSSIONINFO[course.id].get('timestamp', datetime.now())
+        age = datetime.now() - timestamp
+        # expire every 5 minutes
+        if age.seconds < 300:
+            return
 
     course_id = course.id
 
@@ -209,6 +217,7 @@ def initialize_discussion_info(course):
 
     _DISCUSSIONINFO[course.id]['id_map'] = discussion_id_map
     _DISCUSSIONINFO[course.id]['category_map'] = category_map
+    _DISCUSSIONINFO[course.id]['timestamp'] = datetime.now()
 
 class JsonResponse(HttpResponse):
     def __init__(self, data=None):

From aeee13ab9127f1b35c846911a048ae9ae1773c8d Mon Sep 17 00:00:00 2001
From: Ashley Penney <apenney@edx.org>
Date: Fri, 18 Jan 2013 10:01:21 -0500
Subject: [PATCH 393/541] Fix the virtualenv creation for Jenkins.

---
 jenkins/test.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/jenkins/test.sh b/jenkins/test.sh
index a354039359..cd8800b676 100755
--- a/jenkins/test.sh
+++ b/jenkins/test.sh
@@ -27,7 +27,12 @@ git submodule foreach 'git reset --hard HEAD'
 export PYTHONIOENCODING=UTF-8
 
 GIT_BRANCH=${GIT_BRANCH/HEAD/master}
+if [ ! -d /mnt/virtualenvs/"$JOB_NAME" ]; then
+    mkdir -p /mnt/virtualenvs/"$JOB_NAME"
+    virtualenv /mnt/virtualenvs/"$JOB_NAME"
+fi
 
+source /mnt/virtualenvs/"$JOB_NAME"/bin/activate
 pip install -q -r pre-requirements.txt
 pip install -q -r test-requirements.txt
 yes w | pip install -q -r requirements.txt

From 72fc192f6ef75f44b5e1d29dbbec8993d7b16474 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Fri, 18 Jan 2013 10:24:29 -0500
Subject: [PATCH 394/541] studio - adding in LMS synced styles for TinyMCE
 WYSIWYG preview

---
 cms/static/css/tiny-mce.css | 115 ++++++++++++++++++++++++------------
 1 file changed, 77 insertions(+), 38 deletions(-)

diff --git a/cms/static/css/tiny-mce.css b/cms/static/css/tiny-mce.css
index 7f32e59c8f..63d2bada94 100644
--- a/cms/static/css/tiny-mce.css
+++ b/cms/static/css/tiny-mce.css
@@ -1,50 +1,89 @@
-body {
-    background-color: #fff;
-    font-family: 'Open Sans', Verdana, Arial, Helvetica, sans-serif;
-    font-size: 16px;
-    line-height: 1.6;
-    color: #3c3c3c;
-    scrollbar-3dlight-color: #F0F0EE;
-    scrollbar-arrow-color: #676662;
-    scrollbar-base-color: #F0F0EE;
-    scrollbar-darkshadow-color: #DDDDDD;
-    scrollbar-face-color: #E0E0DD;
-    scrollbar-highlight-color: #F0F0EE;
-    scrollbar-shadow-color: #F0F0EE;
-    scrollbar-track-color: #F5F5F5;
+.mceContentBody {
+  padding: 10px;
+  background-color: #fff;
+  font-family: 'Open Sans', Verdana, Arial, Helvetica, sans-serif;
+  font-size: 16px;
+  line-height: 1.6;
+  color: #3c3c3c;
+  scrollbar-3dlight-color: #F0F0EE;
+  scrollbar-arrow-color: #676662;
+  scrollbar-base-color: #F0F0EE;
+  scrollbar-darkshadow-color: #DDDDDD;
+  scrollbar-face-color: #E0E0DD;
+  scrollbar-highlight-color: #F0F0EE;
+  scrollbar-shadow-color: #F0F0EE;
+  scrollbar-track-color: #F5F5F5;
 }
 
-a {
-    color: #1d9dd9;
-    text-decoration: none;
-}
-
-p {
-    font-size: 16px;
-    line-height: 1.6;
+h1 {
+  color: #3c3c3c;
+  font-weight: normal;
+  font-size: 2em;
+  line-height: 1.4em;
+  letter-spacing: 1px;
 }
 
 h2 {
-    color: #646464;
-    font-size: 19px;
-    font-weight: 300;
-    letter-spacing: 1px;
-    margin-bottom: 15px;
-    text-transform: uppercase;
+  color: #646464;
+  font-weight: normal;
+  font-size: 1.2em;
+  line-height: 1.2em;
+  letter-spacing: 1px;
+  margin-bottom: 15px;
+  text-transform: uppercase;
+  -webkit-font-smoothing: antialiased;
 }
 
 h3 {
-    font-size: 19px;
-    font-weight: 400;
+  font-size: 1.2em;
+  font-weight: 600;
+}
+
+p {
+  margin-bottom: 1.416em;
+  font-size: 1em;
+  line-height: 1.6em !important;
+  color: $baseFontColor;
+}
+
+em, i {
+  font-style: italic;
+}
+
+strong, b {
+  font-style: bold;
+}
+
+p + p, ul + p, ol + p {
+  margin-top: 20px;
+}
+
+ol, ul {
+  margin: 1em 0;
+  padding: 0 0 0 1em;
+}
+
+ol li, ul li {
+  margin-bottom: 0.708em;
+}
+
+ol {
+  list-style: decimal outside none;
+}
+
+ul {
+  list-style: disc outside none;
+}
+
+a, a:link, a:visited, a:hover, a:active {
+  color: #1d9dd9;
+} 
+
+img {
+  max-width: 100%;
 }
 
 code {
-    margin: 0 2px;
-    padding: 0px 5px;
-    border-radius: 3px;
-    border: 1px solid #eaeaea;
-    white-space: nowrap;
-    font-family: Monaco, monospace;
-    font-size: 14px;
-    background-color: #f8f8f8;
+  font-family: monospace, serif;
+  background: none;
 }
\ No newline at end of file

From 700b0f14fd72c4b491854e0d51469efbdea573e2 Mon Sep 17 00:00:00 2001
From: cahrens <christina@edx.org>
Date: Fri, 18 Jan 2013 10:48:42 -0500
Subject: [PATCH 395/541] Need path to tiny mce JS file now.

---
 common/lib/xmodule/jasmine_test_runner.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/lib/xmodule/jasmine_test_runner.html.erb b/common/lib/xmodule/jasmine_test_runner.html.erb
index 5ee06b5f1b..3327ab4aea 100644
--- a/common/lib/xmodule/jasmine_test_runner.html.erb
+++ b/common/lib/xmodule/jasmine_test_runner.html.erb
@@ -16,6 +16,7 @@
   <script type="text/javascript" src="<%= common_js_root %>/vendor/CodeMirror/codemirror.js"></script>
   <script type="text/javascript" src="<%= common_js_root %>/vendor/mathjax-MathJax-c9db6ac/MathJax.js"></script>
   <script type="text/javascript" src="<%= common_js_root %>/vendor/tiny_mce/jquery.tinymce.js"></script>
+  <script type="text/javascript" src="<%= common_js_root %>/vendor/tiny_mce/tiny_mce.js"></script>
 
   <script type="text/javascript">
     AjaxPrefix.addAjaxPrefix(jQuery, function() {

From 6d73a399b10cec8921708277deb1b18b0e0f63dc Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@mit.edu>
Date: Fri, 18 Jan 2013 14:04:01 -0500
Subject: [PATCH 396/541] fix bug in instructor dashboard groups code

---
 lms/djangoapps/instructor/views.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lms/djangoapps/instructor/views.py b/lms/djangoapps/instructor/views.py
index ddb31bf871..2cf3bbb0a9 100644
--- a/lms/djangoapps/instructor/views.py
+++ b/lms/djangoapps/instructor/views.py
@@ -111,6 +111,7 @@ def instructor_dashboard(request, course_id):
         except Group.DoesNotExist:
             group = Group(name=grpname)     # create the group
             group.save()
+        return group
 
     def get_beta_group(course):
         """

From bd6d1531266507bc76ed2cc7f6c029a37bfb225a Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Fri, 18 Jan 2013 15:18:13 -0500
Subject: [PATCH 397/541] Fix failing self-assessment unit tests

---
 .../lib/xmodule/xmodule/tests/test_import.py  | 13 -------
 .../xmodule/tests/test_self_assessment.py     | 39 ++++++++++++++-----
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/common/lib/xmodule/xmodule/tests/test_import.py b/common/lib/xmodule/xmodule/tests/test_import.py
index 90ec112f19..554e89ac74 100644
--- a/common/lib/xmodule/xmodule/tests/test_import.py
+++ b/common/lib/xmodule/xmodule/tests/test_import.py
@@ -339,19 +339,6 @@ class ImportTestCase(unittest.TestCase):
 
         self.assertRaises(etree.XMLSyntaxError, system.process_xml, bad_xml)
 
-    def test_selfassessment_import(self):
-        '''
-        Check to see if definition_from_xml in self_assessment_module.py
-        works properly.  Pulls data from the self_assessment directory in the test data directory.
-        '''
-
-        modulestore = XMLModuleStore(DATA_DIR, course_dirs=['self_assessment'])
-
-        sa_id = "edX/sa_test/2012_Fall"
-        location = Location(["i4x", "edX", "sa_test", "selfassessment", "SampleQuestion"])
-        sa_sample = modulestore.get_instance(sa_id, location)
-        #10 attempts is hard coded into SampleQuestion, which is the url_name of a selfassessment xml tag
-        self.assertEqual(sa_sample.metadata['attempts'], '10')
 
     def test_graphicslidertool_import(self):
         '''
diff --git a/common/lib/xmodule/xmodule/tests/test_self_assessment.py b/common/lib/xmodule/xmodule/tests/test_self_assessment.py
index d89190b1e0..acd127e8fd 100644
--- a/common/lib/xmodule/xmodule/tests/test_self_assessment.py
+++ b/common/lib/xmodule/xmodule/tests/test_self_assessment.py
@@ -4,8 +4,11 @@ import unittest
 
 from xmodule.self_assessment_module import SelfAssessmentModule
 from xmodule.modulestore import Location
+from lxml import etree
+import logging
 
 from . import test_system
+log = logging.getLogger("mitx.courseware")
 
 class SelfAssessmentTest(unittest.TestCase):
 
@@ -26,22 +29,40 @@ class SelfAssessmentTest(unittest.TestCase):
         state = json.dumps({'student_answers': ["Answer 1", "answer 2", "answer 3"],
                             'scores': [0, 1],
                             'hints': ['o hai'],
-                            'state': SelfAssessmentModule.ASSESSING,
+                            'state': SelfAssessmentModule.INITIAL,
                             'attempts': 2})
 
+        rubric = '''<rubric><rubric>
+            <category>
+			<description>Response Quality</description>
+			<option>The response is not a satisfactory answer to the question.  It either fails to address the question or does so in a limited way, with no evidence of higher-order thinking.</option>
+		    </category>
+             </rubric></rubric>'''
+
+        prompt = etree.XML("<prompt>Text</prompt>")
+        static_data = {
+                'max_attempts': 10,
+                'rubric': etree.XML(rubric),
+                'prompt': prompt,
+                'max_score': 1
+                }
+
         module = SelfAssessmentModule(test_system, self.location,
                                       self.definition, self.descriptor,
-                                      state, {}, metadata=self.metadata)
+                                      static_data, state, metadata=self.metadata)
 
         self.assertEqual(module.get_score()['score'], 0)
 
-        self.assertTrue('answer 3' in module.get_html())
-        self.assertFalse('answer 2' in module.get_html())
+        html = module.get_html(test_system)
+        log.debug("rendered html: {0}".format(html))
 
-        module.save_assessment({'assessment': '0'})
-        self.assertEqual(module.state, module.REQUEST_HINT)
 
-        module.save_hint({'hint': 'hint for ans 3'})
+        module.save_answer({'student_answer': "I am an answer"}, test_system)
+        self.assertEqual(module.state, module.ASSESSING)
+
+        module.save_assessment({'assessment': '0'}, test_system)
+        self.assertEqual(module.state, module.POST_ASSESSMENT)
+        module.save_hint({'hint': 'this is a hint'}, test_system)
         self.assertEqual(module.state, module.DONE)
 
         d = module.reset({})
@@ -49,6 +70,6 @@ class SelfAssessmentTest(unittest.TestCase):
         self.assertEqual(module.state, module.INITIAL)
 
         # if we now assess as right, skip the REQUEST_HINT state
-        module.save_answer({'student_answer': 'answer 4'})
-        module.save_assessment({'assessment': '1'})
+        module.save_answer({'student_answer': 'answer 4'}, test_system)
+        module.save_assessment({'assessment': '1'}, test_system)
         self.assertEqual(module.state, module.DONE)

From 89055da8ba261146f5bc5522dbf8f6cdc2cdd941 Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Fri, 18 Jan 2013 15:38:59 -0500
Subject: [PATCH 398/541] Take out useless logging.

---
 common/lib/xmodule/xmodule/tests/test_self_assessment.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/common/lib/xmodule/xmodule/tests/test_self_assessment.py b/common/lib/xmodule/xmodule/tests/test_self_assessment.py
index acd127e8fd..565483c586 100644
--- a/common/lib/xmodule/xmodule/tests/test_self_assessment.py
+++ b/common/lib/xmodule/xmodule/tests/test_self_assessment.py
@@ -5,10 +5,8 @@ import unittest
 from xmodule.self_assessment_module import SelfAssessmentModule
 from xmodule.modulestore import Location
 from lxml import etree
-import logging
 
 from . import test_system
-log = logging.getLogger("mitx.courseware")
 
 class SelfAssessmentTest(unittest.TestCase):
 
@@ -53,9 +51,6 @@ class SelfAssessmentTest(unittest.TestCase):
 
         self.assertEqual(module.get_score()['score'], 0)
 
-        html = module.get_html(test_system)
-        log.debug("rendered html: {0}".format(html))
-
 
         module.save_answer({'student_answer': "I am an answer"}, test_system)
         self.assertEqual(module.state, module.ASSESSING)

From 1411bd1a88e33a2a6e269e2894ffcebdf0f69cf0 Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@edx.org>
Date: Fri, 18 Jan 2013 15:39:28 -0500
Subject: [PATCH 399/541] fix tests--nosetests is overly excited about my code

---
 lms/djangoapps/courseware/access.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lms/djangoapps/courseware/access.py b/lms/djangoapps/courseware/access.py
index c7e09526c9..a176d2a171 100644
--- a/lms/djangoapps/courseware/access.py
+++ b/lms/djangoapps/courseware/access.py
@@ -338,6 +338,10 @@ def course_beta_test_group_name(location):
     """
     return 'beta_testers_{0}'.format(Location(location).course)
 
+# nosetests thinks that anything with _test_ in the name is a test.
+# Correct this (https://nose.readthedocs.org/en/latest/finding_tests.html)
+course_beta_test_group_name.__test__ = False
+
 
 def _course_instructor_group_name(location):
     """

From 84efafc896248541f8d5d108bccd2123fba2f41d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s=20Rocha?= <rocha@edx.org>
Date: Fri, 18 Jan 2013 17:00:51 -0500
Subject: [PATCH 400/541] Add missing semicolon at the end of sequence display
 module javascript

---
 .../xmodule/js/src/sequence/display/jquery.sequence.js   | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/sequence/display/jquery.sequence.js b/common/lib/xmodule/xmodule/js/src/sequence/display/jquery.sequence.js
index fbefb8a8ce..cfda9e6d50 100644
--- a/common/lib/xmodule/xmodule/js/src/sequence/display/jquery.sequence.js
+++ b/common/lib/xmodule/xmodule/js/src/sequence/display/jquery.sequence.js
@@ -1,6 +1,3 @@
-
-
-
 var SequenceNav = function($element) {
 	var _this = this;
 	var $element = $element;
@@ -44,7 +41,7 @@ var SequenceNav = function($element) {
 
 		var leftPercent = clamp(-left / padding, 0, 1);
 		$leftShadow.css('opacity', leftPercent);
-	
+
 		var rightPercent = clamp((maxScroll + left) / padding, 0, 1);
 		$rightShadow.css('opacity', rightPercent);
 	};
@@ -95,5 +92,5 @@ var SequenceNav = function($element) {
 	$(window).bind('resize', updateWidths);
 	setTimeout(function() {
 		checkPosition();
-	}, 200);	
-}
\ No newline at end of file
+	}, 200);
+};

From 0f035b7692bcbcfde1ac19e0d40759bd3cfa113c Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@edx.org>
Date: Fri, 18 Jan 2013 17:03:55 -0500
Subject: [PATCH 401/541] Remove extra RequireJS.js entry.

---
 lms/envs/common.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lms/envs/common.py b/lms/envs/common.py
index 330c8fd304..b50fc25917 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -435,7 +435,6 @@ courseware_only_js += [
 main_vendor_js = [
   'js/vendor/RequireJS.js',
   'js/vendor/json2.js',
-  'js/vendor/RequireJS.js',
   'js/vendor/jquery.min.js',
   'js/vendor/jquery-ui.min.js',
   'js/vendor/jquery.cookie.js',

From 5200534a4a019acbb075e2f05d263c252c1fe436 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 21 Dec 2012 11:24:38 +0200
Subject: [PATCH 402/541] template for drag_and_drop capaproblem

---
 common/lib/capa/capa/inputtypes.py            | 48 +++++++++++++++++++
 common/lib/capa/capa/responsetypes.py         | 10 ++--
 .../capa/templates/drag_and_drop_input.html   | 41 ++++++++++++++++
 common/lib/xmodule/xmodule/capa_module.py     |  4 +-
 .../xmodule/js/src/capa/drag_and_drop.js      |  1 +
 5 files changed, 99 insertions(+), 5 deletions(-)
 create mode 100644 common/lib/capa/capa/templates/drag_and_drop_input.html
 create mode 100644 common/lib/xmodule/xmodule/js/src/capa/drag_and_drop.js

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index 1d3646fefc..73056bc09e 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -735,3 +735,51 @@ class ChemicalEquationInput(InputTypeBase):
 registry.register(ChemicalEquationInput)
 
 #-----------------------------------------------------------------------------
+
+class OpenEndedInput(InputTypeBase):
+    """
+    A text area input for code--uses codemirror, does syntax highlighting, special tab handling,
+    etc.
+    """
+
+    template = "openendedinput.html"
+    tags = ['openendedinput']
+
+    # pulled out for testing
+    submitted_msg = ("Feedback not yet available.  Reload to check again. "
+                     "Once the problem is graded, this message will be "
+                     "replaced with the grader's feedback")
+
+    @classmethod
+    def get_attributes(cls):
+        """
+        Convert options to a convenient format.
+        """
+        return [Attribute('rows', '30'),
+                Attribute('cols', '80'),
+                Attribute('hidden', ''),
+                ]
+
+    def setup(self):
+        """
+        Implement special logic: handle queueing state, and default input.
+        """
+        # if no student input yet, then use the default input given by the problem
+        if not self.value:
+            self.value = self.xml.text
+
+        # Check if problem has been queued
+        self.queue_len = 0
+        # Flag indicating that the problem has been queued, 'msg' is length of queue
+        if self.status == 'incomplete':
+            self.status = 'queued'
+            self.queue_len = self.msg
+            self.msg = self.submitted_msg
+
+    def _extra_context(self):
+        """Defined queue_len, add it """
+        return {'queue_len': self.queue_len,}
+
+registry.register(OpenEndedInput)
+
+#-----------------------------------------------------------------------------
diff --git a/common/lib/capa/capa/responsetypes.py b/common/lib/capa/capa/responsetypes.py
index 3d97cb0bea..98e36084a1 100644
--- a/common/lib/capa/capa/responsetypes.py
+++ b/common/lib/capa/capa/responsetypes.py
@@ -33,7 +33,7 @@ from correctmap import CorrectMap
 from datetime import datetime
 from util import *
 from lxml import etree
-from lxml.html.soupparser import fromstring as fromstring_bs	 # uses Beautiful Soup!!! FIXME?
+from lxml.html.soupparser import fromstring as fromstring_bs     # uses Beautiful Soup!!! FIXME?
 import xqueue_interface
 
 log = logging.getLogger('mitx.' + __name__)
@@ -869,7 +869,9 @@ def sympy_check2():
 
     response_tag = 'customresponse'
 
-    allowed_inputfields = ['textline', 'textbox', 'crystallography', 'chemicalequationinput', 'vsepr_input']
+    allowed_inputfields = ['textline', 'textbox', 'crystallography',
+                            'chemicalequationinput', 'vsepr_input',
+                            'drag_and_drop']
 
     def setup_response(self):
         xml = self.xml
@@ -1044,7 +1046,7 @@ def sympy_check2():
                                          pretty_print=True)
                     #msg = etree.tostring(fromstring_bs(msg),pretty_print=True)
                     msg = msg.replace('&#13;', '')
-                    #msg = re.sub('<html>(.*)</html>','\\1',msg,flags=re.M|re.DOTALL)	# python 2.7
+                    #msg = re.sub('<html>(.*)</html>','\\1',msg,flags=re.M|re.DOTALL)   # python 2.7
                     msg = re.sub('(?ms)<html>(.*)</html>', '\\1', msg)
 
                 messages[0] = msg
@@ -1763,7 +1765,7 @@ class ImageResponse(LoncapaResponse):
     def get_score(self, student_answers):
         correct_map = CorrectMap()
         expectedset = self.get_answers()
-        for aid in self.answer_ids:	 # loop through IDs of <imageinput>
+        for aid in self.answer_ids:  # loop through IDs of <imageinput>
         #  fields in our stanza
             given = student_answers[aid]  # this should be a string of the form '[x,y]'
             correct_map.set(aid, 'incorrect')
diff --git a/common/lib/capa/capa/templates/drag_and_drop_input.html b/common/lib/capa/capa/templates/drag_and_drop_input.html
new file mode 100644
index 0000000000..8613c97479
--- /dev/null
+++ b/common/lib/capa/capa/templates/drag_and_drop_input.html
@@ -0,0 +1,41 @@
+<section id="inputtype_${id}" class="capa_inputtype" >
+    <div class="drag_and_drop_problem" id="drag_and_drop_div_${id}"
+    style="width:${width};height:${height}"></div>
+
+    <div class="script_placeholder" data-src="/static/js/raphael.js"></div>
+
+    % if status == 'unsubmitted':
+        <div class="unanswered" id="status_${id}">
+    % elif status == 'correct':
+        <div class="correct" id="status_${id}">
+    % elif status == 'incorrect':
+        <div class="incorrect" id="status_${id}">
+    % elif status == 'incomplete':
+        <div class="incorrect" id="status_${id}">
+    % endif
+
+
+    <input type="text" name="input_${id}" id="input_${id}" value="${value|h}" style="display:none;"/>
+
+    <p class="status">
+        % if status == 'unsubmitted':
+        unanswered
+        % elif status == 'correct':
+        correct
+        % elif status == 'incorrect':
+        incorrect
+        % elif status == 'incomplete':
+        incomplete
+        % endif
+    </p>
+
+    <p id="answer_${id}" class="answer"></p>
+
+    % if msg:
+        <span class="message">${msg|n}</span>
+    % endif
+
+    % if status in ['unsubmitted', 'correct', 'incorrect', 'incomplete']:
+        </div>
+    % endif
+</section>
diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py
index 1da271072a..00760dc855 100644
--- a/common/lib/xmodule/xmodule/capa_module.py
+++ b/common/lib/xmodule/xmodule/capa_module.py
@@ -83,7 +83,9 @@ class CapaModule(XModule):
                      resource_string(__name__, 'js/src/javascript_loader.coffee'),
                     ],
           'js': [resource_string(__name__, 'js/src/capa/imageinput.js'),
-                 resource_string(__name__, 'js/src/capa/schematic.js')]}
+                 resource_string(__name__, 'js/src/capa/schematic.js'),
+                 resource_string(__name__, 'js/src/capa/drag_and_drop.js')
+                 ]}
 
     js_module_name = "Problem"
     css = {'scss': [resource_string(__name__, 'css/capa/display.scss')]}
diff --git a/common/lib/xmodule/xmodule/js/src/capa/drag_and_drop.js b/common/lib/xmodule/xmodule/js/src/capa/drag_and_drop.js
new file mode 100644
index 0000000000..73c9f606d1
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/capa/drag_and_drop.js
@@ -0,0 +1 @@
+alert('drag-and-drop js is loaded')
\ No newline at end of file

From ea3b1f93b021af9c0d9d3db383face5d37753dda Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 21 Dec 2012 12:24:54 +0200
Subject: [PATCH 403/541] updated drag and drop files

---
 common/lib/capa/capa/inputtypes.py            | 30 ++++++++++++-
 .../capa/templates/drag_and_drop_input.html   |  6 ++-
 common/lib/capa/capa/tests/test_inputtypes.py | 42 ++++++++++++++++++-
 3 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index 73056bc09e..3f01ed58a7 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -13,6 +13,9 @@ Module containing the problem elements which render into input objects
 - imageinput  (for clickable image)
 - optioninput (for option list)
 - filesubmission (upload a file)
+- crystallography
+- vsepr_input
+- drag_and_drop
 
 These are matched by *.html files templates/*.html which are mako templates with the
 actual html.
@@ -782,4 +785,29 @@ class OpenEndedInput(InputTypeBase):
 
 registry.register(OpenEndedInput)
 
-#-----------------------------------------------------------------------------
+# -------------------------------------------------------------------------
+
+
+class DragAndDropInput(InputTypeBase):
+    """
+    Input for molecular geometry--show possible structures, let student
+    pick structure and label positions with atoms or electron pairs.
+    """
+
+    template = 'drag_and_drop.html'
+    tags = ['drag_and_drop_input']
+
+    @classmethod
+    def get_attributes(cls):
+        """
+        Note: height, width are required.
+        """
+        return [Attribute('height'),
+                Attribute('width'),
+                Attribute('template'),
+                Attribute('images'),
+                ]
+
+registry.register(DragAndDropInput)
+
+#--------------------------------------------------------------------------------------------------------------------
diff --git a/common/lib/capa/capa/templates/drag_and_drop_input.html b/common/lib/capa/capa/templates/drag_and_drop_input.html
index 8613c97479..00752ea748 100644
--- a/common/lib/capa/capa/templates/drag_and_drop_input.html
+++ b/common/lib/capa/capa/templates/drag_and_drop_input.html
@@ -1,6 +1,7 @@
 <section id="inputtype_${id}" class="capa_inputtype" >
     <div class="drag_and_drop_problem" id="drag_and_drop_div_${id}"
-    style="width:${width};height:${height}"></div>
+    style="width:${width};height:${height}"
+    data-template="${template}" data-images="${images}"></div>
 
     <div class="script_placeholder" data-src="/static/js/raphael.js"></div>
 
@@ -15,7 +16,8 @@
     % endif
 
 
-    <input type="text" name="input_${id}" id="input_${id}" value="${value|h}" style="display:none;"/>
+    <input type="text" name="input_${id}" id="input_${id}" value="${value|h}"
+    style="display:none;"/>
 
     <p class="status">
         % if status == 'unsubmitted':
diff --git a/common/lib/capa/capa/tests/test_inputtypes.py b/common/lib/capa/capa/tests/test_inputtypes.py
index dafd31bdc7..743ac7a548 100644
--- a/common/lib/capa/capa/tests/test_inputtypes.py
+++ b/common/lib/capa/capa/tests/test_inputtypes.py
@@ -9,7 +9,7 @@ TODO:
 - check rendering -- e.g. msg should appear in the rendered output.  If possible, test that
   templates are escaping things properly.
 
-  
+
 - test unicode in values, parameters, etc.
 - test various html escapes
 - test funny xml chars -- should never get xml parse error if things are escaped properly.
@@ -501,3 +501,43 @@ class ChemicalEquationTest(unittest.TestCase):
                     }
         self.assertEqual(context, expected)
 
+
+class DragAndDropTest(unittest.TestCase):
+    '''
+    Check that drag and drop inputs work
+    '''
+
+    def test_rendering(self):
+        height = '12'
+        width = '33'
+        template = "path to template"
+        images = "path to images"
+
+        xml_str = """<drag_and_drop id="prob_1_2"
+        height="{h}"
+        width="{w}"
+        template="{t}"
+        images="{i}"
+        />""".format(h=height, w=width, t=template, i=images)
+
+        element = etree.fromstring(xml_str)
+
+        value = 'abc'
+        state = {'value': value,
+                 'status': 'unsubmitted'}
+
+        the_input = lookup_tag('drag_and_drop')(test_system, element, state)
+
+        context = the_input._get_render_context()
+
+        expected = {'id': 'prob_1_2',
+                    'value': value,
+                    'status': 'unsubmitted',
+                    'msg': '',
+                    'width': width,
+                    'height': height,
+                    'template': template,
+                    'images': images,
+                   }
+
+        self.assertEqual(context, expected)

From cc78ebe329781cbd1a3445800f8d2f697be30ae2 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 21 Dec 2012 12:43:58 +0200
Subject: [PATCH 404/541] rename tag

---
 common/lib/capa/capa/responsetypes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/capa/capa/responsetypes.py b/common/lib/capa/capa/responsetypes.py
index 98e36084a1..429f0cd483 100644
--- a/common/lib/capa/capa/responsetypes.py
+++ b/common/lib/capa/capa/responsetypes.py
@@ -871,7 +871,7 @@ def sympy_check2():
 
     allowed_inputfields = ['textline', 'textbox', 'crystallography',
                             'chemicalequationinput', 'vsepr_input',
-                            'drag_and_drop']
+                            'drag_and_drop_input']
 
     def setup_response(self):
         xml = self.xml

From 0001a67ce1d6f60363d166cdbb815ff60e2c5b06 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 21 Dec 2012 12:54:47 +0200
Subject: [PATCH 405/541] update tag name

---
 common/lib/capa/capa/inputtypes.py            | 8 ++++----
 common/lib/capa/capa/tests/test_inputtypes.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index 3f01ed58a7..8360e06fbb 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -695,7 +695,7 @@ class VseprInput(InputTypeBase):
     @classmethod
     def get_attributes(cls):
         """
-        Note: height, width are required.
+        Note: height, width, molecules and geometries are required.
         """
         return [Attribute('height'),
                 Attribute('width'),
@@ -781,7 +781,7 @@ class OpenEndedInput(InputTypeBase):
 
     def _extra_context(self):
         """Defined queue_len, add it """
-        return {'queue_len': self.queue_len,}
+        return {'queue_len': self.queue_len, }
 
 registry.register(OpenEndedInput)
 
@@ -794,13 +794,13 @@ class DragAndDropInput(InputTypeBase):
     pick structure and label positions with atoms or electron pairs.
     """
 
-    template = 'drag_and_drop.html'
+    template = 'drag_and_drop_input.html'
     tags = ['drag_and_drop_input']
 
     @classmethod
     def get_attributes(cls):
         """
-        Note: height, width are required.
+        Note: height, width, template and images are required.
         """
         return [Attribute('height'),
                 Attribute('width'),
diff --git a/common/lib/capa/capa/tests/test_inputtypes.py b/common/lib/capa/capa/tests/test_inputtypes.py
index 743ac7a548..505b536ab6 100644
--- a/common/lib/capa/capa/tests/test_inputtypes.py
+++ b/common/lib/capa/capa/tests/test_inputtypes.py
@@ -511,7 +511,7 @@ class DragAndDropTest(unittest.TestCase):
         height = '12'
         width = '33'
         template = "path to template"
-        images = "path to images"
+        images = "list of pathes to images"
 
         xml_str = """<drag_and_drop id="prob_1_2"
         height="{h}"

From c7add85c9ad6225d234947120c0652b3dde9f346 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 21 Dec 2012 16:10:56 +0200
Subject: [PATCH 406/541] added new tag

---
 common/lib/capa/capa/inputtypes.py                    |  6 +++---
 .../lib/capa/capa/templates/drag_and_drop_input.html  | 11 +++++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index 8360e06fbb..2162388371 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -800,12 +800,12 @@ class DragAndDropInput(InputTypeBase):
     @classmethod
     def get_attributes(cls):
         """
-        Note: height, width, template and images are required.
+        Note: height, width, images_directory_path are required.
         """
+        images_directory_path =  Attribute('images_directory_path')
         return [Attribute('height'),
                 Attribute('width'),
-                Attribute('template'),
-                Attribute('images'),
+                images_directory_path,
                 ]
 
 registry.register(DragAndDropInput)
diff --git a/common/lib/capa/capa/templates/drag_and_drop_input.html b/common/lib/capa/capa/templates/drag_and_drop_input.html
index 00752ea748..bf9a58ea3e 100644
--- a/common/lib/capa/capa/templates/drag_and_drop_input.html
+++ b/common/lib/capa/capa/templates/drag_and_drop_input.html
@@ -1,7 +1,14 @@
 <section id="inputtype_${id}" class="capa_inputtype" >
     <div class="drag_and_drop_problem" id="drag_and_drop_div_${id}"
-    style="width:${width};height:${height}"
-    data-template="${template}" data-images="${images}"></div>
+    style="width:${width};height:${height}">
+        % if item
+            <ul>
+                % for item in images_directory_path:
+                    <li>${item}</li>
+                % endfor
+            </ul>
+        % endif
+    </div>
 
     <div class="script_placeholder" data-src="/static/js/raphael.js"></div>
 

From a394419641ce08f5a9c8b686af6a6b104398123c Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 21 Dec 2012 17:43:09 +0200
Subject: [PATCH 407/541] updates

---
 common/lib/capa/capa/inputtypes.py               | 16 ++++++++++++++--
 .../capa/capa/templates/drag_and_drop_input.html |  5 +++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index 2162388371..bf84d3f78c 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -44,6 +44,7 @@ from lxml import etree
 import re
 import shlex  # for splitting quoted strings
 import sys
+import os
 
 from registry import TagRegistry
 
@@ -802,12 +803,23 @@ class DragAndDropInput(InputTypeBase):
         """
         Note: height, width, images_directory_path are required.
         """
-        images_directory_path =  Attribute('images_directory_path')
+        # import ipdb; ipdb.set_trace()
         return [Attribute('height'),
                 Attribute('width'),
-                images_directory_path,
+                Attribute('images_directory_path'),
                 ]
 
+    def setup(self):
+        # import ipdb; ipdb.set_trace()
+        imagepath = self.loaded_attributes['images_directory_path']
+        # import ipdb; ipdb.set_trace()
+        try:
+            images_list = self.system.filestore.listdir(os.path.join('static',
+                                                    'images', imagepath))
+        except:
+            images_list = []
+        self.loaded_attributes['images_list'] = images_list
+
 registry.register(DragAndDropInput)
 
 #--------------------------------------------------------------------------------------------------------------------
diff --git a/common/lib/capa/capa/templates/drag_and_drop_input.html b/common/lib/capa/capa/templates/drag_and_drop_input.html
index bf9a58ea3e..dc48862b4f 100644
--- a/common/lib/capa/capa/templates/drag_and_drop_input.html
+++ b/common/lib/capa/capa/templates/drag_and_drop_input.html
@@ -1,9 +1,10 @@
 <section id="inputtype_${id}" class="capa_inputtype" >
     <div class="drag_and_drop_problem" id="drag_and_drop_div_${id}"
     style="width:${width};height:${height}">
-        % if item
+    <p>${images_list}</p>
+        % if images_list:
             <ul>
-                % for item in images_directory_path:
+                % for item in images_list:
                     <li>${item}</li>
                 % endfor
             </ul>

From ccb8e96acb8d96e74c896001563df4152e6f804b Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 21 Dec 2012 17:47:51 +0200
Subject: [PATCH 408/541] fix

---
 common/lib/capa/capa/templates/drag_and_drop_input.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/common/lib/capa/capa/templates/drag_and_drop_input.html b/common/lib/capa/capa/templates/drag_and_drop_input.html
index dc48862b4f..405e66f75c 100644
--- a/common/lib/capa/capa/templates/drag_and_drop_input.html
+++ b/common/lib/capa/capa/templates/drag_and_drop_input.html
@@ -1,7 +1,6 @@
 <section id="inputtype_${id}" class="capa_inputtype" >
     <div class="drag_and_drop_problem" id="drag_and_drop_div_${id}"
     style="width:${width};height:${height}">
-    <p>${images_list}</p>
         % if images_list:
             <ul>
                 % for item in images_list:

From 313055fe960a9ed99a6d6605d5aa7451a8e4cbca Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 21 Dec 2012 18:17:27 +0200
Subject: [PATCH 409/541] transfer images list to html

---
 common/lib/capa/capa/inputtypes.py                      | 2 ++
 common/lib/capa/capa/templates/drag_and_drop_input.html | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index bf84d3f78c..ec00a64833 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -816,9 +816,11 @@ class DragAndDropInput(InputTypeBase):
         try:
             images_list = self.system.filestore.listdir(os.path.join('static',
                                                     'images', imagepath))
+            images_list = ['/static/images/' + img for img in images_list]
         except:
             images_list = []
         self.loaded_attributes['images_list'] = images_list
+        self.to_render.add('images_list')
 
 registry.register(DragAndDropInput)
 
diff --git a/common/lib/capa/capa/templates/drag_and_drop_input.html b/common/lib/capa/capa/templates/drag_and_drop_input.html
index 405e66f75c..58fed37c84 100644
--- a/common/lib/capa/capa/templates/drag_and_drop_input.html
+++ b/common/lib/capa/capa/templates/drag_and_drop_input.html
@@ -4,7 +4,7 @@
         % if images_list:
             <ul>
                 % for item in images_list:
-                    <li>${item}</li>
+                    <li><image width="100" height="100" src="${item}"></image></li>
                 % endfor
             </ul>
         % endif

From 757f955c5ebcc07debe132aed32605f030991088 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Mon, 24 Dec 2012 10:01:38 +0200
Subject: [PATCH 410/541] Moved JS for drag-and-drop from global capa. Now it
 will load only when required, and can be specified from any course.

---
 common/lib/xmodule/xmodule/capa_module.py                      | 3 +--
 .../xmodule/xmodule/js/src => static/js}/capa/drag_and_drop.js | 0
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename common/{lib/xmodule/xmodule/js/src => static/js}/capa/drag_and_drop.js (100%)

diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py
index 00760dc855..d3b2c5c6eb 100644
--- a/common/lib/xmodule/xmodule/capa_module.py
+++ b/common/lib/xmodule/xmodule/capa_module.py
@@ -83,8 +83,7 @@ class CapaModule(XModule):
                      resource_string(__name__, 'js/src/javascript_loader.coffee'),
                     ],
           'js': [resource_string(__name__, 'js/src/capa/imageinput.js'),
-                 resource_string(__name__, 'js/src/capa/schematic.js'),
-                 resource_string(__name__, 'js/src/capa/drag_and_drop.js')
+                 resource_string(__name__, 'js/src/capa/schematic.js')
                  ]}
 
     js_module_name = "Problem"
diff --git a/common/lib/xmodule/xmodule/js/src/capa/drag_and_drop.js b/common/static/js/capa/drag_and_drop.js
similarity index 100%
rename from common/lib/xmodule/xmodule/js/src/capa/drag_and_drop.js
rename to common/static/js/capa/drag_and_drop.js

From 61c68b740ce2151e5bb61419ee436e4da5822c5d Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Mon, 24 Dec 2012 10:41:07 +0200
Subject: [PATCH 411/541] Set up of basic RequireJS skeleton structure.

---
 common/static/js/capa/drag_and_drop.js      | 28 ++++++++++++++++++++-
 common/static/js/capa/drag_and_drop/main.js | 19 ++++++++++++++
 lms/envs/common.py                          |  2 ++
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 common/static/js/capa/drag_and_drop/main.js

diff --git a/common/static/js/capa/drag_and_drop.js b/common/static/js/capa/drag_and_drop.js
index 73c9f606d1..a2d8b8d37b 100644
--- a/common/static/js/capa/drag_and_drop.js
+++ b/common/static/js/capa/drag_and_drop.js
@@ -1 +1,27 @@
-alert('drag-and-drop js is loaded')
\ No newline at end of file
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+//
+// See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
+(function (requirejs, require, define) {
+
+requirejs.config({
+    'baseUrl': '/static/js/capa/drag_and_drop/',
+
+    'paths': {
+
+    },
+
+    'shim': {
+
+    }
+});
+
+requirejs(['main'], function (Main) {
+    Main();
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/static/js/capa/drag_and_drop/main.js b/common/static/js/capa/drag_and_drop/main.js
new file mode 100644
index 0000000000..7ea7b103ad
--- /dev/null
+++ b/common/static/js/capa/drag_and_drop/main.js
@@ -0,0 +1,19 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+//
+// See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
+(function (requirejs, require, define) {
+
+define([], function () {
+    return Main;
+
+    function Main() {
+        alert('This is a drag-and-drop demo.');
+    }
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/lms/envs/common.py b/lms/envs/common.py
index b50fc25917..570d26ae2a 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -432,6 +432,8 @@ courseware_only_js += [
     in glob2.glob(PROJECT_ROOT / 'static/coffee/src/modules/**/*.coffee')
 ]
 
+# 'js/vendor/RequireJS.js' - Require JS wrapper.
+# See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
 main_vendor_js = [
   'js/vendor/RequireJS.js',
   'js/vendor/json2.js',

From 95060f39301f21242eebc835df569f33e57a7a2b Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Mon, 24 Dec 2012 14:39:52 +0200
Subject: [PATCH 412/541] updated python part to sync with new interface

---
 common/lib/capa/capa/inputtypes.py            | 60 ++++++++++++-------
 .../capa/templates/drag_and_drop_input.html   | 14 ++---
 2 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index ec00a64833..46c23fb3a0 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -45,6 +45,7 @@ import re
 import shlex  # for splitting quoted strings
 import sys
 import os
+import unidecode
 
 from registry import TagRegistry
 
@@ -798,29 +799,44 @@ class DragAndDropInput(InputTypeBase):
     template = 'drag_and_drop_input.html'
     tags = ['drag_and_drop_input']
 
-    @classmethod
-    def get_attributes(cls):
-        """
-        Note: height, width, images_directory_path are required.
-        """
-        # import ipdb; ipdb.set_trace()
-        return [Attribute('height'),
-                Attribute('width'),
-                Attribute('images_directory_path'),
-                ]
-
     def setup(self):
-        # import ipdb; ipdb.set_trace()
-        imagepath = self.loaded_attributes['images_directory_path']
-        # import ipdb; ipdb.set_trace()
-        try:
-            images_list = self.system.filestore.listdir(os.path.join('static',
-                                                    'images', imagepath))
-            images_list = ['/static/images/' + img for img in images_list]
-        except:
-            images_list = []
-        self.loaded_attributes['images_list'] = images_list
-        self.to_render.add('images_list')
+
+        def slugify(s):
+            """Makes slug from string"""
+            s = unidecode.unidecode(s).lower()
+            return re.sub(r'\W+', '-', s)
+
+        def parse(x):
+            """Parses <draggable/> xml element to dictionary.
+
+                Args:
+                    xml etree element <draggable...> with optional
+                    name or label or icon attributes. At least one
+                    attribute must be presented.
+
+                Returns:
+                    dict{'name': smth, 'label': smth, 'icon': smth}.
+            """
+            dic = dict()
+            for attr_name in ('name', 'label', 'icon'):
+                try:
+                    dic[attr_name] = Attribute(attr_name).parse_from_xml(x)
+                except ValueError:
+                    dic[attr_name] = None
+            dic['name'] = dic['name'] or slugify(dic['label'])
+            dic['label'] = dic['label'] or dic['name']
+
+            return dic
+
+        to_js = dict()
+        to_js['target'] = Attribute('img').parse_from_xml(self.xml)
+        to_js['draggable'] = [parse(draggable) for draggable in
+                                                    self.xml.getchildren()]
+
+        self.loaded_attributes['drag_and_drop_json'] = json.dumps(to_js)
+        self.to_render.add('drag_and_drop_json')
+        self.loaded_attributes['course_folder'] = self.system.course_id.split('/')[1]
+        self.to_render.add('course_folder')
 
 registry.register(DragAndDropInput)
 
diff --git a/common/lib/capa/capa/templates/drag_and_drop_input.html b/common/lib/capa/capa/templates/drag_and_drop_input.html
index 58fed37c84..f939dd58eb 100644
--- a/common/lib/capa/capa/templates/drag_and_drop_input.html
+++ b/common/lib/capa/capa/templates/drag_and_drop_input.html
@@ -1,16 +1,12 @@
 <section id="inputtype_${id}" class="capa_inputtype" >
     <div class="drag_and_drop_problem" id="drag_and_drop_div_${id}"
-    style="width:${width};height:${height}">
-        % if images_list:
-            <ul>
-                % for item in images_list:
-                    <li><image width="100" height="100" src="${item}"></image></li>
-                % endfor
-            </ul>
-        % endif
+     data-plain-id="${id}" data-course-folder="${course_folder}">
     </div>
 
-    <div class="script_placeholder" data-src="/static/js/raphael.js"></div>
+    <div class="drag_and_drop_problem" id="drag_and_drop_json_${id}"
+        style="display:none;">${drag_and_drop_json}</div>
+
+    <div class="script_placeholder" data-src="/static/js/capa/drag_and_drop.js"></div>
 
     % if status == 'unsubmitted':
         <div class="unanswered" id="status_${id}">

From 8d6904974679218c6ad626fd62829fe4097f7e63 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Mon, 24 Dec 2012 15:01:49 +0200
Subject: [PATCH 413/541] Client-side Drag and Drop: work in progress. Part 1.

---
 common/static/js/capa/drag_and_drop.js        | 14 +++----
 .../js/capa/drag_and_drop/config_parser.js    | 19 ++++++++++
 .../js/capa/drag_and_drop/draggables.js       | 19 ++++++++++
 common/static/js/capa/drag_and_drop/logme.js  | 35 +++++++++++++++++
 common/static/js/capa/drag_and_drop/main.js   | 38 ++++++++++++++++++-
 common/static/js/capa/drag_and_drop/state.js  | 21 ++++++++++
 common/static/js/capa/drag_and_drop/target.js | 19 ++++++++++
 7 files changed, 155 insertions(+), 10 deletions(-)
 create mode 100644 common/static/js/capa/drag_and_drop/config_parser.js
 create mode 100644 common/static/js/capa/drag_and_drop/draggables.js
 create mode 100644 common/static/js/capa/drag_and_drop/logme.js
 create mode 100644 common/static/js/capa/drag_and_drop/state.js
 create mode 100644 common/static/js/capa/drag_and_drop/target.js

diff --git a/common/static/js/capa/drag_and_drop.js b/common/static/js/capa/drag_and_drop.js
index a2d8b8d37b..ce6f4c4559 100644
--- a/common/static/js/capa/drag_and_drop.js
+++ b/common/static/js/capa/drag_and_drop.js
@@ -6,16 +6,14 @@
 
 requirejs.config({
     'baseUrl': '/static/js/capa/drag_and_drop/',
-
-    'paths': {
-
-    },
-
-    'shim': {
-
-    }
 });
 
+// The current JS file will be loaded and run each time. It will require a
+// single dependency which will be loaded and stored by RequireJS. On
+// subsequent runs, RequireJS will return the dependency from memory, rather
+// than loading it again from the server. For that reason, it is a good idea to
+// keep the current JS file as small as possible, and move everything else into
+// RequireJS module dependencies.
 requirejs(['main'], function (Main) {
     Main();
 });
diff --git a/common/static/js/capa/drag_and_drop/config_parser.js b/common/static/js/capa/drag_and_drop/config_parser.js
new file mode 100644
index 0000000000..ce120674f7
--- /dev/null
+++ b/common/static/js/capa/drag_and_drop/config_parser.js
@@ -0,0 +1,19 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+//
+// See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
+(function (requirejs, require, define) {
+
+define([], function () {
+    return configParser;
+
+    function configParser(config, state) {
+        state.config = 1;
+    }
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
new file mode 100644
index 0000000000..c291422fee
--- /dev/null
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -0,0 +1,19 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+//
+// See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
+(function (requirejs, require, define) {
+
+define([], function () {
+    return Draggables;
+
+    function Draggables(state) {
+        state.draggables = 1;
+    }
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/static/js/capa/drag_and_drop/logme.js b/common/static/js/capa/drag_and_drop/logme.js
new file mode 100644
index 0000000000..1ab2eebac6
--- /dev/null
+++ b/common/static/js/capa/drag_and_drop/logme.js
@@ -0,0 +1,35 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+//
+// See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
+(function (requirejs, require, define) {
+
+define([], function () {
+    var debugMode;
+
+    debugMode = true;
+
+    return logme;
+
+    function logme() {
+        if (
+            (debugMode !== true) ||
+            (typeof window.console === 'undefined')
+        ) {
+            return;
+        }
+
+        (function (i) {
+            while (i < arguments.length) {
+                window.console.log(arguments[i]);
+                i += 1;
+            }
+        }(0);
+    }
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/static/js/capa/drag_and_drop/main.js b/common/static/js/capa/drag_and_drop/main.js
index 7ea7b103ad..142e1041ce 100644
--- a/common/static/js/capa/drag_and_drop/main.js
+++ b/common/static/js/capa/drag_and_drop/main.js
@@ -4,11 +4,45 @@
 // See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
 (function (requirejs, require, define) {
 
-define([], function () {
+define(
+    ['logme', 'state', 'config_parser', 'target', 'draggables'],
+    function (logme, State, configParser, Target, raggables) {
     return Main;
 
     function Main() {
-        alert('This is a drag-and-drop demo.');
+        $('.drag_and_drop_problem').each(processProblem);
+    }
+
+    // $(value) - get the element of the entire problem
+    function processProblem(index, value) {
+        var problemId, config, state;
+
+        problemId = $(value).attr('data-plain-id');
+        if (typeof problemId !== 'string') {
+            logme('ERROR: Could not find a problem DOM element ID.');
+
+            return;
+        }
+
+        try {
+            config = JSON.parse($(value).html());
+        } catch (err) {
+            logme('ERROR: Could not parse the JSON configuration options.');
+            logme('Error message: "' + err.message + '".');
+
+            return;
+        }
+
+        state = State(problemId);
+
+        configParser(config, state);
+
+        // Container(state);
+        Target(state);
+        // Scroller(state);
+        Draggables(state);
+
+        logme(state);
     }
 });
 
diff --git a/common/static/js/capa/drag_and_drop/state.js b/common/static/js/capa/drag_and_drop/state.js
new file mode 100644
index 0000000000..7ebf89d023
--- /dev/null
+++ b/common/static/js/capa/drag_and_drop/state.js
@@ -0,0 +1,21 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+//
+// See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
+(function (requirejs, require, define) {
+
+define([], function () {
+    return State;
+
+    function State(problemId) {
+        return {
+            'problemId': problemId
+        };
+    }
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/static/js/capa/drag_and_drop/target.js b/common/static/js/capa/drag_and_drop/target.js
new file mode 100644
index 0000000000..eaf4ffa731
--- /dev/null
+++ b/common/static/js/capa/drag_and_drop/target.js
@@ -0,0 +1,19 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+//
+// See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
+(function (requirejs, require, define) {
+
+define([], function () {
+    return Target;
+
+    function Target(state) {
+        state.target = 1;
+    }
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)

From f65924773954c0bb905a5715262a2e196c8567bf Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Mon, 24 Dec 2012 16:24:25 +0200
Subject: [PATCH 414/541] Client-side Drag and Drop: work in progress. Part 2.

---
 common/lib/capa/capa/inputtypes.py            |  2 +-
 .../capa/templates/drag_and_drop_input.html   |  4 +-
 .../js/capa/drag_and_drop/config_parser.js    | 61 ++++++++++++++++++-
 .../static/js/capa/drag_and_drop/container.js | 19 ++++++
 common/static/js/capa/drag_and_drop/logme.js  | 13 ++--
 common/static/js/capa/drag_and_drop/main.js   | 25 +++++---
 6 files changed, 105 insertions(+), 19 deletions(-)
 create mode 100644 common/static/js/capa/drag_and_drop/container.js

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index 46c23fb3a0..654a212b60 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -822,7 +822,7 @@ class DragAndDropInput(InputTypeBase):
                 try:
                     dic[attr_name] = Attribute(attr_name).parse_from_xml(x)
                 except ValueError:
-                    dic[attr_name] = None
+                    dic[attr_name] = ""
             dic['name'] = dic['name'] or slugify(dic['label'])
             dic['label'] = dic['label'] or dic['name']
 
diff --git a/common/lib/capa/capa/templates/drag_and_drop_input.html b/common/lib/capa/capa/templates/drag_and_drop_input.html
index f939dd58eb..161ecd1af1 100644
--- a/common/lib/capa/capa/templates/drag_and_drop_input.html
+++ b/common/lib/capa/capa/templates/drag_and_drop_input.html
@@ -1,9 +1,9 @@
 <section id="inputtype_${id}" class="capa_inputtype" >
-    <div class="drag_and_drop_problem" id="drag_and_drop_div_${id}"
+    <div class="drag_and_drop_problem_div" id="drag_and_drop_div_${id}"
      data-plain-id="${id}" data-course-folder="${course_folder}">
     </div>
 
-    <div class="drag_and_drop_problem" id="drag_and_drop_json_${id}"
+    <div class="drag_and_drop_problem_json" id="drag_and_drop_json_${id}"
         style="display:none;">${drag_and_drop_json}</div>
 
     <div class="script_placeholder" data-src="/static/js/capa/drag_and_drop.js"></div>
diff --git a/common/static/js/capa/drag_and_drop/config_parser.js b/common/static/js/capa/drag_and_drop/config_parser.js
index ce120674f7..7c5e5ded73 100644
--- a/common/static/js/capa/drag_and_drop/config_parser.js
+++ b/common/static/js/capa/drag_and_drop/config_parser.js
@@ -4,11 +4,66 @@
 // See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
 (function (requirejs, require, define) {
 
-define([], function () {
+define(['logme'], function (logme) {
     return configParser;
 
-    function configParser(config, state) {
-        state.config = 1;
+    function configParser(config, imageDir, state) {
+        var returnStatus;
+
+        returnStatus = true;
+
+        state.config = {
+            'imageDir': '/static/' + imageDir + '/images/',
+            'draggable': [],
+            'target': ''
+        };
+
+        if ($.isArray(config.draggable) === true) {
+            (function (i) {
+                while (i < config.draggable.length) {
+                    if (processDraggable(config.draggable[i]) !== true) {
+                        returnStatus = false;
+                    }
+                    i += 1;
+                }
+            }(0));
+        } else if ($.isPlainObject(config.draggable) === true) {
+            if (processDraggable(config.draggable) !== true) {
+                returnStatus = false;
+            }
+        } else {
+            logme('ERROR: The type of config.draggable is no supported.');
+            returnStatus = false;
+        }
+
+        if (typeof config.target === 'string') {
+            state.config.target = config.target;
+        } else {
+            logme('ERROR: Property config.target is not of type "string".');
+            returnStatus = false;
+        }
+
+        return true;
+
+        function processDraggable(obj) {
+            if (typeof obj.icon !== 'string') {
+                logme('ERROR: Attribute "obj.icon" is not a string.');
+
+                return false;
+            } else if (typeof obj.label !== 'string') {
+                logme('ERROR: Attribute "obj.label" is not a string.');
+
+                return false;
+            } else if (typeof obj.name !== 'string') {
+                logme('ERROR: Attribute "obj.name" is not a string.');
+
+                return false;
+            }
+
+            state.config.draggable.push(obj);
+
+            true;
+        }
     }
 });
 
diff --git a/common/static/js/capa/drag_and_drop/container.js b/common/static/js/capa/drag_and_drop/container.js
new file mode 100644
index 0000000000..d9e7f51fc8
--- /dev/null
+++ b/common/static/js/capa/drag_and_drop/container.js
@@ -0,0 +1,19 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+//
+// See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
+(function (requirejs, require, define) {
+
+define(['logme'], function (logme) {
+    return Container;
+
+    function Container(state) {
+
+    }
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/static/js/capa/drag_and_drop/logme.js b/common/static/js/capa/drag_and_drop/logme.js
index 1ab2eebac6..21f73bf2a5 100644
--- a/common/static/js/capa/drag_and_drop/logme.js
+++ b/common/static/js/capa/drag_and_drop/logme.js
@@ -12,6 +12,8 @@ define([], function () {
     return logme;
 
     function logme() {
+        var i;
+
         if (
             (debugMode !== true) ||
             (typeof window.console === 'undefined')
@@ -19,12 +21,11 @@ define([], function () {
             return;
         }
 
-        (function (i) {
-            while (i < arguments.length) {
-                window.console.log(arguments[i]);
-                i += 1;
-            }
-        }(0);
+        i = 0;
+        while (i < arguments.length) {
+            window.console.log(arguments[i]);
+            i += 1;
+        }
     }
 });
 
diff --git a/common/static/js/capa/drag_and_drop/main.js b/common/static/js/capa/drag_and_drop/main.js
index 142e1041ce..2745374950 100644
--- a/common/static/js/capa/drag_and_drop/main.js
+++ b/common/static/js/capa/drag_and_drop/main.js
@@ -6,26 +6,33 @@
 
 define(
     ['logme', 'state', 'config_parser', 'target', 'draggables'],
-    function (logme, State, configParser, Target, raggables) {
+    function (logme, State, configParser, Target, Draggables) {
     return Main;
 
     function Main() {
-        $('.drag_and_drop_problem').each(processProblem);
+        $('.drag_and_drop_problem_div').each(processProblem);
     }
 
     // $(value) - get the element of the entire problem
     function processProblem(index, value) {
-        var problemId, config, state;
+        var problemId, imageDir, config, state;
 
         problemId = $(value).attr('data-plain-id');
         if (typeof problemId !== 'string') {
-            logme('ERROR: Could not find a problem DOM element ID.');
+            logme('ERROR: Could not find the ID of the problem DOM element.');
+
+            return;
+        }
+
+        imageDir = $(value).attr('data-plain-id');
+        if (typeof imageDir !== 'string') {
+            logme('ERROR: Could not find the name of the image directory.');
 
             return;
         }
 
         try {
-            config = JSON.parse($(value).html());
+            config = JSON.parse($('#drag_and_drop_json_' + problemId).html());
         } catch (err) {
             logme('ERROR: Could not parse the JSON configuration options.');
             logme('Error message: "' + err.message + '".');
@@ -35,9 +42,13 @@ define(
 
         state = State(problemId);
 
-        configParser(config, state);
+        if (configParser(config, imageDir, state) !== true) {
+            logme('ERROR: Could not make sense of the JSON configuration options.');
 
-        // Container(state);
+            return;
+        }
+
+        Container(state);
         Target(state);
         // Scroller(state);
         Draggables(state);

From 06fd823881ed807de567385f5eca10649295b428 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Tue, 25 Dec 2012 08:55:13 +0200
Subject: [PATCH 415/541] Client side drag and drop. Work in progress. Part 3.

---
 common/static/images/arrow-left.png           | Bin 0 -> 2467 bytes
 common/static/images/arrow-right.png          | Bin 0 -> 2457 bytes
 .../js/capa/drag_and_drop/config_parser.js    |   2 +-
 .../static/js/capa/drag_and_drop/container.js |  10 ++
 .../js/capa/drag_and_drop/draggables.js       |  35 ++++++-
 common/static/js/capa/drag_and_drop/main.js   |  16 ++-
 .../static/js/capa/drag_and_drop/scroller.js  |  99 ++++++++++++++++++
 common/static/js/capa/drag_and_drop/target.js |  43 +++++++-
 rakefile                                      |   2 +-
 9 files changed, 197 insertions(+), 10 deletions(-)
 create mode 100644 common/static/images/arrow-left.png
 create mode 100644 common/static/images/arrow-right.png
 create mode 100644 common/static/js/capa/drag_and_drop/scroller.js

diff --git a/common/static/images/arrow-left.png b/common/static/images/arrow-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..94ed6404aa15923eaf3fe722d56ec06dffd9efb2
GIT binary patch
literal 2467
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

literal 0
HcmV?d00001

diff --git a/common/static/images/arrow-right.png b/common/static/images/arrow-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..333796a5f345d1cc5df8a54a01b036bcbdfe5291
GIT binary patch
literal 2457
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
X;ZM1LG>q9a00000NkvXXu0mjfzEPn$

literal 0
HcmV?d00001

diff --git a/common/static/js/capa/drag_and_drop/config_parser.js b/common/static/js/capa/drag_and_drop/config_parser.js
index 7c5e5ded73..6b4c2939f5 100644
--- a/common/static/js/capa/drag_and_drop/config_parser.js
+++ b/common/static/js/capa/drag_and_drop/config_parser.js
@@ -13,7 +13,7 @@ define(['logme'], function (logme) {
         returnStatus = true;
 
         state.config = {
-            'imageDir': '/static/' + imageDir + '/images/',
+            'imageDir': '/static/' + imageDir + '/images',
             'draggable': [],
             'target': ''
         };
diff --git a/common/static/js/capa/drag_and_drop/container.js b/common/static/js/capa/drag_and_drop/container.js
index d9e7f51fc8..7fa922ba43 100644
--- a/common/static/js/capa/drag_and_drop/container.js
+++ b/common/static/js/capa/drag_and_drop/container.js
@@ -8,7 +8,17 @@ define(['logme'], function (logme) {
     return Container;
 
     function Container(state) {
+        state.containerEl = $(
+            '<div ' +
+                'style=" ' +
+                    'border: 1px solid black; ' +
+                    'overflow: hidden; ' +
+                    'clear: both; ' +
+                '" ' +
+            '></div>'
+        );
 
+        $('#inputtype_' + state.problemId).before(state.containerEl);
     }
 });
 
diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index c291422fee..daf9c0ee02 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -4,11 +4,42 @@
 // See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
 (function (requirejs, require, define) {
 
-define([], function () {
+define(['logme'], function (logme) {
     return Draggables;
 
     function Draggables(state) {
-        state.draggables = 1;
+        (function (i) {
+            while (i < state.config.draggable.length) {
+                processDraggable(state.config.draggable[i]);
+                i += 1;
+            }
+        }(0));
+
+        function processDraggable(obj) {
+            var draggableContainerEl;
+
+            logme(obj);
+
+            draggableContainerEl = $(
+                '<div ' +
+                    'style=" ' +
+                        'width: 100px; ' +
+                        'height: 100px; ' +
+                        'display: inline; ' +
+                        'float: left; ' +
+                    '" ' +
+                    '></div>'
+            );
+
+            if (obj.icon.length > 0) {
+                draggableContainerEl.append(
+                    $('<img src="' + state.config.imageDir + '/' + obj.icon + '" />')
+                );
+            }
+
+            draggableContainerEl.appendTo(state.sliderEl);
+        }
+
     }
 });
 
diff --git a/common/static/js/capa/drag_and_drop/main.js b/common/static/js/capa/drag_and_drop/main.js
index 2745374950..2d4fa07cd0 100644
--- a/common/static/js/capa/drag_and_drop/main.js
+++ b/common/static/js/capa/drag_and_drop/main.js
@@ -5,8 +5,8 @@
 (function (requirejs, require, define) {
 
 define(
-    ['logme', 'state', 'config_parser', 'target', 'draggables'],
-    function (logme, State, configParser, Target, Draggables) {
+    ['logme', 'state', 'config_parser', 'container', 'target', 'scroller', 'draggables'],
+    function (logme, State, configParser, Container, Target, Scroller, Draggables) {
     return Main;
 
     function Main() {
@@ -17,6 +17,14 @@ define(
     function processProblem(index, value) {
         var problemId, imageDir, config, state;
 
+        if ($(value).attr('data-problem-processed') === 'true') {
+            // This problem was already processed by us before, so we will
+            // skip it.
+
+            return;
+        }
+        $(value).attr('data-problem-processed', 'true');
+
         problemId = $(value).attr('data-plain-id');
         if (typeof problemId !== 'string') {
             logme('ERROR: Could not find the ID of the problem DOM element.');
@@ -24,7 +32,7 @@ define(
             return;
         }
 
-        imageDir = $(value).attr('data-plain-id');
+        imageDir = $(value).attr('data-course-folder');
         if (typeof imageDir !== 'string') {
             logme('ERROR: Could not find the name of the image directory.');
 
@@ -50,7 +58,7 @@ define(
 
         Container(state);
         Target(state);
-        // Scroller(state);
+        Scroller(state);
         Draggables(state);
 
         logme(state);
diff --git a/common/static/js/capa/drag_and_drop/scroller.js b/common/static/js/capa/drag_and_drop/scroller.js
new file mode 100644
index 0000000000..451d15907c
--- /dev/null
+++ b/common/static/js/capa/drag_and_drop/scroller.js
@@ -0,0 +1,99 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+//
+// See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
+(function (requirejs, require, define) {
+
+define(['logme'], function (logme) {
+    return Scroller;
+
+    function Scroller(state) {
+        var parentEl, moveLeftEl, showEl, moveRightEL,
+            moveRightEl_leftMargin;
+
+        parentEl = $(
+            '<div ' +
+                'style=" ' +
+                    'width: 95%; ' +
+                    'height: 100px; ' +
+                    'border: 1px solid black; ' +
+                    'margin-left: auto; ' +
+                    'margin-right: auto; ' +
+                '" ' +
+            '></div>'
+        );
+
+        moveLeftEl = $(
+            '<div ' +
+                'style=" ' +
+                    'width: 6%; ' +
+                    'height: 100px; ' +
+                    'display: inline; ' +
+                    'float: left; ' +
+                    'background: url(\'/static/images/arrow-left.png\') center center no-repeat; ' +
+                '" ' +
+            '></div>'
+        );
+        moveLeftEl.appendTo(parentEl);
+
+        moveLeftEl.click(function () {
+            state.showElLeftMargin -= 100;
+            state.sliderEl.animate({
+                'margin-left': state.showElLeftMargin + 'px'
+            });
+        });
+
+        showEl = $(
+            '<div ' +
+                'style=" ' +
+                    'width: 88%; ' +
+                    'height: 100px; ' +
+                    'overflow: hidden; ' +
+                    'display: inline; ' +
+                    'float: left; ' +
+                '" ' +
+            '></div>'
+        );
+        showEl.appendTo(parentEl);
+
+        state.showElLeftMargin = 0;
+
+        state.sliderEl = $(
+            '<div ' +
+                'style=" ' +
+                    'width: 800px; ' +
+                    'height: 100px; ' +
+                '" ' +
+            '></div>'
+        );
+        state.sliderEl.appendTo(showEl);
+
+        moveRightEl = $(
+            '<div ' +
+                'style=" ' +
+                    'width: 6%; ' +
+                    'height: 100px; ' +
+                    'display: inline; ' +
+                    'float: left; ' +
+                    'background: url(\'/static/images/arrow-right.png\') center center no-repeat; ' +
+                '" ' +
+            '></div>'
+        );
+        moveRightEl.appendTo(parentEl);
+
+        moveRightEl.click(function () {
+            state.showElLeftMargin += 100;
+            state.sliderEl.animate({
+                'margin-left': state.showElLeftMargin + 'px'
+            });
+        });
+
+        parentEl.appendTo(state.containerEl);
+    }
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/static/js/capa/drag_and_drop/target.js b/common/static/js/capa/drag_and_drop/target.js
index eaf4ffa731..486a6264e7 100644
--- a/common/static/js/capa/drag_and_drop/target.js
+++ b/common/static/js/capa/drag_and_drop/target.js
@@ -4,11 +4,50 @@
 // See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
 (function (requirejs, require, define) {
 
-define([], function () {
+define(['logme'], function (logme) {
     return Target;
 
     function Target(state) {
-        state.target = 1;
+        var targetImgSrc, targetElContainer, mouseMoveDiv;
+
+        targetImgSrc = state.config.imageDir + '/' + state.config.target;
+
+        targetElContainer = $(
+            '<div ' +
+                'style=" ' +
+                    'text-align: center; ' +
+                '" ' +
+            '></div>'
+        );
+
+        state.targetEl = $(
+            '<img ' +
+                'src="' + targetImgSrc + '" ' +
+            '/>'
+        );
+        state.targetEl.appendTo(targetElContainer);
+
+        state.targetEl.mousemove(
+            function (event) {
+                mouseMoveDiv.html(
+                    '[' + event.offsetX + ', ' + event.offsetY + ']'
+                );
+            }
+        );
+
+        mouseMoveDiv = $(
+            '<div ' +
+                'style=" ' +
+                    'clear: both; ' +
+                    'width: auto; ' +
+                    'height: 25px; ' +
+                    'text-align: center; ' +
+                '" ' +
+            '>[0, 0]</div>'
+        );
+        mouseMoveDiv.appendTo(targetElContainer);
+
+        targetElContainer.appendTo(state.containerEl);
     }
 });
 
diff --git a/rakefile b/rakefile
index 53d7381dd7..fa0293b900 100644
--- a/rakefile
+++ b/rakefile
@@ -53,7 +53,7 @@ default_options = {
 
 task :predjango do
     sh("find . -type f -name *.pyc -delete")
-    sh('pip install -q --upgrade --no-deps -r local-requirements.txt')
+    # sh('pip install -q --upgrade --no-deps -r local-requirements.txt')
 end
 
 task :clean_test_files do

From de954a41bec6ad64a7ee09d3839ac19fa9435178 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Tue, 25 Dec 2012 08:58:43 +0200
Subject: [PATCH 416/541] Changed back rakefile.

---
 rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rakefile b/rakefile
index fa0293b900..53d7381dd7 100644
--- a/rakefile
+++ b/rakefile
@@ -53,7 +53,7 @@ default_options = {
 
 task :predjango do
     sh("find . -type f -name *.pyc -delete")
-    # sh('pip install -q --upgrade --no-deps -r local-requirements.txt')
+    sh('pip install -q --upgrade --no-deps -r local-requirements.txt')
 end
 
 task :clean_test_files do

From 4594986b3846a78567042f9a4c87469308ab5163 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Tue, 25 Dec 2012 11:10:26 +0200
Subject: [PATCH 417/541] Client side drag and drop. Work in progress. Part 4.

---
 .../static/js/capa/drag_and_drop/container.js |   2 +-
 .../js/capa/drag_and_drop/draggables.js       | 107 +++++++++++++++++-
 .../static/js/capa/drag_and_drop/scroller.js  |   4 +-
 common/static/js/capa/drag_and_drop/target.js |   2 +
 4 files changed, 106 insertions(+), 9 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/container.js b/common/static/js/capa/drag_and_drop/container.js
index 7fa922ba43..9b04d01e4a 100644
--- a/common/static/js/capa/drag_and_drop/container.js
+++ b/common/static/js/capa/drag_and_drop/container.js
@@ -12,7 +12,7 @@ define(['logme'], function (logme) {
             '<div ' +
                 'style=" ' +
                     'border: 1px solid black; ' +
-                    'overflow: hidden; ' +
+                    // 'overflow: hidden; ' +
                     'clear: both; ' +
                 '" ' +
             '></div>'
diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index daf9c0ee02..c7108927c3 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -10,15 +10,14 @@ define(['logme'], function (logme) {
     function Draggables(state) {
         (function (i) {
             while (i < state.config.draggable.length) {
-                processDraggable(state.config.draggable[i]);
+                processDraggable(state.config.draggable[i], i + 1);
                 i += 1;
             }
         }(0));
 
-        function processDraggable(obj) {
-            var draggableContainerEl;
-
-            logme(obj);
+        function processDraggable(obj, index) {
+            var draggableContainerEl, imgEl, inContainer,
+                mouseDown;
 
             draggableContainerEl = $(
                 '<div ' +
@@ -27,17 +26,113 @@ define(['logme'], function (logme) {
                         'height: 100px; ' +
                         'display: inline; ' +
                         'float: left; ' +
+                        'overflow: hidden; ' +
                     '" ' +
+                    'data-draggable-position-index="' + index + '" ' +
                     '></div>'
             );
 
             if (obj.icon.length > 0) {
+                imgEl = $(
+                    '<img ' +
+                        'src="' + state.config.imageDir + '/' + obj.icon + '" ' +
+                    '/>'
+                );
+
+                draggableContainerEl.append(imgEl);
+            }
+
+            if (obj.label.length > 0) {
                 draggableContainerEl.append(
-                    $('<img src="' + state.config.imageDir + '/' + obj.icon + '" />')
+                    $('<div style="clear: both; text-align: center;">' + obj.label + '</div>')
                 );
             }
 
             draggableContainerEl.appendTo(state.sliderEl);
+
+            inContainer = true;
+            mouseDown = false;
+
+            draggableContainerEl.mousedown(function (event) {
+                if (mouseDown === false) {
+                    if (inContainer === true) {
+                        draggableContainerEl.detach();
+                        draggableContainerEl.css('position', 'absolute');
+                        draggableContainerEl.css('left', (event.pageX - 50));
+                        draggableContainerEl.css('top', (event.pageY - 50));
+                        draggableContainerEl.appendTo(state.containerEl);
+
+                        inContainer = false;
+                    }
+
+                    mouseDown = true;
+                    event.preventDefault();
+                }
+            });
+
+            draggableContainerEl.mouseup(function (event) {
+                if (mouseDown === true) {
+                    mouseDown = false;
+                    checkLandingElement(event);
+                    event.preventDefault();
+                }
+            });
+
+            draggableContainerEl.mousemove(function (event) {
+                if (mouseDown === true) {
+                    draggableContainerEl.css('left', (event.pageX - 50));
+                    draggableContainerEl.css('top', (event.pageY - 50));
+                    event.preventDefault();
+                }
+            });
+
+            draggableContainerEl.mouseleave(function (event) {
+                if (mouseDown === true) {
+                    mouseDown = false;
+                    checkLandingElement(event);
+                    event.preventDefault();
+                }
+            });
+
+            return;
+
+            function checkLandingElement(event) {
+                var offsetDE, children;
+
+                offsetDE = draggableContainerEl.offset();
+
+                if (
+                    (offsetDE.left < state.targetEl.offset().left) ||
+                    (offsetDE.left + 100 > state.targetEl.offset().left + state.targetEl.width()) ||
+                    (offsetDE.top < state.targetEl.offset().top) ||
+                    (offsetDE.top + 100 > state.targetEl.offset().top + state.targetEl.height())
+                ) {
+                    draggableContainerEl.detach();
+                    draggableContainerEl.css('position', 'static');
+
+                    children = state.sliderEl.children();
+
+                    if (children.length === 0) {
+                        draggableContainerEl.appendTo(state.sliderEl);
+                    } else {
+                        state.sliderEl.children().each(function (index, value) {
+                            if (inContainer === false) {
+                                if (parseInt($(value).attr('data-draggable-position-index'), 10) + 1 === parseInt(draggableContainerEl.attr('data-draggable-position-index'), 10)) {
+                                    $(value).after(draggableContainerEl);
+                                    inContainer = true;
+                                } else if (parseInt($(value).attr('data-draggable-position-index'), 10) - 1 === parseInt(draggableContainerEl.attr('data-draggable-position-index'), 10)) {
+                                    $(value).before(draggableContainerEl);
+                                    inContainer = true;
+                                }
+                            }
+                        });
+                    }
+
+                    if (inContainer === false) {
+                        draggableContainerEl.appendTo(state.sliderEl);
+                    }
+                }
+            }
         }
 
     }
diff --git a/common/static/js/capa/drag_and_drop/scroller.js b/common/static/js/capa/drag_and_drop/scroller.js
index 451d15907c..d6d945e329 100644
--- a/common/static/js/capa/drag_and_drop/scroller.js
+++ b/common/static/js/capa/drag_and_drop/scroller.js
@@ -37,7 +37,7 @@ define(['logme'], function (logme) {
         moveLeftEl.appendTo(parentEl);
 
         moveLeftEl.click(function () {
-            state.showElLeftMargin -= 100;
+            state.showElLeftMargin += 100;
             state.sliderEl.animate({
                 'margin-left': state.showElLeftMargin + 'px'
             });
@@ -82,7 +82,7 @@ define(['logme'], function (logme) {
         moveRightEl.appendTo(parentEl);
 
         moveRightEl.click(function () {
-            state.showElLeftMargin += 100;
+            state.showElLeftMargin -= 100;
             state.sliderEl.animate({
                 'margin-left': state.showElLeftMargin + 'px'
             });
diff --git a/common/static/js/capa/drag_and_drop/target.js b/common/static/js/capa/drag_and_drop/target.js
index 486a6264e7..b3396ad466 100644
--- a/common/static/js/capa/drag_and_drop/target.js
+++ b/common/static/js/capa/drag_and_drop/target.js
@@ -48,6 +48,8 @@ define(['logme'], function (logme) {
         mouseMoveDiv.appendTo(targetElContainer);
 
         targetElContainer.appendTo(state.containerEl);
+
+        state.targetElOffset = state.targetEl.offset();
     }
 });
 

From 57bec4083ebc5e144762f23138d256710fa557db Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Tue, 25 Dec 2012 12:21:03 +0200
Subject: [PATCH 418/541] updated inpyttype to new req

---
 common/lib/capa/capa/inputtypes.py | 59 ++++++++++++++++++++----------
 1 file changed, 39 insertions(+), 20 deletions(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index 654a212b60..958cf229e9 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -801,37 +801,56 @@ class DragAndDropInput(InputTypeBase):
 
     def setup(self):
 
-        def slugify(s):
-            """Makes slug from string"""
-            s = unidecode.unidecode(s).lower()
-            return re.sub(r'\W+', '-', s)
-
-        def parse(x):
-            """Parses <draggable/> xml element to dictionary.
+        def parse(tag, tag_type):
+            """Parses <tag ... /> xml element to dictionary.
 
                 Args:
-                    xml etree element <draggable...> with optional
-                    name or label or icon attributes. At least one
-                    attribute must be presented.
+                    tag: xml etree element <tag...> with attributes
+
+                    tag_type: type of tag: 'draggable' or 'target'.
+
+                    If tag_type is 'draggable' : all attributes (name or label or
+                    icon) are optional, but at least one attribute must be
+                    presented.
+
+                    If tag_type is 'target' all attributes (name, x, y, w, h)
+                    are requred. (x, y) - coordinates of center of target,
+                    w, h - weight and height of target.
 
                 Returns:
+                    Dictionary of vaues of attributes:
                     dict{'name': smth, 'label': smth, 'icon': smth}.
             """
+            tag_attrs = dict()
+            tag_attrs['draggable'] = {'id': Attribute._sentinel,
+                                      'label': "", 'icon': ""}
+            tag_attrs['target'] = {'id': Attribute._sentinel,
+                                    'x': Attribute._sentinel,
+                                    'y': Attribute._sentinel,
+                                    'w': Attribute._sentinel,
+                                    'h': Attribute._sentinel}
+
             dic = dict()
-            for attr_name in ('name', 'label', 'icon'):
-                try:
-                    dic[attr_name] = Attribute(attr_name).parse_from_xml(x)
-                except ValueError:
-                    dic[attr_name] = ""
-            dic['name'] = dic['name'] or slugify(dic['label'])
-            dic['label'] = dic['label'] or dic['name']
+
+            for attr_name in tag_attrs[tag_type].keys():
+                dic[attr_name] = Attribute(attr_name,
+                    default=tag_attrs[tag_type][attr_name]).parse_from_xml(tag)
+
+            if tag_type == 'draggable':
+                dic['label'] = dic['label'] or dic['id']
 
             return dic
 
         to_js = dict()
-        to_js['target'] = Attribute('img').parse_from_xml(self.xml)
-        to_js['draggable'] = [parse(draggable) for draggable in
-                                                    self.xml.getchildren()]
+        to_js['target_container'] = Attribute('img').parse_from_xml(self.xml)
+        to_js['target_outline'] = Attribute('target_outline',
+                                        default="False").parse_from_xml(self.xml)
+        to_js['one_per_garget'] = Attribute('one_per_target',
+                                        default="True").parse_from_xml(self.xml)
+        to_js['draggable'] = [parse(draggable, 'draggable') for draggable in
+                                                self.xml.iterchildren('draggable')]
+        to_js['targets'] = [parse(target, 'target') for target in
+                                                self.xml.iterchildren('target')]
 
         self.loaded_attributes['drag_and_drop_json'] = json.dumps(to_js)
         self.to_render.add('drag_and_drop_json')

From b1a73a529323eb7daa2277f01cefebcf09c01419 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Tue, 25 Dec 2012 12:51:56 +0200
Subject: [PATCH 419/541] Client side drag and drop. Work in progress. Part 5.

---
 .../js/capa/drag_and_drop/draggables.js       | 119 +++++++++++-------
 common/static/js/capa/drag_and_drop/main.js   |   3 +-
 2 files changed, 77 insertions(+), 45 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index c7108927c3..747ddefc54 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -8,6 +8,10 @@ define(['logme'], function (logme) {
     return Draggables;
 
     function Draggables(state) {
+        var _draggables;
+
+        _draggables = [];
+
         (function (i) {
             while (i < state.config.draggable.length) {
                 processDraggable(state.config.draggable[i], i + 1);
@@ -15,9 +19,10 @@ define(['logme'], function (logme) {
             }
         }(0));
 
+        return;
+
         function processDraggable(obj, index) {
-            var draggableContainerEl, imgEl, inContainer,
-                mouseDown;
+            var draggableContainerEl, imgEl, inContainer, ousePressed;
 
             draggableContainerEl = $(
                 '<div ' +
@@ -27,6 +32,7 @@ define(['logme'], function (logme) {
                         'display: inline; ' +
                         'float: left; ' +
                         'overflow: hidden; ' +
+                        'z-index: ' + index + '; ' +
                     '" ' +
                     'data-draggable-position-index="' + index + '" ' +
                     '></div>'
@@ -49,89 +55,114 @@ define(['logme'], function (logme) {
             }
 
             draggableContainerEl.appendTo(state.sliderEl);
+            _draggables.push(draggableContainerEl);
 
             inContainer = true;
-            mouseDown = false;
+            mousePressed = false;
 
-            draggableContainerEl.mousedown(function (event) {
-                if (mouseDown === false) {
+            draggableContainerEl.mousedown(mouseDown);
+            draggableContainerEl.mouseup(mouseUp);
+            draggableContainerEl.mousemove(mouseMove);
+            draggableContainerEl.mouseleave(mouseLeave);
+
+            return;
+
+            function mouseDown(event) {
+                if (mousePressed === false) {
                     if (inContainer === true) {
                         draggableContainerEl.detach();
                         draggableContainerEl.css('position', 'absolute');
-                        draggableContainerEl.css('left', (event.pageX - 50));
-                        draggableContainerEl.css('top', (event.pageY - 50));
+                        draggableContainerEl.css('left', event.pageX - 50);
+                        draggableContainerEl.css('top', event.pageY - 50);
                         draggableContainerEl.appendTo(state.containerEl);
 
                         inContainer = false;
                     }
 
-                    mouseDown = true;
+                    draggableContainerEl.attr('data-old-z-index', draggableContainerEl.css('z-index'));
+                    draggableContainerEl.css('z-index', '1000');
+
+                    mousePressed = true;
                     event.preventDefault();
                 }
-            });
+            }
 
-            draggableContainerEl.mouseup(function (event) {
-                if (mouseDown === true) {
-                    mouseDown = false;
+            function mouseUp(event) {
+                if (mousePressed === true) {
                     checkLandingElement(event);
-                    event.preventDefault();
                 }
-            });
+            }
 
-            draggableContainerEl.mousemove(function (event) {
-                if (mouseDown === true) {
+            function mouseMove(event) {
+                if (mousePressed === true) {
                     draggableContainerEl.css('left', (event.pageX - 50));
                     draggableContainerEl.css('top', (event.pageY - 50));
                     event.preventDefault();
                 }
-            });
+            }
 
-            draggableContainerEl.mouseleave(function (event) {
-                if (mouseDown === true) {
-                    mouseDown = false;
+            function mouseLeave(event) {
+                if (mousePressed === true) {
                     checkLandingElement(event);
-                    event.preventDefault();
                 }
-            });
-
-            return;
+            }
 
             function checkLandingElement(event) {
-                var offsetDE, children;
+                var offsetDE, offsetTE, indexes, DEindex;
+
+                mousePressed = false;
 
                 offsetDE = draggableContainerEl.offset();
+                offsetTE = state.targetEl.offset();
 
                 if (
-                    (offsetDE.left < state.targetEl.offset().left) ||
-                    (offsetDE.left + 100 > state.targetEl.offset().left + state.targetEl.width()) ||
-                    (offsetDE.top < state.targetEl.offset().top) ||
-                    (offsetDE.top + 100 > state.targetEl.offset().top + state.targetEl.height())
+                    (offsetDE.left < offsetTE.left) ||
+                    (offsetDE.left + 100 > offsetTE.left + state.targetEl.width()) ||
+                    (offsetDE.top < offsetTE.top) ||
+                    (offsetDE.top + 100 > offsetTE.top + state.targetEl.height())
                 ) {
                     draggableContainerEl.detach();
                     draggableContainerEl.css('position', 'static');
 
-                    children = state.sliderEl.children();
+                    indexes = [];
+                    DEindex = parseInt(draggableContainerEl.attr('data-draggable-position-index'), 10);
 
-                    if (children.length === 0) {
-                        draggableContainerEl.appendTo(state.sliderEl);
-                    } else {
-                        state.sliderEl.children().each(function (index, value) {
-                            if (inContainer === false) {
-                                if (parseInt($(value).attr('data-draggable-position-index'), 10) + 1 === parseInt(draggableContainerEl.attr('data-draggable-position-index'), 10)) {
-                                    $(value).after(draggableContainerEl);
-                                    inContainer = true;
-                                } else if (parseInt($(value).attr('data-draggable-position-index'), 10) - 1 === parseInt(draggableContainerEl.attr('data-draggable-position-index'), 10)) {
-                                    $(value).before(draggableContainerEl);
-                                    inContainer = true;
-                                }
-                            }
+                    state.sliderEl.children().each(function (index, value) {
+                        indexes.push({
+                            'index': parseInt($(value).attr('data-draggable-position-index'), 10),
+                            'el': $(value)
                         });
-                    }
+                    });
+
+                    (function (c1) {
+                        while (c1 < indexes.length) {
+                            if ((inContainer === false) && (indexes[c1].index > DEindex)) {
+                                indexes[c1].el.before(draggableContainerEl);
+                                inContainer = true;
+                            }
+
+                            c1 += 1;
+                        }
+                    }(0));
 
                     if (inContainer === false) {
                         draggableContainerEl.appendTo(state.sliderEl);
+                        inContainer = true;
                     }
                 }
+
+                (function (c1) {
+                    while (c1 < _draggables.length) {
+                        if (draggableContainerEl.attr('data-old-z-index') < _draggables[c1].css('z-index')) {
+                            _draggables[c1].css('z-index', _draggables[c1].css('z-index') - 1);
+                        }
+                        c1 += 1;
+                    }
+
+                    draggableContainerEl.css('z-index', c1);
+                }(0));
+
+                event.preventDefault();
             }
         }
 
diff --git a/common/static/js/capa/drag_and_drop/main.js b/common/static/js/capa/drag_and_drop/main.js
index 2d4fa07cd0..f2349f6006 100644
--- a/common/static/js/capa/drag_and_drop/main.js
+++ b/common/static/js/capa/drag_and_drop/main.js
@@ -61,7 +61,8 @@ define(
         Scroller(state);
         Draggables(state);
 
-        logme(state);
+        logme('config', config);
+        logme('state', state);
     }
 });
 

From f0850f4c4bbb54a6b4b21ea29ad0f6e2d66a1263 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Tue, 25 Dec 2012 13:02:08 +0200
Subject: [PATCH 420/541] Updated JS to use latest JSON def.

---
 common/static/js/capa/drag_and_drop/config_parser.js | 8 ++++----
 common/static/js/capa/drag_and_drop/target.js        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/config_parser.js b/common/static/js/capa/drag_and_drop/config_parser.js
index 6b4c2939f5..501808bd53 100644
--- a/common/static/js/capa/drag_and_drop/config_parser.js
+++ b/common/static/js/capa/drag_and_drop/config_parser.js
@@ -36,8 +36,8 @@ define(['logme'], function (logme) {
             returnStatus = false;
         }
 
-        if (typeof config.target === 'string') {
-            state.config.target = config.target;
+        if (typeof config.target_container === 'string') {
+            state.config.target_container = config.target_container;
         } else {
             logme('ERROR: Property config.target is not of type "string".');
             returnStatus = false;
@@ -54,8 +54,8 @@ define(['logme'], function (logme) {
                 logme('ERROR: Attribute "obj.label" is not a string.');
 
                 return false;
-            } else if (typeof obj.name !== 'string') {
-                logme('ERROR: Attribute "obj.name" is not a string.');
+            } else if (typeof obj.id !== 'string') {
+                logme('ERROR: Attribute "obj.id" is not a string.');
 
                 return false;
             }
diff --git a/common/static/js/capa/drag_and_drop/target.js b/common/static/js/capa/drag_and_drop/target.js
index b3396ad466..b1358a992f 100644
--- a/common/static/js/capa/drag_and_drop/target.js
+++ b/common/static/js/capa/drag_and_drop/target.js
@@ -10,7 +10,7 @@ define(['logme'], function (logme) {
     function Target(state) {
         var targetImgSrc, targetElContainer, mouseMoveDiv;
 
-        targetImgSrc = state.config.imageDir + '/' + state.config.target;
+        targetImgSrc = state.config.imageDir + '/' + state.config.target_container;
 
         targetElContainer = $(
             '<div ' +

From 06f1c54fa722cc8245cd24bd450cd37e08928a04 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Tue, 25 Dec 2012 13:26:34 +0200
Subject: [PATCH 421/541] Fix. Now the z index stack is consistent.

---
 common/static/js/capa/drag_and_drop/draggables.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index 747ddefc54..0eaf918748 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -153,8 +153,8 @@ define(['logme'], function (logme) {
 
                 (function (c1) {
                     while (c1 < _draggables.length) {
-                        if (draggableContainerEl.attr('data-old-z-index') < _draggables[c1].css('z-index')) {
-                            _draggables[c1].css('z-index', _draggables[c1].css('z-index') - 1);
+                        if (parseInt(draggableContainerEl.attr('data-old-z-index'), 10) < parseInt(_draggables[c1].css('z-index'), 10)) {
+                            _draggables[c1].css('z-index', parseInt(_draggables[c1].css('z-index'), 10) - 1);
                         }
                         c1 += 1;
                     }

From e842415194d13f30562e0add2d3893ace26d9f41 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Tue, 25 Dec 2012 16:06:08 +0200
Subject: [PATCH 422/541] Added ability to define targets on the target
 container. Work in progress. Part 6.

---
 common/lib/capa/capa/inputtypes.py            |   2 +-
 .../js/capa/drag_and_drop/config_parser.js    | 107 +++++++++++++++---
 common/static/js/capa/drag_and_drop/main.js   |   7 +-
 .../{target.js => target_container.js}        |  18 ++-
 .../static/js/capa/drag_and_drop/targets.js   |  57 ++++++++++
 5 files changed, 169 insertions(+), 22 deletions(-)
 rename common/static/js/capa/drag_and_drop/{target.js => target_container.js} (79%)
 create mode 100644 common/static/js/capa/drag_and_drop/targets.js

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index 958cf229e9..c240b8b237 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -845,7 +845,7 @@ class DragAndDropInput(InputTypeBase):
         to_js['target_container'] = Attribute('img').parse_from_xml(self.xml)
         to_js['target_outline'] = Attribute('target_outline',
                                         default="False").parse_from_xml(self.xml)
-        to_js['one_per_garget'] = Attribute('one_per_target',
+        to_js['one_per_target'] = Attribute('one_per_target',
                                         default="True").parse_from_xml(self.xml)
         to_js['draggable'] = [parse(draggable, 'draggable') for draggable in
                                                 self.xml.iterchildren('draggable')]
diff --git a/common/static/js/capa/drag_and_drop/config_parser.js b/common/static/js/capa/drag_and_drop/config_parser.js
index 501808bd53..8718ba7f23 100644
--- a/common/static/js/capa/drag_and_drop/config_parser.js
+++ b/common/static/js/capa/drag_and_drop/config_parser.js
@@ -15,7 +15,8 @@ define(['logme'], function (logme) {
         state.config = {
             'imageDir': '/static/' + imageDir + '/images',
             'draggable': [],
-            'target': ''
+            'targets': [],
+            'target_container': ''
         };
 
         if ($.isArray(config.draggable) === true) {
@@ -39,31 +40,109 @@ define(['logme'], function (logme) {
         if (typeof config.target_container === 'string') {
             state.config.target_container = config.target_container;
         } else {
-            logme('ERROR: Property config.target is not of type "string".');
+            logme('ERROR: Property config.target_container is not of type "string".');
+            returnStatus = false;
+        }
+
+        if ($.isArray(config.targets) === true) {
+            (function (i) {
+                while (i < config.targets.length) {
+                    if (processTarget(config.targets[i]) !== true) {
+                        returnStatus = false;
+                    }
+                    i += 1;
+                }
+            }(0));
+        } else if ($.isPlainObject(config.targets) === true) {
+            if (processTarget(config.targets) !== true) {
+                returnStatus = false;
+            }
+        } else if (typeof config.targets !== 'undefined') {
+            logme('ERROR: Property config.targets is not of a supported type.');
+            returnStatus = false;
+        }
+
+        if (typeof config.one_per_target === 'string') {
+            if (config.one_per_target.toLowerCase() === 'true') {
+                state.config.one_per_target = true;
+            } else if (config.one_per_target.toLowerCase() === 'false') {
+                state.config.one_per_target = false;
+            } else {
+                logme('ERROR: Property config.one_per_target can either be "true", or "false".');
+                returnStatus = false;
+            }
+        } else if (typeof config.one_per_target !== 'undefined') {
+            logme('ERROR: Property config.one_per_target is not of a supported type.');
+            returnStatus = false;
+        }
+
+        if (typeof config.target_outline === 'string') {
+            if (config.target_outline.toLowerCase() === 'true') {
+                state.config.target_outline = true;
+            } else if (config.target_outline.toLowerCase() === 'false') {
+                state.config.target_outline = false;
+            } else {
+                logme('ERROR: Property config.target_outline can either be "true", or "false".');
+                returnStatus = false;
+            }
+        } else if (typeof config.target_outline !== 'undefined') {
+            logme('ERROR: Property config.target_outline is not of a supported type.');
             returnStatus = false;
         }
 
         return true;
 
         function processDraggable(obj) {
-            if (typeof obj.icon !== 'string') {
-                logme('ERROR: Attribute "obj.icon" is not a string.');
+            if (!attrIsString(obj, 'id')) { return false; }
 
-                return false;
-            } else if (typeof obj.label !== 'string') {
-                logme('ERROR: Attribute "obj.label" is not a string.');
-
-                return false;
-            } else if (typeof obj.id !== 'string') {
-                logme('ERROR: Attribute "obj.id" is not a string.');
-
-                return false;
-            }
+            if (!attrIsString(obj, 'icon')) { return false; }
+            if (!attrIsString(obj, 'label')) { return false; }
 
             state.config.draggable.push(obj);
 
             true;
         }
+
+        function processTarget(obj) {
+            if (!attrIsString(obj, 'id')) { return false; }
+
+            if (!attrIsInteger(obj, 'w')) { return false; }
+            if (!attrIsInteger(obj, 'h')) { return false; }
+
+            if (!attrIsInteger(obj, 'x')) { return false; }
+            if (!attrIsInteger(obj, 'y')) { return false; }
+
+            state.config.targets.push(obj);
+
+            true;
+
+        }
+
+        function attrIsString(obj, attr) {
+            if (typeof obj[attr] !== 'string') {
+                logme('ERROR: Attribute "obj.' + attr + '" is not a string.');
+
+                return false;
+            }
+
+            return true;
+        }
+
+        function attrIsInteger(obj, attr) {
+            var tempInt;
+
+            tempInt = parseInt(obj[attr], 10);
+
+            if (isFinite(tempInt) === false) {
+                logme('ERROR: Attribute "obj.' + attr + '" is not an integer.');
+
+                return false;
+            }
+
+            obj[attr] = tempInt;
+
+            return true;
+        }
     }
 });
 
diff --git a/common/static/js/capa/drag_and_drop/main.js b/common/static/js/capa/drag_and_drop/main.js
index f2349f6006..103a149c6a 100644
--- a/common/static/js/capa/drag_and_drop/main.js
+++ b/common/static/js/capa/drag_and_drop/main.js
@@ -5,8 +5,8 @@
 (function (requirejs, require, define) {
 
 define(
-    ['logme', 'state', 'config_parser', 'container', 'target', 'scroller', 'draggables'],
-    function (logme, State, configParser, Container, Target, Scroller, Draggables) {
+    ['logme', 'state', 'config_parser', 'container', 'target_container', 'scroller', 'draggables', 'targets'],
+    function (logme, State, configParser, Container, TargetContainer, Scroller, Draggables, Targets) {
     return Main;
 
     function Main() {
@@ -57,9 +57,10 @@ define(
         }
 
         Container(state);
-        Target(state);
+        TargetContainer(state);
         Scroller(state);
         Draggables(state);
+        Targets(state);
 
         logme('config', config);
         logme('state', state);
diff --git a/common/static/js/capa/drag_and_drop/target.js b/common/static/js/capa/drag_and_drop/target_container.js
similarity index 79%
rename from common/static/js/capa/drag_and_drop/target.js
rename to common/static/js/capa/drag_and_drop/target_container.js
index b1358a992f..62562b5039 100644
--- a/common/static/js/capa/drag_and_drop/target.js
+++ b/common/static/js/capa/drag_and_drop/target_container.js
@@ -5,9 +5,9 @@
 (function (requirejs, require, define) {
 
 define(['logme'], function (logme) {
-    return Target;
+    return TargetContainer;
 
-    function Target(state) {
+    function TargetContainer(state) {
         var targetImgSrc, targetElContainer, mouseMoveDiv;
 
         targetImgSrc = state.config.imageDir + '/' + state.config.target_container;
@@ -15,6 +15,7 @@ define(['logme'], function (logme) {
         targetElContainer = $(
             '<div ' +
                 'style=" ' +
+                    'position: relative; ' +
                     'text-align: center; ' +
                 '" ' +
             '></div>'
@@ -27,6 +28,17 @@ define(['logme'], function (logme) {
         );
         state.targetEl.appendTo(targetElContainer);
 
+        state.targetEl_loaded = false;
+
+        $("<img/>") // Make in memory copy of image to avoid css issues.
+            .attr("src", state.targetEl.attr("src"))
+            .load(function() {
+                state.targetEl_height = this.height;
+                state.targetEl_width = this.width;
+
+                state.targetEl_loaded = true;
+            });
+
         state.targetEl.mousemove(
             function (event) {
                 mouseMoveDiv.html(
@@ -48,8 +60,6 @@ define(['logme'], function (logme) {
         mouseMoveDiv.appendTo(targetElContainer);
 
         targetElContainer.appendTo(state.containerEl);
-
-        state.targetElOffset = state.targetEl.offset();
     }
 });
 
diff --git a/common/static/js/capa/drag_and_drop/targets.js b/common/static/js/capa/drag_and_drop/targets.js
new file mode 100644
index 0000000000..b41123cc69
--- /dev/null
+++ b/common/static/js/capa/drag_and_drop/targets.js
@@ -0,0 +1,57 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+//
+// See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
+(function (requirejs, require, define) {
+
+define(['logme'], function (logme) {
+    return Targets;
+
+    function Targets(state) {
+        (function (c1) {
+            while (c1 < state.config.targets.length) {
+                processTarget(state.config.targets[c1]);
+                c1 += 1;
+            }
+        }(0));
+
+        return;
+
+        function processTarget(obj) {
+            var targetElOffset, tEl, left, top;
+
+            if (state.targetEl_loaded === false) {
+                window.setTimeout(function () {
+                    processTarget(obj);
+                }, 50);
+                return;
+            }
+
+            left = obj.x + 0.5 * (state.targetEl.parent().width() - state.targetEl_width);
+            top = obj.y
+
+            tEl = $(
+                '<div ' +
+                    'style=" ' +
+                        'display: block; ' +
+                        'position: absolute; ' +
+                        'width: ' + obj.w + 'px; ' +
+                        'height: ' + obj.h + 'px; ' +
+                        'top: ' + top + 'px; ' +
+                        'left: ' + left + 'px; ' +
+                        'border: 1px solid black; ' +
+                    '" ' +
+                    'data-target-id="' + obj.id + '" ' +
+                '></div>'
+            );
+
+            tEl.appendTo(state.targetEl.parent());
+        }
+    }
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)

From c34fbbe19fe314dc73b87806ec125853db208ce7 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Wed, 26 Dec 2012 07:52:28 +0200
Subject: [PATCH 423/541] Added support for individual targets. Work in
 progress. Part 7.

---
 .../js/capa/drag_and_drop/draggables.js       | 173 ++++++++++++++----
 .../static/js/capa/drag_and_drop/scroller.js  |  13 +-
 .../js/capa/drag_and_drop/target_container.js |  14 +-
 .../static/js/capa/drag_and_drop/targets.js   |  34 +++-
 4 files changed, 175 insertions(+), 59 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index 0eaf918748..17c68ae22d 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -22,7 +22,8 @@ define(['logme'], function (logme) {
         return;
 
         function processDraggable(obj, index) {
-            var draggableContainerEl, imgEl, inContainer, ousePressed;
+            var draggableContainerEl, imgEl, inContainer, ousePressed,
+                onTarget;
 
             draggableContainerEl = $(
                 '<div ' +
@@ -60,6 +61,8 @@ define(['logme'], function (logme) {
             inContainer = true;
             mousePressed = false;
 
+            onTarget = null;
+
             draggableContainerEl.mousedown(mouseDown);
             draggableContainerEl.mouseup(mouseUp);
             draggableContainerEl.mousemove(mouseMove);
@@ -87,40 +90,149 @@ define(['logme'], function (logme) {
                 }
             }
 
-            function mouseUp(event) {
+            function mouseUp() {
                 if (mousePressed === true) {
-                    checkLandingElement(event);
+                    checkLandingElement();
                 }
             }
 
-            function mouseMove(event) {
+            function mouseMove() {
                 if (mousePressed === true) {
                     draggableContainerEl.css('left', (event.pageX - 50));
                     draggableContainerEl.css('top', (event.pageY - 50));
-                    event.preventDefault();
                 }
             }
 
-            function mouseLeave(event) {
+            function mouseLeave() {
                 if (mousePressed === true) {
-                    checkLandingElement(event);
+                    checkLandingElement();
                 }
             }
 
-            function checkLandingElement(event) {
-                var offsetDE, offsetTE, indexes, DEindex;
+            function checkLandingElement() {
+                var offsetDE, offsetTE, indexes, DEindex, targetFound;
 
                 mousePressed = false;
 
                 offsetDE = draggableContainerEl.offset();
-                offsetTE = state.targetEl.offset();
 
-                if (
-                    (offsetDE.left < offsetTE.left) ||
-                    (offsetDE.left + 100 > offsetTE.left + state.targetEl.width()) ||
-                    (offsetDE.top < offsetTE.top) ||
-                    (offsetDE.top + 100 > offsetTE.top + state.targetEl.height())
-                ) {
+                if (state.individualTargets === false) {
+                    offsetTE = state.targetEl.offset();
+
+                    if (
+                        (offsetDE.left < offsetTE.left) ||
+                        (offsetDE.left + 100 > offsetTE.left + state.targetEl.width()) ||
+                        (offsetDE.top < offsetTE.top) ||
+                        (offsetDE.top + 100 > offsetTE.top + state.targetEl.height())
+                    ) {
+                        moveBackToSlider();
+                    } else {
+                        correctZIndexes();
+                    }
+                } else if (state.individualTargets === true) {
+                    targetFound = false;
+
+                    checkIfOnTarget();
+
+                    if (targetFound === true) {
+                        correctZIndexes();
+                    } else {
+                        moveBackToSlider();
+                        removeObjIdFromTarget();
+                    }
+                }
+
+                return;
+
+                function removeObjIdFromTarget() {
+                    var c1;
+
+                    if (onTarget !== null) {
+                        c1 = 0;
+
+                        while (c1 < onTarget.draggable.length) {
+                            if (onTarget.draggable[c1] === obj.id) {
+                                onTarget.draggable.splice(c1, 1);
+
+                                break;
+                            }
+                            c1 += 1;
+                        }
+
+                        onTarget = null;
+                    }
+                }
+
+                function checkIfOnTarget() {
+                    var c1, c2, target;
+
+                    c1 = 0;
+
+                    while (c1 < state.targets.length) {
+                        target = state.targets[c1];
+
+                        if (offsetDE.top + 50 < target.offset.top) {
+                            c1 += 1;
+                            continue;
+                        }
+                        if (offsetDE.top + 50 > target.offset.top + target.h) {
+                            c1 += 1;
+                            continue;
+                        }
+                        if (offsetDE.left + 50 < target.offset.left) {
+                            c1 += 1;
+                            continue;
+                        }
+                        if (offsetDE.left + 50 > target.offset.left + target.w) {
+                            c1 += 1;
+                            continue;
+                        }
+
+                        if (state.config.one_per_target === true) {
+                            if (
+                                (target.draggable.length === 1) &&
+                                (target.draggable[0] !== obj.id)
+                            ) {
+                                c1 += 1;
+                                continue;
+                            }
+                        }
+
+                        targetFound = true;
+
+                        removeObjIdFromTarget();
+                        onTarget = target;
+
+                        target.draggable.push(obj.id);
+                        snapToTarget(target);
+
+                        break;
+                    }
+                }
+
+                function snapToTarget(target) {
+                    draggableContainerEl.css('left', (target.offset.left + 0.5 * target.w - 50));
+                    draggableContainerEl.css('top', (target.offset.top + 0.5 * target.h - 50));
+                }
+
+                function correctZIndexes() {
+                    var c1;
+
+                    c1 = 0;
+
+                    while (c1 < _draggables.length) {
+                        if (parseInt(draggableContainerEl.attr('data-old-z-index'), 10) < parseInt(_draggables[c1].css('z-index'), 10)) {
+                            _draggables[c1].css('z-index', parseInt(_draggables[c1].css('z-index'), 10) - 1);
+                        }
+                        c1 += 1;
+                    }
+
+                    draggableContainerEl.css('z-index', c1);
+                }
+
+                function moveBackToSlider() {
+                    var c1;
+
                     draggableContainerEl.detach();
                     draggableContainerEl.css('position', 'static');
 
@@ -134,35 +246,22 @@ define(['logme'], function (logme) {
                         });
                     });
 
-                    (function (c1) {
-                        while (c1 < indexes.length) {
-                            if ((inContainer === false) && (indexes[c1].index > DEindex)) {
-                                indexes[c1].el.before(draggableContainerEl);
-                                inContainer = true;
-                            }
+                    c1 = 0;
 
-                            c1 += 1;
+                    while (c1 < indexes.length) {
+                        if ((inContainer === false) && (indexes[c1].index > DEindex)) {
+                            indexes[c1].el.before(draggableContainerEl);
+                            inContainer = true;
                         }
-                    }(0));
+
+                        c1 += 1;
+                    }
 
                     if (inContainer === false) {
                         draggableContainerEl.appendTo(state.sliderEl);
                         inContainer = true;
                     }
                 }
-
-                (function (c1) {
-                    while (c1 < _draggables.length) {
-                        if (parseInt(draggableContainerEl.attr('data-old-z-index'), 10) < parseInt(_draggables[c1].css('z-index'), 10)) {
-                            _draggables[c1].css('z-index', parseInt(_draggables[c1].css('z-index'), 10) - 1);
-                        }
-                        c1 += 1;
-                    }
-
-                    draggableContainerEl.css('z-index', c1);
-                }(0));
-
-                event.preventDefault();
             }
         }
 
diff --git a/common/static/js/capa/drag_and_drop/scroller.js b/common/static/js/capa/drag_and_drop/scroller.js
index d6d945e329..4048b50c94 100644
--- a/common/static/js/capa/drag_and_drop/scroller.js
+++ b/common/static/js/capa/drag_and_drop/scroller.js
@@ -8,8 +8,7 @@ define(['logme'], function (logme) {
     return Scroller;
 
     function Scroller(state) {
-        var parentEl, moveLeftEl, showEl, moveRightEL,
-            moveRightEl_leftMargin;
+        var parentEl, moveLeftEl, showEl, moveRightEL, showElLeftMargin;
 
         parentEl = $(
             '<div ' +
@@ -37,9 +36,9 @@ define(['logme'], function (logme) {
         moveLeftEl.appendTo(parentEl);
 
         moveLeftEl.click(function () {
-            state.showElLeftMargin += 100;
+            showElLeftMargin += 100;
             state.sliderEl.animate({
-                'margin-left': state.showElLeftMargin + 'px'
+                'margin-left': showElLeftMargin + 'px'
             });
         });
 
@@ -56,7 +55,7 @@ define(['logme'], function (logme) {
         );
         showEl.appendTo(parentEl);
 
-        state.showElLeftMargin = 0;
+        showElLeftMargin = 0;
 
         state.sliderEl = $(
             '<div ' +
@@ -82,9 +81,9 @@ define(['logme'], function (logme) {
         moveRightEl.appendTo(parentEl);
 
         moveRightEl.click(function () {
-            state.showElLeftMargin -= 100;
+            showElLeftMargin -= 100;
             state.sliderEl.animate({
-                'margin-left': state.showElLeftMargin + 'px'
+                'margin-left': showElLeftMargin + 'px'
             });
         });
 
diff --git a/common/static/js/capa/drag_and_drop/target_container.js b/common/static/js/capa/drag_and_drop/target_container.js
index 62562b5039..013ca42e19 100644
--- a/common/static/js/capa/drag_and_drop/target_container.js
+++ b/common/static/js/capa/drag_and_drop/target_container.js
@@ -28,15 +28,11 @@ define(['logme'], function (logme) {
         );
         state.targetEl.appendTo(targetElContainer);
 
-        state.targetEl_loaded = false;
-
-        $("<img/>") // Make in memory copy of image to avoid css issues.
-            .attr("src", state.targetEl.attr("src"))
-            .load(function() {
-                state.targetEl_height = this.height;
-                state.targetEl_width = this.width;
-
-                state.targetEl_loaded = true;
+        state.targetElWidth = null;
+        $('<img/>') // Make in memory copy of image to avoid css issues.
+            .attr('src', state.targetEl.attr('src'))
+            .load(function () {
+                state.targetElWidth = this.width;
             });
 
         state.targetEl.mousemove(
diff --git a/common/static/js/capa/drag_and_drop/targets.js b/common/static/js/capa/drag_and_drop/targets.js
index b41123cc69..44431becba 100644
--- a/common/static/js/capa/drag_and_drop/targets.js
+++ b/common/static/js/capa/drag_and_drop/targets.js
@@ -8,6 +8,15 @@ define(['logme'], function (logme) {
     return Targets;
 
     function Targets(state) {
+        if (state.config.targets.length === 0) {
+            state.individualTargets = false;
+
+            return;
+        }
+
+        state.individualTargets = true;
+        state.targets = [];
+
         (function (c1) {
             while (c1 < state.config.targets.length) {
                 processTarget(state.config.targets[c1]);
@@ -18,17 +27,21 @@ define(['logme'], function (logme) {
         return;
 
         function processTarget(obj) {
-            var targetElOffset, tEl, left, top;
+            var targetElOffset, tEl, left, borderCss;
 
-            if (state.targetEl_loaded === false) {
+            if (state.targetElWidth === null) {
                 window.setTimeout(function () {
                     processTarget(obj);
                 }, 50);
                 return;
             }
 
-            left = obj.x + 0.5 * (state.targetEl.parent().width() - state.targetEl_width);
-            top = obj.y
+            left = obj.x + 0.5 * (state.targetEl.parent().width() - state.targetElWidth);
+
+            borderCss = '';
+            if (state.config.target_outline === true) {
+                borderCss = 'border: 1px solid black; ';
+            }
 
             tEl = $(
                 '<div ' +
@@ -37,15 +50,24 @@ define(['logme'], function (logme) {
                         'position: absolute; ' +
                         'width: ' + obj.w + 'px; ' +
                         'height: ' + obj.h + 'px; ' +
-                        'top: ' + top + 'px; ' +
+                        'top: ' + obj.y + 'px; ' +
                         'left: ' + left + 'px; ' +
-                        'border: 1px solid black; ' +
+                        borderCss +
                     '" ' +
                     'data-target-id="' + obj.id + '" ' +
                 '></div>'
             );
 
             tEl.appendTo(state.targetEl.parent());
+
+            state.targets.push({
+                'id': obj.id,
+                'offset': tEl.offset(),
+                'w': obj.w,
+                'h': obj.h,
+                'el': tEl,
+                'draggable': []
+            });
         }
     }
 });

From 30488537490812feee7d9062675edc8a8c3ca083 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Wed, 26 Dec 2012 09:45:15 +0200
Subject: [PATCH 424/541] Added ability to communicate with server via input
 element. Work in progress. Part 8.

---
 .../js/capa/drag_and_drop/config_parser.js    |  6 +++
 .../js/capa/drag_and_drop/draggables.js       | 24 +++++++++-
 .../static/js/capa/drag_and_drop/targets.js   | 13 ++---
 .../js/capa/drag_and_drop/update_input.js     | 47 +++++++++++++++++++
 4 files changed, 80 insertions(+), 10 deletions(-)
 create mode 100644 common/static/js/capa/drag_and_drop/update_input.js

diff --git a/common/static/js/capa/drag_and_drop/config_parser.js b/common/static/js/capa/drag_and_drop/config_parser.js
index 8718ba7f23..fd38081de1 100644
--- a/common/static/js/capa/drag_and_drop/config_parser.js
+++ b/common/static/js/capa/drag_and_drop/config_parser.js
@@ -90,6 +90,12 @@ define(['logme'], function (logme) {
             returnStatus = false;
         }
 
+        if (state.config.targets.length === 0) {
+            state.individualTargets = false;
+        } else {
+            state.individualTargets = true;
+        }
+
         return true;
 
         function processDraggable(obj) {
diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index 17c68ae22d..f31b4dcdfb 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -4,13 +4,14 @@
 // See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
 (function (requirejs, require, define) {
 
-define(['logme'], function (logme) {
+define(['logme', 'update_input'], function (logme, updateInput) {
     return Draggables;
 
     function Draggables(state) {
         var _draggables;
 
         _draggables = [];
+        state.draggables = [];
 
         (function (i) {
             while (i < state.config.draggable.length) {
@@ -23,7 +24,7 @@ define(['logme'], function (logme) {
 
         function processDraggable(obj, index) {
             var draggableContainerEl, imgEl, inContainer, ousePressed,
-                onTarget;
+                onTarget, draggableObj;
 
             draggableContainerEl = $(
                 '<div ' +
@@ -63,11 +64,22 @@ define(['logme'], function (logme) {
 
             onTarget = null;
 
+            draggableObj = {
+                'id': obj.id,
+                'x': -1,
+                'y': -1
+            };
+            state.draggables.push(draggableObj);
+
             draggableContainerEl.mousedown(mouseDown);
             draggableContainerEl.mouseup(mouseUp);
             draggableContainerEl.mousemove(mouseMove);
             draggableContainerEl.mouseleave(mouseLeave);
 
+            if (state.individualTargets === false) {
+                updateInput(state);
+            }
+
             return;
 
             function mouseDown(event) {
@@ -126,8 +138,14 @@ define(['logme'], function (logme) {
                         (offsetDE.top + 100 > offsetTE.top + state.targetEl.height())
                     ) {
                         moveBackToSlider();
+
+                        draggableObj.x = -1;
+                        draggableObj.y = -1;
                     } else {
                         correctZIndexes();
+
+                        draggableObj.x = offsetDE.left + 50 - offsetTE.left;
+                        draggableObj.y = offsetDE.top + 50 - offsetTE.top;
                     }
                 } else if (state.individualTargets === true) {
                     targetFound = false;
@@ -142,6 +160,8 @@ define(['logme'], function (logme) {
                     }
                 }
 
+                updateInput(state);
+
                 return;
 
                 function removeObjIdFromTarget() {
diff --git a/common/static/js/capa/drag_and_drop/targets.js b/common/static/js/capa/drag_and_drop/targets.js
index 44431becba..18c07f6620 100644
--- a/common/static/js/capa/drag_and_drop/targets.js
+++ b/common/static/js/capa/drag_and_drop/targets.js
@@ -4,17 +4,10 @@
 // See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
 (function (requirejs, require, define) {
 
-define(['logme'], function (logme) {
+define(['logme', 'update_input'], function (logme, updateInput) {
     return Targets;
 
     function Targets(state) {
-        if (state.config.targets.length === 0) {
-            state.individualTargets = false;
-
-            return;
-        }
-
-        state.individualTargets = true;
         state.targets = [];
 
         (function (c1) {
@@ -68,6 +61,10 @@ define(['logme'], function (logme) {
                 'el': tEl,
                 'draggable': []
             });
+
+            if (state.individualTargets === true) {
+                updateInput(state);
+            }
         }
     }
 });
diff --git a/common/static/js/capa/drag_and_drop/update_input.js b/common/static/js/capa/drag_and_drop/update_input.js
new file mode 100644
index 0000000000..225834c36c
--- /dev/null
+++ b/common/static/js/capa/drag_and_drop/update_input.js
@@ -0,0 +1,47 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+//
+// See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
+(function (requirejs, require, define) {
+
+define(['logme'], function (logme) {
+    return updateInput;
+
+    function updateInput(state) {
+        var inputEl, stateStr, targets;
+
+        if (state.individualTargets === false) {
+            stateStr = JSON.stringify({
+                'individualTargets': false,
+                'draggables': state.draggables
+            });
+        } else {
+            targets = [];
+            (function (c1) {
+                while (c1 < state.targets.length) {
+                    targets.push({
+                        'id': state.targets[c1].id,
+                        'draggables': state.targets[c1].draggable
+                    });
+
+                    c1 += 1;
+                }
+            }(0));
+
+            stateStr = JSON.stringify({
+                'individualTargets': true,
+                'targets': targets
+            });
+        }
+
+        inputEl = $('#input_' + state.problemId);
+        inputEl.val(stateStr);
+    }
+
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)

From 545b1bea24800f6f00e1f42a70a83cb21e9590c2 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Wed, 26 Dec 2012 14:46:34 +0200
Subject: [PATCH 425/541] Slight changes to UI design.

---
 common/static/images/arrow-left.png           | Bin 2467 -> 1062 bytes
 common/static/images/arrow-right.png          | Bin 2457 -> 1079 bytes
 .../static/js/capa/drag_and_drop/container.js |   2 -
 .../js/capa/drag_and_drop/draggables.js       |   1 +
 .../static/js/capa/drag_and_drop/scroller.js  | 110 +++++++++++++++---
 .../static/js/capa/drag_and_drop/targets.js   |   2 +-
 6 files changed, 95 insertions(+), 20 deletions(-)

diff --git a/common/static/images/arrow-left.png b/common/static/images/arrow-left.png
index 94ed6404aa15923eaf3fe722d56ec06dffd9efb2..33277d6af446ff0efd14fdba9b22216d99fc02c8 100644
GIT binary patch
literal 1062
zcmaJ=%}*0S6yE|tf)uJ41!Ks#c#wqdN57y;D`K~mCN9C!Xpe4pr*uR2gWbU{T%Zz@
ziisBqnrMt%@L*!Nm=HY>6%+jfjK+90dN67<G2y1Or3DYx&1C1z%lrM_d-HyCZG7yk
zyY*-*K@jfbD4)Xne#dTU#{c<W%R_kUM)3@q&~vCLnvfWg^(+KQRh)z=D9W?buVI8B
z8c!(c49W=SI7wG2(TSmK)xc<ihz#3?C`~~GvT#z-qU86dn<P-=D0wj`FoF?-d1Z9Y
zgcEaPX=!ds3d`j1DG;$aOrSy}0$VL;7H3Dv3NMFk$4!%<5`w0p<W5l;VI0JC6M`V+
z_eu=Qf>4NJ1Hn*;?FT-F_0bGoAuk)?f+5Z~0IDB}vzc;^OYw<nE_{lTd4vp(ri;ZQ
zRrFK3IZ3nOaM<DS`Mfy7Yt3p%w7r_uTVvp%C7FtW6kP)jqnOoaP?W@#?zEs9yR@2B
zy(WBNv@IGmOEFGMwLn4mf2gYNMq4Na_v-y8v6Y@RAf1AiK4VIFaJgP5mBGbKC?efV
z>w2Mfi{p76=~iAhKx`reP70!=XpW<=f)E5QsaZ(WB$(u*B<7$LMdn8Mfk4pDGJGr$
zVA(hu4h#gt{%|0WNcjBmP^^aKb!kS08meLCJuF)n>xe-$aAqEw%4H}gOkD+)ra7f<
zElj*FUll9Yt%XU{#nQMK+8OO%qprEIejIaGxcIOueW+o*n^@TMpWO}kQQS`QBWe46
zc6ntb2M%VK1FNI$<y)>F?BU4LU}>YJ{BX6<Tv+NZ4K|dA?yo&}J;}zvx5n(g!i8ra
z`kS|`(smnlmAM%#ZF@Y|JwN+ief)B|(6KdCKHt{xcHv!Td2wO8{rF2}y{G)Rw9!-^
z?o72cY%XjZDZeS%J)Yk$9&|O|Yn=9Z?kr?Gj=A_Xx52xbx`<E0p~buFH@-SAHyIz}
JADy{$<qvQ}P`3a8

literal 2467
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

diff --git a/common/static/images/arrow-right.png b/common/static/images/arrow-right.png
index 333796a5f345d1cc5df8a54a01b036bcbdfe5291..b54f8566de1f90db9872940a9e345040be5f204f 100644
GIT binary patch
literal 1079
zcmaJ=T}TvB6dqH=OhY8-kLof;RJ1!Y`!hPDo2xs!xzy;gF6dM2?95e%ZRSoh*LGCM
z>_IjNF%a<~=tYPKdI*Z3umXc3q+WvPB~YlI3LgT&m+oxt)<fHHnS1WxeBU|ep6}jB
z^`C2QJk&^0RCBUVN|Sw$XE)T7|Mbs=PO=@u@nJlOMsPu~A=RUy90W;28HH)6XcL#;
zz%GiaJ+5bl@vwYBRFUCVycoZ0SOiT`UEQvwsCkG%4vy+(g#PjLISq6zLJx&yR<>er
zOz)et;oxL{MxD&7f<||r1zoO42n>i7;2M`qM|2}}iB}}H=VoY73c>jZ{ky1PIR#?K
zh9K+@`c#(V0MGlmP?+brGa$fn0fr@u_i-UH%!`3`u=CL*o2`wAX(_Rji<~0#7{->!
zFoi<FUkLh<J<4!`Ab1>sfR9A@oCy;vuFrJZ$_x^8R9m;Oj!fV&DmgTcBQ&Y>cMFD9
zp*5YIYa$oMxQfMae%5QL94O2G4>gQRw1d;|Prd&nb}|zdWYW+<<F-l$H`3;%vc#AT
z6^!f*LYK<7m>NSEIb+BIu|Xc3loeGsJ;$jMLYBp(>0rfFVN#0Fgu}1vnka>P+e18?
zka`mm$Hh4z)E*XsLMW6-1cGrsR>n$59XFtf%UG>~<=CoNPYi}dGE30buRtwfBLkG0
z7WL}2NLBfEuv*nx*mzYeLyBR%(f&2+vWw`)Gb_R+hl=!}N%U?LVZY0ppUI=Rmy~)k
z?x)<s;^O0MHrw$sT9^H@u`yM*{9$G*)H1z#cWHO=;7mtr5mA@JEzbI2Q!R-5Qu3`-
z%sM?=BY=zbtJ~K;&d=u#Sk!tj+O@y<D!S|Di}zatQuJ9(uJZ)F?>m*70xNR^n@7Oj
zUAY0UGW&Mz&dig#;-eWi^001C>-Mo0hFU)auFkEUURqb9w`*6wZVE@2I~t2a6!$V!
a)4)>S&L0N%r<z`SPdORymmc(Hum1w3%vovx

literal 2457
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
X;ZM1LG>q9a00000NkvXXu0mjfzEPn$

diff --git a/common/static/js/capa/drag_and_drop/container.js b/common/static/js/capa/drag_and_drop/container.js
index 9b04d01e4a..766a020802 100644
--- a/common/static/js/capa/drag_and_drop/container.js
+++ b/common/static/js/capa/drag_and_drop/container.js
@@ -11,8 +11,6 @@ define(['logme'], function (logme) {
         state.containerEl = $(
             '<div ' +
                 'style=" ' +
-                    'border: 1px solid black; ' +
-                    // 'overflow: hidden; ' +
                     'clear: both; ' +
                 '" ' +
             '></div>'
diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index f31b4dcdfb..cb48cb3480 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -35,6 +35,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         'float: left; ' +
                         'overflow: hidden; ' +
                         'z-index: ' + index + '; ' +
+                        'border: 1px solid gray; ' +
                     '" ' +
                     'data-draggable-position-index="' + index + '" ' +
                     '></div>'
diff --git a/common/static/js/capa/drag_and_drop/scroller.js b/common/static/js/capa/drag_and_drop/scroller.js
index 4048b50c94..41109abcbc 100644
--- a/common/static/js/capa/drag_and_drop/scroller.js
+++ b/common/static/js/capa/drag_and_drop/scroller.js
@@ -13,9 +13,8 @@ define(['logme'], function (logme) {
         parentEl = $(
             '<div ' +
                 'style=" ' +
-                    'width: 95%; ' +
-                    'height: 100px; ' +
-                    'border: 1px solid black; ' +
+                    'width: 100%; ' +
+                    'height: 102px; ' +
                     'margin-left: auto; ' +
                     'margin-right: auto; ' +
                 '" ' +
@@ -26,27 +25,74 @@ define(['logme'], function (logme) {
             '<div ' +
                 'style=" ' +
                     'width: 6%; ' +
-                    'height: 100px; ' +
+                    'height: 102px; ' +
                     'display: inline; ' +
                     'float: left; ' +
-                    'background: url(\'/static/images/arrow-left.png\') center center no-repeat; ' +
                 '" ' +
-            '></div>'
+            '>' +
+                '<div ' +
+                    'style=" ' +
+                        'width: 80%; ' +
+                        'height: 50px; '+
+                        'margin-left: auto; ' +
+                        'margin-right: auto; ' +
+                        'margin-top: 26px; ' +
+
+                        'border: 1px solid #CCC; ' +
+                        'background-color: #EEE; ' +
+                        'background-image: -webkit-linear-gradient(top, #EEE, #DDD); ' +
+                        'background-image: -moz-linear-gradient(top, #EEE, #DDD); ' +
+                        'background-image: -ms-linear-gradient(top, #EEE, #DDD); ' +
+                        'background-image: -o-linear-gradient(top, #EEE, #DDD); ' +
+                        'background-image: linear-gradient(top, #EEE, #DDD); ' +
+                        '-webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.7) inset; ' +
+                        'box-shadow: 0 1px 0 rgba(255, 255, 255, 0.7) inset; ' +
+
+                        'background-image: url(\'/static/images/arrow-left.png\'); ' +
+                        'background-position: center center; ' +
+                        'background-repeat: no-repeat; ' +
+
+                        'border-radius: 35px 0 0 35px; ' +
+                    '" ' +
+                '></div>' +
+            '</div>'
         );
         moveLeftEl.appendTo(parentEl);
 
+/*
+position: absolute;
+margin-bottom: 0;
+height: 44px;
+width: 70px;
+border: 1px solid #CCC;
+background-color: #EEE;
+background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #EEE), color-stop(100%, #DDD));
+background-image: -webkit-linear-gradient(top, #EEE, #DDD);
+background-image: -moz-linear-gradient(top, #EEE, #DDD);
+background-image: -ms-linear-gradient(top, #EEE, #DDD);
+background-image: -o-linear-gradient(top, #EEE, #DDD);
+background-image: linear-gradient(top, #EEE, #DDD);
+-webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.7) inset;
+-moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.7) inset;
+box-shadow: 0 1px 0 rgba(255, 255, 255, 0.7) inset;
+*/
+
         moveLeftEl.click(function () {
-            showElLeftMargin += 100;
+            if (showElLeftMargin > -102) {
+                return;
+            }
+
+            showElLeftMargin += 102;
             state.sliderEl.animate({
                 'margin-left': showElLeftMargin + 'px'
-            });
+            }, 100);
         });
 
         showEl = $(
             '<div ' +
                 'style=" ' +
-                    'width: 88%; ' +
-                    'height: 100px; ' +
+                    'width: 714px; ' +
+                    'height: 102px; ' +
                     'overflow: hidden; ' +
                     'display: inline; ' +
                     'float: left; ' +
@@ -60,8 +106,8 @@ define(['logme'], function (logme) {
         state.sliderEl = $(
             '<div ' +
                 'style=" ' +
-                    'width: 800px; ' +
-                    'height: 100px; ' +
+                    'width: 20000px; ' +
+                    'height: 102px; ' +
                 '" ' +
             '></div>'
         );
@@ -71,20 +117,50 @@ define(['logme'], function (logme) {
             '<div ' +
                 'style=" ' +
                     'width: 6%; ' +
-                    'height: 100px; ' +
+                    'height: 102px; ' +
                     'display: inline; ' +
                     'float: left; ' +
-                    'background: url(\'/static/images/arrow-right.png\') center center no-repeat; ' +
+                    // 'background: url(\'/static/images/arrow-right.png\') center center no-repeat; ' +
                 '" ' +
-            '></div>'
+            '>' +
+                '<div ' +
+                    'style=" ' +
+                        'width: 80%; ' +
+                        'height: 50px; '+
+                        'margin-left: auto; ' +
+                        'margin-right: auto; ' +
+                        'margin-top: 26px; ' +
+
+                        'border: 1px solid #CCC; ' +
+                        'background-color: #EEE; ' +
+                        'background-image: -webkit-linear-gradient(top, #EEE, #DDD); ' +
+                        'background-image: -moz-linear-gradient(top, #EEE, #DDD); ' +
+                        'background-image: -ms-linear-gradient(top, #EEE, #DDD); ' +
+                        'background-image: -o-linear-gradient(top, #EEE, #DDD); ' +
+                        'background-image: linear-gradient(top, #EEE, #DDD); ' +
+                        '-webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.7) inset; ' +
+                        'box-shadow: 0 1px 0 rgba(255, 255, 255, 0.7) inset; ' +
+
+                        'background-image: url(\'/static/images/arrow-right.png\'); ' +
+                        'background-position: center center; ' +
+                        'background-repeat: no-repeat; ' +
+
+                        'border-radius: 0 35px 35px 0; ' +
+                    '" ' +
+                '></div>' +
+            '</div>'
         );
         moveRightEl.appendTo(parentEl);
 
         moveRightEl.click(function () {
-            showElLeftMargin -= 100;
+            if (showElLeftMargin < -102 * (state.sliderEl.children().length - 8)) {
+                return;
+            }
+
+            showElLeftMargin -= 102;
             state.sliderEl.animate({
                 'margin-left': showElLeftMargin + 'px'
-            });
+            }, 100);
         });
 
         parentEl.appendTo(state.containerEl);
diff --git a/common/static/js/capa/drag_and_drop/targets.js b/common/static/js/capa/drag_and_drop/targets.js
index 18c07f6620..eddc51f440 100644
--- a/common/static/js/capa/drag_and_drop/targets.js
+++ b/common/static/js/capa/drag_and_drop/targets.js
@@ -33,7 +33,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
             borderCss = '';
             if (state.config.target_outline === true) {
-                borderCss = 'border: 1px solid black; ';
+                borderCss = 'border: 1px dashed gray; ';
             }
 
             tEl = $(

From c5d4f54aa2ef053780d60346830472bf7a4dac56 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Wed, 26 Dec 2012 14:52:22 +0200
Subject: [PATCH 426/541] Slight changes to UI design. Part 2.

---
 .../js/capa/drag_and_drop/draggables.js       | 10 ++++++++--
 .../static/js/capa/drag_and_drop/scroller.js  | 19 -------------------
 .../js/capa/drag_and_drop/target_container.js | 16 ++++++++--------
 3 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index cb48cb3480..8aafb200b2 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -24,7 +24,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
         function processDraggable(obj, index) {
             var draggableContainerEl, imgEl, inContainer, ousePressed,
-                onTarget, draggableObj;
+                onTarget, draggableObj, marginCss;
 
             draggableContainerEl = $(
                 '<div ' +
@@ -52,8 +52,14 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             }
 
             if (obj.label.length > 0) {
+                marginCss = '';
+
+                if (obj.icon.length === 0) {
+                    marginCss = 'margin-top: 38px;';
+                }
+
                 draggableContainerEl.append(
-                    $('<div style="clear: both; text-align: center;">' + obj.label + '</div>')
+                    $('<div style="clear: both; text-align: center; ' + marginCss + ' ">' + obj.label + '</div>')
                 );
             }
 
diff --git a/common/static/js/capa/drag_and_drop/scroller.js b/common/static/js/capa/drag_and_drop/scroller.js
index 41109abcbc..fc11740611 100644
--- a/common/static/js/capa/drag_and_drop/scroller.js
+++ b/common/static/js/capa/drag_and_drop/scroller.js
@@ -59,24 +59,6 @@ define(['logme'], function (logme) {
         );
         moveLeftEl.appendTo(parentEl);
 
-/*
-position: absolute;
-margin-bottom: 0;
-height: 44px;
-width: 70px;
-border: 1px solid #CCC;
-background-color: #EEE;
-background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #EEE), color-stop(100%, #DDD));
-background-image: -webkit-linear-gradient(top, #EEE, #DDD);
-background-image: -moz-linear-gradient(top, #EEE, #DDD);
-background-image: -ms-linear-gradient(top, #EEE, #DDD);
-background-image: -o-linear-gradient(top, #EEE, #DDD);
-background-image: linear-gradient(top, #EEE, #DDD);
--webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.7) inset;
--moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.7) inset;
-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.7) inset;
-*/
-
         moveLeftEl.click(function () {
             if (showElLeftMargin > -102) {
                 return;
@@ -120,7 +102,6 @@ box-shadow: 0 1px 0 rgba(255, 255, 255, 0.7) inset;
                     'height: 102px; ' +
                     'display: inline; ' +
                     'float: left; ' +
-                    // 'background: url(\'/static/images/arrow-right.png\') center center no-repeat; ' +
                 '" ' +
             '>' +
                 '<div ' +
diff --git a/common/static/js/capa/drag_and_drop/target_container.js b/common/static/js/capa/drag_and_drop/target_container.js
index 013ca42e19..b3294a2574 100644
--- a/common/static/js/capa/drag_and_drop/target_container.js
+++ b/common/static/js/capa/drag_and_drop/target_container.js
@@ -35,13 +35,13 @@ define(['logme'], function (logme) {
                 state.targetElWidth = this.width;
             });
 
-        state.targetEl.mousemove(
-            function (event) {
-                mouseMoveDiv.html(
-                    '[' + event.offsetX + ', ' + event.offsetY + ']'
-                );
-            }
-        );
+        // state.targetEl.mousemove(
+        //     function (event) {
+        //         mouseMoveDiv.html(
+        //             '[' + event.offsetX + ', ' + event.offsetY + ']'
+        //         );
+        //     }
+        // );
 
         mouseMoveDiv = $(
             '<div ' +
@@ -51,7 +51,7 @@ define(['logme'], function (logme) {
                     'height: 25px; ' +
                     'text-align: center; ' +
                 '" ' +
-            '>[0, 0]</div>'
+            '></div>'
         );
         mouseMoveDiv.appendTo(targetElContainer);
 

From 9efe1c0a4b5d5fa2a72b9c1d69db973d739997fa Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 26 Dec 2012 15:33:58 +0200
Subject: [PATCH 427/541] added parameters and rename

---
 common/lib/capa/capa/inputtypes.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index c240b8b237..147251329b 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -824,6 +824,7 @@ class DragAndDropInput(InputTypeBase):
             tag_attrs = dict()
             tag_attrs['draggable'] = {'id': Attribute._sentinel,
                                       'label': "", 'icon': ""}
+
             tag_attrs['target'] = {'id': Attribute._sentinel,
                                     'x': Attribute._sentinel,
                                     'y': Attribute._sentinel,
@@ -842,13 +843,24 @@ class DragAndDropInput(InputTypeBase):
             return dic
 
         to_js = dict()
-        to_js['target_container'] = Attribute('img').parse_from_xml(self.xml)
+
+        # image drag and drop onto
+        to_js['base_image'] = Attribute('img').parse_from_xml(self.xml)
+
+        # problem subtype: targets or positions
+        to_js['use_targets'] = Attribute('targets',
+                                        default="True").parse_from_xml(self.xml)
+
+        # outline places on image where to drag adn drop
         to_js['target_outline'] = Attribute('target_outline',
                                         default="False").parse_from_xml(self.xml)
+        # one draggable per target?
         to_js['one_per_target'] = Attribute('one_per_target',
                                         default="True").parse_from_xml(self.xml)
-        to_js['draggable'] = [parse(draggable, 'draggable') for draggable in
+        # list of draggables
+        to_js['draggables'] = [parse(draggable, 'draggable') for draggable in
                                                 self.xml.iterchildren('draggable')]
+        # list of targets
         to_js['targets'] = [parse(target, 'target') for target in
                                                 self.xml.iterchildren('target')]
 

From 36b1d4f1d0e20721bb337de62607a6d366298132 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 26 Dec 2012 15:34:15 +0200
Subject: [PATCH 428/541] graders for draganddrop

---
 common/lib/capa/capa/graders/__init__.py    |  0
 common/lib/capa/capa/graders/draganddrop.py | 98 +++++++++++++++++++++
 common/lib/capa/capa/graders/tests.py       | 23 +++++
 3 files changed, 121 insertions(+)
 create mode 100644 common/lib/capa/capa/graders/__init__.py
 create mode 100644 common/lib/capa/capa/graders/draganddrop.py
 create mode 100644 common/lib/capa/capa/graders/tests.py

diff --git a/common/lib/capa/capa/graders/__init__.py b/common/lib/capa/capa/graders/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/common/lib/capa/capa/graders/draganddrop.py b/common/lib/capa/capa/graders/draganddrop.py
new file mode 100644
index 0000000000..d8618820cf
--- /dev/null
+++ b/common/lib/capa/capa/graders/draganddrop.py
@@ -0,0 +1,98 @@
+""" Grader of drag and drop input.
+
+Client side behavior: user can drag and drop images from list on base image.
+Parameter 'use_targets' in xml can control two use cases.
+
+if use_targets is true (defaut), then json returned from client is:
+ {
+    "use_targets": true,
+    "draggable": [
+        { "image1": "t1"  },
+        { "ant": "t2"  },
+        { "molecule": "t3"  },
+                ]
+}
+values are target names.
+
+If use_targets is false:
+ {
+    "use_targets": false,
+    "draggable": [
+        { "image1": "(10, 20)"  },
+        { "ant": "(30, 40)"  },
+        { "molecule": "(100, 200)"  },
+                ]
+}
+values are (x,y) coordinates of centers of dragged images.
+
+"""
+
+import json
+import math
+
+
+def grade(user_input, correct_answer):
+    '''
+    Grade drag and drop problem.
+    If use_targets is True - checks if image placed on proper target.
+    If use_targets is False - checks if image placed on proper coordinates,
+    with setted radius of forgiveness (default is 10)
+
+    Args:
+        user_input, correct_answer: json. Format:
+
+        user_input: see module docstring
+
+        correct_answer:
+            if use_targets is True:
+                {'1': 't1',  'name_with_icon': 't2'}
+            else:
+                {'1': '(10, 10)',  'name_with_icon': '[(10, 10), 20]'}
+
+    Returns:
+        True or False.
+    '''
+
+    user_answer = json.loads(user_input)
+
+    if len(correct_answer.keys()) != len(user_answer['draggables']):
+        return False
+
+    key = ['position']
+
+    def is_equal(user_answer, correct_answer):
+        """ Checks if user_answer is  equal to correct_answer inside radius
+        of forgiveness (default 10 px).
+
+            Args:
+                user_answer: (x, y) tuple of floats;
+                correct_answer is one of variants:
+                    - (x, y) tuple of floats
+                    - [(x, y), r], r - radius of forgiveness;
+
+            Returns: bool.
+        """
+        r = 10
+        if type(correct_answer) is type(()):  # (x, y) case
+            corr_x = correct_answer[0]
+            corr_y = correct_answer[1]
+        else:  # [(x, y), r] case
+            r = correct_answer[1]
+            corr_x = correct_answer[0][0]
+            corr_y = correct_answer[0][1]
+
+        if ((user_answer[0] - corr_x) ** 2 +
+            (user_answer[1] - corr_y) ** 2) > r * r:
+            return False
+
+        return True
+
+    if user_answer["use_targets"]:
+        key = ['target_id']
+        is_equal = lambda x, y: x == y
+
+    for draggable in user_answer['draggables']:
+        if not is_equal(draggable[key], correct_answer[key]):
+            return False
+
+    return True
diff --git a/common/lib/capa/capa/graders/tests.py b/common/lib/capa/capa/graders/tests.py
new file mode 100644
index 0000000000..1e0da9411e
--- /dev/null
+++ b/common/lib/capa/capa/graders/tests.py
@@ -0,0 +1,23 @@
+import unittest
+
+import draganddrop
+
+
+class Test_DragAndDrop(unittest.TestCase):
+
+    def test_1(self):
+        user_input = '{"laice": "bcc", "points": [["0.00", "1.00", "0.00"], ["1.00", "1.00", "0.00"], ["0.00", "0.00", "1.00"]]}'
+        correct_answer = {}
+        self.assertTrue(draganddrop.grade(user_input, correct_answer))
+
+
+def suite():
+
+    testcases = [Test_DragAndDrop]
+    suites = []
+    for testcase in testcases:
+        suites.append(unittest.TestLoader().loadTestsFromTestCase(testcase))
+    return unittest.TestSuite(suites)
+
+if __name__ == "__main__":
+    unittest.TextTestRunner(verbosity=2).run(suite())

From 4268f040698271a64300f9eac84dc72f2d27dfdf Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Wed, 26 Dec 2012 15:38:48 +0200
Subject: [PATCH 429/541] Updated JS part to use new XML format.

---
 .../js/capa/drag_and_drop/update_input.js     | 40 ++++++++++++-------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/update_input.js b/common/static/js/capa/drag_and_drop/update_input.js
index 225834c36c..72db2b7849 100644
--- a/common/static/js/capa/drag_and_drop/update_input.js
+++ b/common/static/js/capa/drag_and_drop/update_input.js
@@ -8,34 +8,46 @@ define(['logme'], function (logme) {
     return updateInput;
 
     function updateInput(state) {
-        var inputEl, stateStr, targets;
+        var inputEl, stateStr, targets, draggables, c1, c2, tempObj;
+
+        draggables = [];
 
         if (state.individualTargets === false) {
+            for (c1 = 0; c1 < state.draggables.length; c1++) {
+                if (state.draggables[c1].x !== -1) {
+                    tempObj = {};
+                    tempObj[state.draggables[c1].id] = {
+                        'x': state.draggables[c1].x,
+                        'y': state.draggables[c1].y
+                    };
+
+                    draggables.push(tempObj);
+                }
+            }
+
             stateStr = JSON.stringify({
-                'individualTargets': false,
-                'draggables': state.draggables
+                'targets': false,
+                'draggables': draggables
             });
         } else {
-            targets = [];
-            (function (c1) {
-                while (c1 < state.targets.length) {
-                    targets.push({
-                        'id': state.targets[c1].id,
-                        'draggables': state.targets[c1].draggable
-                    });
+            for (c1 = 0; c1 < state.targets.length; c1++) {
+                for (c2 = 0; c2 < state.targets[c1].draggable.length; c2++) {
+                    tempObj = {};
+                    tempObj[state.targets[c1].draggable[c2]] = state.draggables[c1].id;
 
-                    c1 += 1;
+                    draggables.push(tempObj);
                 }
-            }(0));
+            }
 
             stateStr = JSON.stringify({
-                'individualTargets': true,
-                'targets': targets
+                'targets': true,
+                'draggables': draggables
             });
         }
 
         inputEl = $('#input_' + state.problemId);
         inputEl.val(stateStr);
+        logme(inputEl.val());
     }
 
 });

From f9169613fc80f176394edf22db422aa34253150f Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Wed, 26 Dec 2012 15:54:15 +0200
Subject: [PATCH 430/541] Making JS work with the new XML format.

---
 .../{target_container.js => base_image.js}    |  6 ++---
 .../js/capa/drag_and_drop/config_parser.js    | 24 +++++++++----------
 .../js/capa/drag_and_drop/draggables.js       |  4 ++--
 common/static/js/capa/drag_and_drop/main.js   |  6 ++---
 .../js/capa/drag_and_drop/update_input.js     |  1 -
 5 files changed, 20 insertions(+), 21 deletions(-)
 rename common/static/js/capa/drag_and_drop/{target_container.js => base_image.js} (96%)

diff --git a/common/static/js/capa/drag_and_drop/target_container.js b/common/static/js/capa/drag_and_drop/base_image.js
similarity index 96%
rename from common/static/js/capa/drag_and_drop/target_container.js
rename to common/static/js/capa/drag_and_drop/base_image.js
index b3294a2574..9fa5ef6f52 100644
--- a/common/static/js/capa/drag_and_drop/target_container.js
+++ b/common/static/js/capa/drag_and_drop/base_image.js
@@ -5,12 +5,12 @@
 (function (requirejs, require, define) {
 
 define(['logme'], function (logme) {
-    return TargetContainer;
+    return BaseImage;
 
-    function TargetContainer(state) {
+    function BaseImage(state) {
         var targetImgSrc, targetElContainer, mouseMoveDiv;
 
-        targetImgSrc = state.config.imageDir + '/' + state.config.target_container;
+        targetImgSrc = state.config.imageDir + '/' + state.config.base_image;
 
         targetElContainer = $(
             '<div ' +
diff --git a/common/static/js/capa/drag_and_drop/config_parser.js b/common/static/js/capa/drag_and_drop/config_parser.js
index fd38081de1..58f6114009 100644
--- a/common/static/js/capa/drag_and_drop/config_parser.js
+++ b/common/static/js/capa/drag_and_drop/config_parser.js
@@ -14,33 +14,33 @@ define(['logme'], function (logme) {
 
         state.config = {
             'imageDir': '/static/' + imageDir + '/images',
-            'draggable': [],
+            'draggables': [],
             'targets': [],
-            'target_container': ''
+            'base_image': ''
         };
 
-        if ($.isArray(config.draggable) === true) {
+        if ($.isArray(config.draggables) === true) {
             (function (i) {
-                while (i < config.draggable.length) {
-                    if (processDraggable(config.draggable[i]) !== true) {
+                while (i < config.draggables.length) {
+                    if (processDraggable(config.draggables[i]) !== true) {
                         returnStatus = false;
                     }
                     i += 1;
                 }
             }(0));
-        } else if ($.isPlainObject(config.draggable) === true) {
-            if (processDraggable(config.draggable) !== true) {
+        } else if ($.isPlainObject(config.draggables) === true) {
+            if (processDraggable(config.draggables) !== true) {
                 returnStatus = false;
             }
         } else {
-            logme('ERROR: The type of config.draggable is no supported.');
+            logme('ERROR: The type of config.draggables is no supported.');
             returnStatus = false;
         }
 
-        if (typeof config.target_container === 'string') {
-            state.config.target_container = config.target_container;
+        if (typeof config.base_image === 'string') {
+            state.config.base_image = config.base_image;
         } else {
-            logme('ERROR: Property config.target_container is not of type "string".');
+            logme('ERROR: Property config.base_image is not of type "string".');
             returnStatus = false;
         }
 
@@ -104,7 +104,7 @@ define(['logme'], function (logme) {
             if (!attrIsString(obj, 'icon')) { return false; }
             if (!attrIsString(obj, 'label')) { return false; }
 
-            state.config.draggable.push(obj);
+            state.config.draggables.push(obj);
 
             true;
         }
diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index 8aafb200b2..bb6b52a7a4 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -14,8 +14,8 @@ define(['logme', 'update_input'], function (logme, updateInput) {
         state.draggables = [];
 
         (function (i) {
-            while (i < state.config.draggable.length) {
-                processDraggable(state.config.draggable[i], i + 1);
+            while (i < state.config.draggables.length) {
+                processDraggable(state.config.draggables[i], i + 1);
                 i += 1;
             }
         }(0));
diff --git a/common/static/js/capa/drag_and_drop/main.js b/common/static/js/capa/drag_and_drop/main.js
index 103a149c6a..7a18eacd93 100644
--- a/common/static/js/capa/drag_and_drop/main.js
+++ b/common/static/js/capa/drag_and_drop/main.js
@@ -5,8 +5,8 @@
 (function (requirejs, require, define) {
 
 define(
-    ['logme', 'state', 'config_parser', 'container', 'target_container', 'scroller', 'draggables', 'targets'],
-    function (logme, State, configParser, Container, TargetContainer, Scroller, Draggables, Targets) {
+    ['logme', 'state', 'config_parser', 'container', 'base_image', 'scroller', 'draggables', 'targets'],
+    function (logme, State, configParser, Container, BaseImage, Scroller, Draggables, Targets) {
     return Main;
 
     function Main() {
@@ -57,7 +57,7 @@ define(
         }
 
         Container(state);
-        TargetContainer(state);
+        BaseImage(state);
         Scroller(state);
         Draggables(state);
         Targets(state);
diff --git a/common/static/js/capa/drag_and_drop/update_input.js b/common/static/js/capa/drag_and_drop/update_input.js
index 72db2b7849..9898d3b3c9 100644
--- a/common/static/js/capa/drag_and_drop/update_input.js
+++ b/common/static/js/capa/drag_and_drop/update_input.js
@@ -47,7 +47,6 @@ define(['logme'], function (logme) {
 
         inputEl = $('#input_' + state.problemId);
         inputEl.val(stateStr);
-        logme(inputEl.val());
     }
 
 });

From ff0f21614ebf77f57d16d3de01acb0eeab25bd7f Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 26 Dec 2012 15:57:48 +0200
Subject: [PATCH 431/541] started tests and add graders to capa_problem

---
 common/lib/capa/capa/capa_problem.py  |  5 ++++-
 common/lib/capa/capa/graders/tests.py | 13 ++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/common/lib/capa/capa/capa_problem.py b/common/lib/capa/capa/capa_problem.py
index 2eaa0e4286..96a334ef97 100644
--- a/common/lib/capa/capa/capa_problem.py
+++ b/common/lib/capa/capa/capa_problem.py
@@ -34,6 +34,8 @@ import chem
 import chem.chemcalc
 import chem.chemtools
 import chem.miller
+import graders
+import graders.draganddrop
 
 import calc
 from correctmap import CorrectMap
@@ -69,7 +71,8 @@ global_context = {'random': random,
                   'eia': eia,
                   'chemcalc': chem.chemcalc,
                   'chemtools': chem.chemtools,
-                  'miller': chem.miller}
+                  'miller': chem.miller,
+                  'draganddrop': graders.draganddrop}
 
 # These should be removed from HTML output, including all subelements
 html_problem_semantics = ["codeparam", "responseparam", "answer", "script", "hintgroup", "openendedparam","openendedrubric"]
diff --git a/common/lib/capa/capa/graders/tests.py b/common/lib/capa/capa/graders/tests.py
index 1e0da9411e..be37c49679 100644
--- a/common/lib/capa/capa/graders/tests.py
+++ b/common/lib/capa/capa/graders/tests.py
@@ -5,9 +5,16 @@ import draganddrop
 
 class Test_DragAndDrop(unittest.TestCase):
 
-    def test_1(self):
-        user_input = '{"laice": "bcc", "points": [["0.00", "1.00", "0.00"], ["1.00", "1.00", "0.00"], ["0.00", "0.00", "1.00"]]}'
-        correct_answer = {}
+    def test_targets_true(self):
+        user_input = '{"use_targets": "true", "draggables": \
+        ["1": "t1", "name_with_icon": "t2"]}'
+        correct_answer = {'1':              't1', 'name_with_icon': 't2'}
+        self.assertTrue(draganddrop.grade(user_input, correct_answer))
+
+        def test_targets_true(self):
+        user_input = '{"use_targets": "true", "draggables": \
+        ["1": "t1", "name_with_icon": "t2"]}'
+        correct_answer = {'1':              't1', 'name_with_icon': 't2'}
         self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
 

From dd9cdc1c2f49c0c45338546fb8856f477c510d5a Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 26 Dec 2012 17:17:12 +0200
Subject: [PATCH 432/541] tests for drag and drop

---
 common/lib/capa/capa/graders/tests.py | 66 ++++++++++++++++++++++++---
 1 file changed, 60 insertions(+), 6 deletions(-)

diff --git a/common/lib/capa/capa/graders/tests.py b/common/lib/capa/capa/graders/tests.py
index be37c49679..70208ab327 100644
--- a/common/lib/capa/capa/graders/tests.py
+++ b/common/lib/capa/capa/graders/tests.py
@@ -6,17 +6,71 @@ import draganddrop
 class Test_DragAndDrop(unittest.TestCase):
 
     def test_targets_true(self):
-        user_input = '{"use_targets": "true", "draggables": \
-        ["1": "t1", "name_with_icon": "t2"]}'
+        user_input = '{"use_targets": true, "draggables": [{"1": "t1"}, \
+         {"name_with_icon": "t2"}]}'
         correct_answer = {'1':              't1', 'name_with_icon': 't2'}
         self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
-        def test_targets_true(self):
-        user_input = '{"use_targets": "true", "draggables": \
-        ["1": "t1", "name_with_icon": "t2"]}'
-        correct_answer = {'1':              't1', 'name_with_icon': 't2'}
+    def test_targets_false(self):
+        user_input = '{"use_targets": true, "draggables": [{"1": "t1"}, \
+        {"name_with_icon": "t2"}]}'
+        correct_answer = {'1':              't3', 'name_with_icon': 't2'}
+        self.assertFalse(draganddrop.grade(user_input, correct_answer))
+
+    def test_multiple_images_per_target_true(self):
+        user_input = '{"use_targets": true, \
+        "draggables": [{"1": "t1"}, {"name_with_icon": "t1"}]}'
+        correct_answer = {'1':              't1', 'name_with_icon': 't1'}
         self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
+    def test_multiple_images_per_target_false(self):
+        user_input = '{"use_targets": true, \
+        "draggables": [{"1": "t1"}, {"name_with_icon": "t1"}]}'
+        correct_answer = {'1':              't2', 'name_with_icon': 't1'}
+        self.assertFalse(draganddrop.grade(user_input, correct_answer))
+
+    def test_targets_and_positions(self):
+        user_input = '{"use_targets": true, "draggables": [{"1": [10,10]}, \
+         {"name_with_icon": [[10,10],4]}]}'
+        correct_answer = {'1':  [10, 10], 'name_with_icon': [[10, 10], 4]}
+        self.assertFalse(draganddrop.grade(user_input, correct_answer))
+
+    def test_position_and_targets(self):
+        user_input = '{"use_targets": false, \
+        "draggables": [{"1": "t1"}, {"name_with_icon": "t2"}]}'
+        correct_answer = {'1':    't1', 'name_with_icon': 't2'}
+        self.assertFalse(draganddrop.grade(user_input, correct_answer))
+
+    def test_positions_exact(self):
+        user_input = '{"use_targets": false, "draggables": \
+        [{"1": [10, 10]}, {"name_with_icon": [20, 20]}]}'
+        correct_answer = {'1':   [10, 10], 'name_with_icon': [20, 20]}
+        self.assertTrue(draganddrop.grade(user_input, correct_answer))
+
+    def test_positions_false(self):
+        user_input = '{"use_targets": false, "draggables": \
+        [{"1": [10, 10]}, {"name_with_icon": [20, 20]}]}'
+        correct_answer = {'1':   [25, 25], 'name_with_icon': [20, 20]}
+        self.assertFalse(draganddrop.grade(user_input, correct_answer))
+
+    def test_positions_true_in_radius(self):
+        user_input = '{"use_targets": false, "draggables": \
+        [{"1": [10, 10]}, {"name_with_icon": [20, 20]}]}'
+        correct_answer = {'1':   [14, 14], 'name_with_icon': [20, 20]}
+        self.assertTrue(draganddrop.grade(user_input, correct_answer))
+
+    def test_positions_true_in_manual_radius(self):
+        user_input = '{"use_targets": false, "draggables": \
+        [{"1": [10, 10]}, {"name_with_icon": [20, 20]}]}'
+        correct_answer = {'1':   [[40, 10], 30], 'name_with_icon': [20, 20]}
+        self.assertTrue(draganddrop.grade(user_input, correct_answer))
+
+    def test_positions_false_in_manual_radius(self):
+        user_input = '{"use_targets": false, "draggables": \
+        [{"1": [10, 10]}, {"name_with_icon": [20, 20]}]}'
+        correct_answer = {'1': [[40, 10], 29], 'name_with_icon': [20, 20]}
+        self.assertFalse(draganddrop.grade(user_input, correct_answer))
+
 
 def suite():
 

From 3844476314977f16fb6b52ed76803141e4670b6a Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 26 Dec 2012 17:17:37 +0200
Subject: [PATCH 433/541] fixes in algorithm

---
 common/lib/capa/capa/graders/draganddrop.py | 29 +++++++++++----------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/common/lib/capa/capa/graders/draganddrop.py b/common/lib/capa/capa/graders/draganddrop.py
index d8618820cf..07c8f60541 100644
--- a/common/lib/capa/capa/graders/draganddrop.py
+++ b/common/lib/capa/capa/graders/draganddrop.py
@@ -28,7 +28,6 @@ values are (x,y) coordinates of centers of dragged images.
 """
 
 import json
-import math
 
 
 def grade(user_input, correct_answer):
@@ -58,28 +57,29 @@ def grade(user_input, correct_answer):
     if len(correct_answer.keys()) != len(user_answer['draggables']):
         return False
 
-    key = ['position']
-
     def is_equal(user_answer, correct_answer):
         """ Checks if user_answer is  equal to correct_answer inside radius
         of forgiveness (default 10 px).
 
             Args:
-                user_answer: (x, y) tuple of floats;
-                correct_answer is one of variants:
-                    - (x, y) tuple of floats
-                    - [(x, y), r], r - radius of forgiveness;
+                user_answer:    [x, y]  - list of floats;
+                correct_answer: [x, y] or [[x, y], r], where
+                                r is radius of forgiveness;
 
             Returns: bool.
         """
+        if not isinstance(correct_answer, list) or \
+           not isinstance(user_answer, list):
+            return False
+
         r = 10
-        if type(correct_answer) is type(()):  # (x, y) case
-            corr_x = correct_answer[0]
-            corr_y = correct_answer[1]
-        else:  # [(x, y), r] case
+        if isinstance(correct_answer[0], list):  # [(x, y), r] case
             r = correct_answer[1]
             corr_x = correct_answer[0][0]
             corr_y = correct_answer[0][1]
+        else:  # (x, y) case
+            corr_x = correct_answer[0]
+            corr_y = correct_answer[1]
 
         if ((user_answer[0] - corr_x) ** 2 +
             (user_answer[1] - corr_y) ** 2) > r * r:
@@ -88,11 +88,12 @@ def grade(user_input, correct_answer):
         return True
 
     if user_answer["use_targets"]:
-        key = ['target_id']
-        is_equal = lambda x, y: x == y
+        is_equal = lambda user, correct: user == correct if (
+             isinstance(user, unicode) and isinstance(correct, str)) else False
 
     for draggable in user_answer['draggables']:
-        if not is_equal(draggable[key], correct_answer[key]):
+        if not is_equal(draggable.values()[0],
+                        correct_answer[draggable.keys()[0]]):
             return False
 
     return True

From d3264dd877bb681506b3db225a2ba38fdbbff6b5 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 26 Dec 2012 18:10:42 +0200
Subject: [PATCH 434/541] rename tag

---
 common/lib/capa/capa/tests/test_inputtypes.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/lib/capa/capa/tests/test_inputtypes.py b/common/lib/capa/capa/tests/test_inputtypes.py
index 505b536ab6..4a4c6ee5bc 100644
--- a/common/lib/capa/capa/tests/test_inputtypes.py
+++ b/common/lib/capa/capa/tests/test_inputtypes.py
@@ -513,7 +513,7 @@ class DragAndDropTest(unittest.TestCase):
         template = "path to template"
         images = "list of pathes to images"
 
-        xml_str = """<drag_and_drop id="prob_1_2"
+        xml_str = """<drag_and_drop_input id="prob_1_2"
         height="{h}"
         width="{w}"
         template="{t}"
@@ -526,7 +526,7 @@ class DragAndDropTest(unittest.TestCase):
         state = {'value': value,
                  'status': 'unsubmitted'}
 
-        the_input = lookup_tag('drag_and_drop')(test_system, element, state)
+        the_input = lookup_tag('drag_and_drop_input')(test_system, element, state)
 
         context = the_input._get_render_context()
 

From b45fe0e652184642804016ddfe5cfe0f7fb60eec Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 26 Dec 2012 18:11:09 +0200
Subject: [PATCH 435/541] update format

---
 .../static/js/capa/drag_and_drop/update_input.js   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/update_input.js b/common/static/js/capa/drag_and_drop/update_input.js
index 9898d3b3c9..60057e2674 100644
--- a/common/static/js/capa/drag_and_drop/update_input.js
+++ b/common/static/js/capa/drag_and_drop/update_input.js
@@ -16,31 +16,31 @@ define(['logme'], function (logme) {
             for (c1 = 0; c1 < state.draggables.length; c1++) {
                 if (state.draggables[c1].x !== -1) {
                     tempObj = {};
-                    tempObj[state.draggables[c1].id] = {
-                        'x': state.draggables[c1].x,
-                        'y': state.draggables[c1].y
-                    };
+                    tempObj[state.draggables[c1].id] = [
+                        state.draggables[c1].x,
+                        state.draggables[c1].y
+                    ];
 
                     draggables.push(tempObj);
                 }
             }
 
             stateStr = JSON.stringify({
-                'targets': false,
+                'use_targets': false,
                 'draggables': draggables
             });
         } else {
             for (c1 = 0; c1 < state.targets.length; c1++) {
                 for (c2 = 0; c2 < state.targets[c1].draggable.length; c2++) {
                     tempObj = {};
-                    tempObj[state.targets[c1].draggable[c2]] = state.draggables[c1].id;
+                    tempObj[state.targets[c1].draggable[c2]] = state.targets[c1].id;
 
                     draggables.push(tempObj);
                 }
             }
 
             stateStr = JSON.stringify({
-                'targets': true,
+                'use_targets': true,
                 'draggables': draggables
             });
         }

From 86d133664aadc4ce2f0948d5c4331953b3831310 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Thu, 27 Dec 2012 07:43:49 +0200
Subject: [PATCH 436/541] Fixing bugs. Now resize of window does not mess up
 targets. Dragging is much smoother on touch pad. Removed border from
 draggable when it is not in slider. The whole applet fits into min-width of
 main part of page.

---
 .../js/capa/drag_and_drop/base_image.js       | 22 +++---
 .../static/js/capa/drag_and_drop/container.js |  3 +
 .../js/capa/drag_and_drop/draggables.js       | 79 +++++++++++++------
 common/static/js/capa/drag_and_drop/main.js   | 14 ++--
 .../static/js/capa/drag_and_drop/scroller.js  | 18 +++--
 .../static/js/capa/drag_and_drop/targets.js   | 10 +--
 6 files changed, 90 insertions(+), 56 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/base_image.js b/common/static/js/capa/drag_and_drop/base_image.js
index 9fa5ef6f52..185325512c 100644
--- a/common/static/js/capa/drag_and_drop/base_image.js
+++ b/common/static/js/capa/drag_and_drop/base_image.js
@@ -8,34 +8,34 @@ define(['logme'], function (logme) {
     return BaseImage;
 
     function BaseImage(state) {
-        var targetImgSrc, targetElContainer, mouseMoveDiv;
+        var targetImgSrc, baseImageElContainer, mouseMoveDiv;
 
         targetImgSrc = state.config.imageDir + '/' + state.config.base_image;
 
-        targetElContainer = $(
+        baseImageElContainer = $(
             '<div ' +
+                'class="base_image_container" ' +
                 'style=" ' +
                     'position: relative; ' +
-                    'text-align: center; ' +
                 '" ' +
             '></div>'
         );
 
-        state.targetEl = $(
+        state.baseImageEl = $(
             '<img ' +
                 'src="' + targetImgSrc + '" ' +
             '/>'
         );
-        state.targetEl.appendTo(targetElContainer);
+        state.baseImageEl.appendTo(baseImageElContainer);
 
-        state.targetElWidth = null;
+        state.baseImageElWidth = null;
         $('<img/>') // Make in memory copy of image to avoid css issues.
-            .attr('src', state.targetEl.attr('src'))
+            .attr('src', state.baseImageEl.attr('src'))
             .load(function () {
-                state.targetElWidth = this.width;
+                state.baseImageElWidth = this.width;
             });
 
-        // state.targetEl.mousemove(
+        // state.baseImageEl.mousemove(
         //     function (event) {
         //         mouseMoveDiv.html(
         //             '[' + event.offsetX + ', ' + event.offsetY + ']'
@@ -53,9 +53,9 @@ define(['logme'], function (logme) {
                 '" ' +
             '></div>'
         );
-        mouseMoveDiv.appendTo(targetElContainer);
+        mouseMoveDiv.appendTo(baseImageElContainer);
 
-        targetElContainer.appendTo(state.containerEl);
+        baseImageElContainer.appendTo(state.containerEl);
     }
 });
 
diff --git a/common/static/js/capa/drag_and_drop/container.js b/common/static/js/capa/drag_and_drop/container.js
index 766a020802..e5a7de447f 100644
--- a/common/static/js/capa/drag_and_drop/container.js
+++ b/common/static/js/capa/drag_and_drop/container.js
@@ -12,6 +12,9 @@ define(['logme'], function (logme) {
             '<div ' +
                 'style=" ' +
                     'clear: both; ' +
+                    'width: 665px; ' +
+                    'margin-left: auto; ' +
+                    'margin-right: auto; ' +
                 '" ' +
             '></div>'
         );
diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index bb6b52a7a4..9186c0d837 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -20,6 +20,17 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             }
         }(0));
 
+        state.currentMovingDraggable = null;
+
+        $(document).mousemove(function (event) {
+            normalizeEvent(event);
+
+            if (state.currentMovingDraggable !== null) {
+                state.currentMovingDraggable.css('left', event.pageX - state.baseImageEl.offset().left - 50);
+                state.currentMovingDraggable.css('top', event.pageY - state.baseImageEl.offset().top - 50);
+            }
+        });
+
         return;
 
         function processDraggable(obj, index) {
@@ -81,7 +92,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             draggableContainerEl.mousedown(mouseDown);
             draggableContainerEl.mouseup(mouseUp);
             draggableContainerEl.mousemove(mouseMove);
-            draggableContainerEl.mouseleave(mouseLeave);
+            // draggableContainerEl.mouseleave(mouseLeave);
 
             if (state.individualTargets === false) {
                 updateInput(state);
@@ -91,12 +102,16 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
             function mouseDown(event) {
                 if (mousePressed === false) {
+                    state.currentMovingDraggable = draggableContainerEl;
+                    normalizeEvent(event);
+
                     if (inContainer === true) {
                         draggableContainerEl.detach();
+                        draggableContainerEl.css('border', 'none');
                         draggableContainerEl.css('position', 'absolute');
-                        draggableContainerEl.css('left', event.pageX - 50);
-                        draggableContainerEl.css('top', event.pageY - 50);
-                        draggableContainerEl.appendTo(state.containerEl);
+                        draggableContainerEl.css('left', event.pageX - state.baseImageEl.offset().left - 50);
+                        draggableContainerEl.css('top', event.pageY - state.baseImageEl.offset().top - 50);
+                        draggableContainerEl.appendTo(state.baseImageEl.parent());
 
                         inContainer = false;
                     }
@@ -109,40 +124,43 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                 }
             }
 
-            function mouseUp() {
+            function mouseUp(event) {
                 if (mousePressed === true) {
-                    checkLandingElement();
+                    state.currentMovingDraggable = null;
+                    normalizeEvent(event);
+
+                    checkLandingElement(event);
                 }
             }
 
             function mouseMove() {
                 if (mousePressed === true) {
-                    draggableContainerEl.css('left', (event.pageX - 50));
-                    draggableContainerEl.css('top', (event.pageY - 50));
+                    draggableContainerEl.css('left', event.pageX - state.baseImageEl.offset().left - 50);
+                    draggableContainerEl.css('top', event.pageY - state.baseImageEl.offset().top - 50);
                 }
             }
 
-            function mouseLeave() {
-                if (mousePressed === true) {
-                    checkLandingElement();
-                }
-            }
+            // function mouseLeave(event) {
+            //     if (mousePressed === true) {
+            //         normalizeEvent(event);
+            //
+            //         checkLandingElement(event);
+            //     }
+            // }
 
-            function checkLandingElement() {
-                var offsetDE, offsetTE, indexes, DEindex, targetFound;
+            function checkLandingElement(event) {
+                var offsetDE, indexes, DEindex, targetFound;
 
                 mousePressed = false;
 
-                offsetDE = draggableContainerEl.offset();
+                offsetDE = draggableContainerEl.position();
 
                 if (state.individualTargets === false) {
-                    offsetTE = state.targetEl.offset();
-
                     if (
-                        (offsetDE.left < offsetTE.left) ||
-                        (offsetDE.left + 100 > offsetTE.left + state.targetEl.width()) ||
-                        (offsetDE.top < offsetTE.top) ||
-                        (offsetDE.top + 100 > offsetTE.top + state.targetEl.height())
+                        (offsetDE.left < 0) ||
+                        (offsetDE.left + 100 > state.baseImageEl.width()) ||
+                        (offsetDE.top < 0) ||
+                        (offsetDE.top + 100 > state.baseImageEl.height())
                     ) {
                         moveBackToSlider();
 
@@ -151,8 +169,8 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                     } else {
                         correctZIndexes();
 
-                        draggableObj.x = offsetDE.left + 50 - offsetTE.left;
-                        draggableObj.y = offsetDE.top + 50 - offsetTE.top;
+                        draggableObj.x = offsetDE.left + 50;
+                        draggableObj.y = offsetDE.top + 50;
                     }
                 } else if (state.individualTargets === true) {
                     targetFound = false;
@@ -238,8 +256,8 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                 }
 
                 function snapToTarget(target) {
-                    draggableContainerEl.css('left', (target.offset.left + 0.5 * target.w - 50));
-                    draggableContainerEl.css('top', (target.offset.top + 0.5 * target.h - 50));
+                    draggableContainerEl.css('left', target.offset.left + 0.5 * target.w - 50);
+                    draggableContainerEl.css('top', target.offset.top + 0.5 * target.h - 50);
                 }
 
                 function correctZIndexes() {
@@ -288,10 +306,19 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         draggableContainerEl.appendTo(state.sliderEl);
                         inContainer = true;
                     }
+
+                    draggableContainerEl.css('border', '1px solid gray');
                 }
             }
         }
 
+        function normalizeEvent(event) {
+            if(!event.offsetX) {
+                event.offsetX = (event.pageX - $(event.target).offset().left);
+                event.offsetY = (event.pageY - $(event.target).offset().top);
+            }
+            return event;
+        }
     }
 });
 
diff --git a/common/static/js/capa/drag_and_drop/main.js b/common/static/js/capa/drag_and_drop/main.js
index 7a18eacd93..9027f55d01 100644
--- a/common/static/js/capa/drag_and_drop/main.js
+++ b/common/static/js/capa/drag_and_drop/main.js
@@ -32,13 +32,6 @@ define(
             return;
         }
 
-        imageDir = $(value).attr('data-course-folder');
-        if (typeof imageDir !== 'string') {
-            logme('ERROR: Could not find the name of the image directory.');
-
-            return;
-        }
-
         try {
             config = JSON.parse($('#drag_and_drop_json_' + problemId).html());
         } catch (err) {
@@ -48,6 +41,13 @@ define(
             return;
         }
 
+        imageDir = $(value).attr('data-course-folder');
+        if (typeof imageDir !== 'string') {
+            logme('ERROR: Could not find the name of the image directory.');
+
+            return;
+        }
+
         state = State(problemId);
 
         if (configParser(config, imageDir, state) !== true) {
diff --git a/common/static/js/capa/drag_and_drop/scroller.js b/common/static/js/capa/drag_and_drop/scroller.js
index fc11740611..6c2950e458 100644
--- a/common/static/js/capa/drag_and_drop/scroller.js
+++ b/common/static/js/capa/drag_and_drop/scroller.js
@@ -13,7 +13,7 @@ define(['logme'], function (logme) {
         parentEl = $(
             '<div ' +
                 'style=" ' +
-                    'width: 100%; ' +
+                    'width: 665px; ' +
                     'height: 102px; ' +
                     'margin-left: auto; ' +
                     'margin-right: auto; ' +
@@ -24,7 +24,7 @@ define(['logme'], function (logme) {
         moveLeftEl = $(
             '<div ' +
                 'style=" ' +
-                    'width: 6%; ' +
+                    'width: 40px; ' +
                     'height: 102px; ' +
                     'display: inline; ' +
                     'float: left; ' +
@@ -67,13 +67,15 @@ define(['logme'], function (logme) {
             showElLeftMargin += 102;
             state.sliderEl.animate({
                 'margin-left': showElLeftMargin + 'px'
-            }, 100);
+            }, 100, function () {
+                // Check if at the end, and make arrow less visible.
+            });
         });
 
         showEl = $(
             '<div ' +
                 'style=" ' +
-                    'width: 714px; ' +
+                    'width: 585px; ' +
                     'height: 102px; ' +
                     'overflow: hidden; ' +
                     'display: inline; ' +
@@ -98,7 +100,7 @@ define(['logme'], function (logme) {
         moveRightEl = $(
             '<div ' +
                 'style=" ' +
-                    'width: 6%; ' +
+                    'width: 40px; ' +
                     'height: 102px; ' +
                     'display: inline; ' +
                     'float: left; ' +
@@ -134,14 +136,16 @@ define(['logme'], function (logme) {
         moveRightEl.appendTo(parentEl);
 
         moveRightEl.click(function () {
-            if (showElLeftMargin < -102 * (state.sliderEl.children().length - 8)) {
+            if (showElLeftMargin < -102 * (state.sliderEl.children().length - 6)) {
                 return;
             }
 
             showElLeftMargin -= 102;
             state.sliderEl.animate({
                 'margin-left': showElLeftMargin + 'px'
-            }, 100);
+            }, 100, function () {
+                // Check if at the end, and make arrow less visible.
+            });
         });
 
         parentEl.appendTo(state.containerEl);
diff --git a/common/static/js/capa/drag_and_drop/targets.js b/common/static/js/capa/drag_and_drop/targets.js
index eddc51f440..c1a5b5e265 100644
--- a/common/static/js/capa/drag_and_drop/targets.js
+++ b/common/static/js/capa/drag_and_drop/targets.js
@@ -20,16 +20,16 @@ define(['logme', 'update_input'], function (logme, updateInput) {
         return;
 
         function processTarget(obj) {
-            var targetElOffset, tEl, left, borderCss;
+            var baseImageElOffset, tEl, left, borderCss;
 
-            if (state.targetElWidth === null) {
+            if (state.baseImageElWidth === null) {
                 window.setTimeout(function () {
                     processTarget(obj);
                 }, 50);
                 return;
             }
 
-            left = obj.x + 0.5 * (state.targetEl.parent().width() - state.targetElWidth);
+            left = obj.x + 0.5 * (state.baseImageEl.parent().width() - state.baseImageElWidth);
 
             borderCss = '';
             if (state.config.target_outline === true) {
@@ -51,11 +51,11 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                 '></div>'
             );
 
-            tEl.appendTo(state.targetEl.parent());
+            tEl.appendTo(state.baseImageEl.parent());
 
             state.targets.push({
                 'id': obj.id,
-                'offset': tEl.offset(),
+                'offset': tEl.position(),
                 'w': obj.w,
                 'h': obj.h,
                 'el': tEl,

From 3bbe0759ea4c09398b6e946736ef51b377fa3e74 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Thu, 27 Dec 2012 10:36:11 +0200
Subject: [PATCH 437/541] Added support for reading answer from input element
 (as set by server).

---
 .../js/capa/drag_and_drop/draggables.js       |  34 ++---
 .../static/js/capa/drag_and_drop/scroller.js  |  22 ++-
 common/static/js/capa/drag_and_drop/state.js  |   5 +-
 .../static/js/capa/drag_and_drop/targets.js   |  33 +++--
 .../js/capa/drag_and_drop/update_input.js     | 136 +++++++++++++++++-
 5 files changed, 196 insertions(+), 34 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index 9186c0d837..01fc612c5c 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -8,16 +8,21 @@ define(['logme', 'update_input'], function (logme, updateInput) {
     return Draggables;
 
     function Draggables(state) {
-        var _draggables;
+        var _draggables, numDraggables;
 
+        numDraggables = state.config.draggables.length;
         _draggables = [];
         state.draggables = [];
 
         (function (i) {
-            while (i < state.config.draggables.length) {
+            while (i < numDraggables) {
                 processDraggable(state.config.draggables[i], i + 1);
                 i += 1;
             }
+
+            if (state.individualTargets === false) {
+                updateInput(state, true);
+            }
         }(0));
 
         state.currentMovingDraggable = null;
@@ -33,7 +38,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
         return;
 
-        function processDraggable(obj, index) {
+        function processDraggable(obj, objIndex) {
             var draggableContainerEl, imgEl, inContainer, ousePressed,
                 onTarget, draggableObj, marginCss;
 
@@ -45,10 +50,10 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         'display: inline; ' +
                         'float: left; ' +
                         'overflow: hidden; ' +
-                        'z-index: ' + index + '; ' +
+                        'z-index: ' + objIndex + '; ' +
                         'border: 1px solid gray; ' +
                     '" ' +
-                    'data-draggable-position-index="' + index + '" ' +
+                    'data-draggable-position-index="' + objIndex + '" ' +
                     '></div>'
             );
 
@@ -84,18 +89,21 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
             draggableObj = {
                 'id': obj.id,
+                'el': draggableContainerEl,
                 'x': -1,
-                'y': -1
+                'y': -1,
+
+                'setInContainer': function (val) { inContainer = val; },
+                'setOnTarget': function (val) { onTarget = val; },
             };
             state.draggables.push(draggableObj);
 
             draggableContainerEl.mousedown(mouseDown);
             draggableContainerEl.mouseup(mouseUp);
             draggableContainerEl.mousemove(mouseMove);
-            // draggableContainerEl.mouseleave(mouseLeave);
 
-            if (state.individualTargets === false) {
-                updateInput(state);
+            if (objIndex + 1 === numDraggables) {
+                state.draggablesLoaded = true;
             }
 
             return;
@@ -140,14 +148,6 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                 }
             }
 
-            // function mouseLeave(event) {
-            //     if (mousePressed === true) {
-            //         normalizeEvent(event);
-            //
-            //         checkLandingElement(event);
-            //     }
-            // }
-
             function checkLandingElement(event) {
                 var offsetDE, indexes, DEindex, targetFound;
 
diff --git a/common/static/js/capa/drag_and_drop/scroller.js b/common/static/js/capa/drag_and_drop/scroller.js
index 6c2950e458..fcd68613cb 100644
--- a/common/static/js/capa/drag_and_drop/scroller.js
+++ b/common/static/js/capa/drag_and_drop/scroller.js
@@ -59,7 +59,16 @@ define(['logme'], function (logme) {
         );
         moveLeftEl.appendTo(parentEl);
 
-        moveLeftEl.click(function () {
+        // The below is necessary to prevent the browser thinking that we want
+        // to perform a drag operation, or a highlight operation. If we don't
+        // do this, the browser will then highlight with a gray shade the
+        // element.
+        moveLeftEl.mousemove(function (event) { event.preventDefault(); });
+        moveLeftEl.mousedown(function (event) { event.preventDefault(); });
+
+        moveLeftEl.mouseup(function (event) {
+            event.preventDefault();
+
             if (showElLeftMargin > -102) {
                 return;
             }
@@ -135,7 +144,16 @@ define(['logme'], function (logme) {
         );
         moveRightEl.appendTo(parentEl);
 
-        moveRightEl.click(function () {
+        // The below is necessary to prevent the browser thinking that we want
+        // to perform a drag operation, or a highlight operation. If we don't
+        // do this, the browser will then highlight with a gray shade the
+        // element.
+        moveRightEl.mousemove(function (event) { event.preventDefault(); });
+        moveRightEl.mousedown(function (event) { event.preventDefault(); });
+
+        moveRightEl.mouseup(function (event) {
+            event.preventDefault();
+
             if (showElLeftMargin < -102 * (state.sliderEl.children().length - 6)) {
                 return;
             }
diff --git a/common/static/js/capa/drag_and_drop/state.js b/common/static/js/capa/drag_and_drop/state.js
index 7ebf89d023..eb693347d7 100644
--- a/common/static/js/capa/drag_and_drop/state.js
+++ b/common/static/js/capa/drag_and_drop/state.js
@@ -9,7 +9,10 @@ define([], function () {
 
     function State(problemId) {
         return {
-            'problemId': problemId
+            'problemId': problemId,
+
+            'targetsLoaded': false,
+            'draggablesLoaded': false
         };
     }
 });
diff --git a/common/static/js/capa/drag_and_drop/targets.js b/common/static/js/capa/drag_and_drop/targets.js
index c1a5b5e265..8a98cee473 100644
--- a/common/static/js/capa/drag_and_drop/targets.js
+++ b/common/static/js/capa/drag_and_drop/targets.js
@@ -8,28 +8,37 @@ define(['logme', 'update_input'], function (logme, updateInput) {
     return Targets;
 
     function Targets(state) {
+        var numTargets;
+
+        numTargets = state.config.targets.length;
         state.targets = [];
 
         (function (c1) {
-            while (c1 < state.config.targets.length) {
-                processTarget(state.config.targets[c1]);
+            while (c1 < numTargets) {
+                processTarget(state.config.targets[c1], c1);
                 c1 += 1;
             }
+
+            if (state.individualTargets === true) {
+                updateInput(state, true);
+            }
         }(0));
 
         return;
 
-        function processTarget(obj) {
+        function processTarget(obj, objIndex) {
             var baseImageElOffset, tEl, left, borderCss;
 
-            if (state.baseImageElWidth === null) {
-                window.setTimeout(function () {
-                    processTarget(obj);
-                }, 50);
-                return;
-            }
+            // if (state.baseImageElWidth === null) {
+            //     window.setTimeout(function () {
+            //         processTarget(obj);
+            //     }, 50);
+            //
+            //     return;
+            // }
 
-            left = obj.x + 0.5 * (state.baseImageEl.parent().width() - state.baseImageElWidth);
+            // left = obj.x + 0.5 * (state.baseImageEl.parent().width() - state.baseImageElWidth);
+            left = obj.x;
 
             borderCss = '';
             if (state.config.target_outline === true) {
@@ -62,8 +71,8 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                 'draggable': []
             });
 
-            if (state.individualTargets === true) {
-                updateInput(state);
+            if (objIndex + 1 === numTargets) {
+                state.targetsLoaded = true;
             }
         }
     }
diff --git a/common/static/js/capa/drag_and_drop/update_input.js b/common/static/js/capa/drag_and_drop/update_input.js
index 60057e2674..ed49f3dd85 100644
--- a/common/static/js/capa/drag_and_drop/update_input.js
+++ b/common/static/js/capa/drag_and_drop/update_input.js
@@ -7,9 +7,15 @@
 define(['logme'], function (logme) {
     return updateInput;
 
-    function updateInput(state) {
+    function updateInput(state, checkFirst) {
         var inputEl, stateStr, targets, draggables, c1, c2, tempObj;
 
+        if (checkFirst === true) {
+            if (checkIfHasAnswer() === true) {
+                return;
+            }
+        }
+
         draggables = [];
 
         if (state.individualTargets === false) {
@@ -47,8 +53,134 @@ define(['logme'], function (logme) {
 
         inputEl = $('#input_' + state.problemId);
         inputEl.val(stateStr);
-    }
 
+        return;
+
+        // Check if input has an answer from server. If yes, then position
+        // all draggables according to answer.
+        function checkIfHasAnswer() {
+            var inputElVal;
+
+            inputElVal = $('#input_' + state.problemId).val();
+            if (inputElVal.length === 0) {
+                return false;
+            }
+
+            repositionDraggables(JSON.parse(inputElVal));
+
+            return true;
+        }
+
+        function repositionDraggables(answer) {
+            var draggableId, draggable, targetId, target, draggablePosition,
+                c1;
+
+            if (
+                ((state.individualTargets === true) && (state.targetsLoaded === false)) ||
+                (state.draggablesLoaded === false)
+            ) {
+                window.setTimeout(function () {
+                    repositionDraggables(answer);
+                }, 50);
+
+                return;
+            }
+
+            if (
+                ((typeof answer.use_targets === 'boolean') && (answer.use_targets === true)) ||
+                ((typeof answer.use_targets === 'string') && (answer.use_targets === 'true'))
+            ) {
+                for (c1 = 0; c1 < answer.draggables.length; c1++) {
+                    for (draggableId in answer.draggables[c1]) {
+                        if ((draggable = getDraggableById(draggableId)) === null) {
+                            logme('ERROR: In answer there exists a draggable ID "' + draggableId + '". No draggable with this ID could be found.');
+
+                            continue;
+                        }
+
+                        targetId = answer.draggables[c1][draggableId];
+                        if ((target = getTargetById(targetId)) === null) {
+                            logme('ERROR: In answer there exists a target ID "' + targetId + '". No target with this ID could be found.');
+
+                            continue;
+                        }
+
+
+                        draggable.setInContainer(false);
+
+                        draggable.el.detach();
+                        draggable.el.css('border', 'none');
+                        draggable.el.css('position', 'absolute');
+                        draggable.el.css('left', answer.draggables[c1][draggableId][0] - 50);
+                        draggable.el.css('top', answer.draggables[c1][draggableId][1] - 50);
+
+                        draggable.el.css('left', target.offset.left + 0.5 * target.w - 50);
+                        draggable.el.css('top', target.offset.top + 0.5 * target.h - 50);
+
+                        draggable.el.appendTo(state.baseImageEl.parent());
+
+                        draggable.setOnTarget(target);
+                        target.draggable.push(draggableId);
+                    }
+                }
+            } else if (
+                ((typeof answer.use_targets === 'boolean') && (answer.use_targets === false)) ||
+                ((typeof answer.use_targets === 'string') && (answer.use_targets === 'false'))
+            ) {
+                for (c1 = 0; c1 < answer.draggables.length; c1++) {
+                    for (draggableId in answer.draggables[c1]) {
+                        if ((draggable = getDraggableById(draggableId)) === null) {
+                            logme('ERROR: In answer there exists a draggable ID "' + draggableId + '". No draggable with this ID could be found.');
+
+                            continue;
+                        }
+
+                        draggable.setInContainer(false);
+
+                        draggable.el.detach();
+                        draggable.el.css('border', 'none');
+                        draggable.el.css('position', 'absolute');
+                        draggable.el.css('left', answer.draggables[c1][draggableId][0] - 50);
+                        draggable.el.css('top', answer.draggables[c1][draggableId][1] - 50);
+                        draggable.el.appendTo(state.baseImageEl.parent());
+
+                        draggable.x = answer.draggables[c1][draggableId][0];
+                        draggable.y = answer.draggables[c1][draggableId][1];
+                    }
+                }
+            } else {
+                logme('ERROR: The type of answer.targets is not supported. answer.targets = ', answer.targets);
+
+                return;
+            }
+        }
+
+        return;
+
+        function getDraggableById(id) {
+            var c1;
+
+            for (c1 = 0; c1 < state.draggables.length; c1 += 1) {
+                if (state.draggables[c1].id === id) {
+                    return state.draggables[c1];
+                }
+            }
+
+            return null;
+        }
+
+        function getTargetById(id) {
+            var c1;
+
+            for (c1 = 0; c1 < state.targets.length; c1 += 1) {
+                if (state.targets[c1].id === id) {
+                    return state.targets[c1];
+                }
+            }
+
+            return null;
+        }
+    }
 });
 
 // End of wrapper for RequireJS. As you can see, we are passing

From 9ef0c563ef12bd122d5a3859699e51cea60ecdbc Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Thu, 27 Dec 2012 12:11:33 +0200
Subject: [PATCH 438/541] Slight changes in UI styling.

---
 .../js/capa/drag_and_drop/draggables.js       |  4 ++
 .../static/js/capa/drag_and_drop/scroller.js  | 48 ++++++++++++-------
 .../js/capa/drag_and_drop/update_input.js     |  2 +
 3 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index 01fc612c5c..acabe50034 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -104,6 +104,8 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
             if (objIndex + 1 === numDraggables) {
                 state.draggablesLoaded = true;
+
+                state.updateArrowOpacity();
             }
 
             return;
@@ -185,6 +187,8 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                     }
                 }
 
+                state.updateArrowOpacity();
+
                 updateInput(state);
 
                 return;
diff --git a/common/static/js/capa/drag_and_drop/scroller.js b/common/static/js/capa/drag_and_drop/scroller.js
index fcd68613cb..d9a43e7735 100644
--- a/common/static/js/capa/drag_and_drop/scroller.js
+++ b/common/static/js/capa/drag_and_drop/scroller.js
@@ -8,7 +8,7 @@ define(['logme'], function (logme) {
     return Scroller;
 
     function Scroller(state) {
-        var parentEl, moveLeftEl, showEl, moveRightEL, showElLeftMargin;
+        var parentEl, moveLeftEl, showEl, moveRightEl, showElLeftMargin;
 
         parentEl = $(
             '<div ' +
@@ -32,11 +32,8 @@ define(['logme'], function (logme) {
             '>' +
                 '<div ' +
                     'style=" ' +
-                        'width: 80%; ' +
-                        'height: 50px; '+
-                        'margin-left: auto; ' +
-                        'margin-right: auto; ' +
-                        'margin-top: 26px; ' +
+                        'width: 38px; ' +
+                        'height: 100px; '+
 
                         'border: 1px solid #CCC; ' +
                         'background-color: #EEE; ' +
@@ -51,8 +48,6 @@ define(['logme'], function (logme) {
                         'background-image: url(\'/static/images/arrow-left.png\'); ' +
                         'background-position: center center; ' +
                         'background-repeat: no-repeat; ' +
-
-                        'border-radius: 35px 0 0 35px; ' +
                     '" ' +
                 '></div>' +
             '</div>'
@@ -77,7 +72,10 @@ define(['logme'], function (logme) {
             state.sliderEl.animate({
                 'margin-left': showElLeftMargin + 'px'
             }, 100, function () {
-                // Check if at the end, and make arrow less visible.
+                // Check if at the end, and make arrow less visibl.
+                logme('showElLeftMargin = ' + showElLeftMargin);
+
+                updateArrowOpacity();
             });
         });
 
@@ -117,11 +115,8 @@ define(['logme'], function (logme) {
             '>' +
                 '<div ' +
                     'style=" ' +
-                        'width: 80%; ' +
-                        'height: 50px; '+
-                        'margin-left: auto; ' +
-                        'margin-right: auto; ' +
-                        'margin-top: 26px; ' +
+                        'width: 38px; ' +
+                        'height: 100px; '+
 
                         'border: 1px solid #CCC; ' +
                         'background-color: #EEE; ' +
@@ -136,8 +131,6 @@ define(['logme'], function (logme) {
                         'background-image: url(\'/static/images/arrow-right.png\'); ' +
                         'background-position: center center; ' +
                         'background-repeat: no-repeat; ' +
-
-                        'border-radius: 0 35px 35px 0; ' +
                     '" ' +
                 '></div>' +
             '</div>'
@@ -159,15 +152,36 @@ define(['logme'], function (logme) {
             }
 
             showElLeftMargin -= 102;
+
             state.sliderEl.animate({
                 'margin-left': showElLeftMargin + 'px'
             }, 100, function () {
                 // Check if at the end, and make arrow less visible.
+                logme('showElLeftMargin = ' + showElLeftMargin);
+                logme('-102 * (state.sliderEl.children().length - 6) = ' + (-102 * (state.sliderEl.children().length - 6)));
+
+                updateArrowOpacity();
             });
         });
 
         parentEl.appendTo(state.containerEl);
-    }
+
+        state.updateArrowOpacity = updateArrowOpacity;
+
+        return;
+
+        function updateArrowOpacity() {
+            moveLeftEl.children('div').css('opacity', '1');
+            moveRightEl.children('div').css('opacity', '1');
+
+            if (showElLeftMargin < -102 * (state.sliderEl.children().length - 6)) {
+                moveRightEl.children('div').css('opacity', '.4');
+            }
+            if (showElLeftMargin > -102) {
+                moveLeftEl.children('div').css('opacity', '.4');
+            }
+        }
+    } // End-of: function Scroller(state)
 });
 
 // End of wrapper for RequireJS. As you can see, we are passing
diff --git a/common/static/js/capa/drag_and_drop/update_input.js b/common/static/js/capa/drag_and_drop/update_input.js
index ed49f3dd85..7b5cd6acfa 100644
--- a/common/static/js/capa/drag_and_drop/update_input.js
+++ b/common/static/js/capa/drag_and_drop/update_input.js
@@ -153,6 +153,8 @@ define(['logme'], function (logme) {
 
                 return;
             }
+
+            state.updateArrowOpacity();
         }
 
         return;

From 3abdd1801d176e9b1a93b0106caf8b7621ec2379 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Thu, 27 Dec 2012 12:18:51 +0200
Subject: [PATCH 439/541] Removed debug comments.

---
 common/static/js/capa/drag_and_drop/scroller.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/scroller.js b/common/static/js/capa/drag_and_drop/scroller.js
index d9a43e7735..46af42bb1b 100644
--- a/common/static/js/capa/drag_and_drop/scroller.js
+++ b/common/static/js/capa/drag_and_drop/scroller.js
@@ -72,9 +72,6 @@ define(['logme'], function (logme) {
             state.sliderEl.animate({
                 'margin-left': showElLeftMargin + 'px'
             }, 100, function () {
-                // Check if at the end, and make arrow less visibl.
-                logme('showElLeftMargin = ' + showElLeftMargin);
-
                 updateArrowOpacity();
             });
         });
@@ -156,10 +153,6 @@ define(['logme'], function (logme) {
             state.sliderEl.animate({
                 'margin-left': showElLeftMargin + 'px'
             }, 100, function () {
-                // Check if at the end, and make arrow less visible.
-                logme('showElLeftMargin = ' + showElLeftMargin);
-                logme('-102 * (state.sliderEl.children().length - 6) = ' + (-102 * (state.sliderEl.children().length - 6)));
-
                 updateArrowOpacity();
             });
         });

From 13d53539f6c29bb37aab6baf0f1551bde3ea93ce Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 27 Dec 2012 12:39:37 +0200
Subject: [PATCH 440/541] bug fix: exception when correct answer not contain
 some user answer

---
 common/lib/capa/capa/graders/draganddrop.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/lib/capa/capa/graders/draganddrop.py b/common/lib/capa/capa/graders/draganddrop.py
index 07c8f60541..ddd94f13fc 100644
--- a/common/lib/capa/capa/graders/draganddrop.py
+++ b/common/lib/capa/capa/graders/draganddrop.py
@@ -92,8 +92,11 @@ def grade(user_input, correct_answer):
              isinstance(user, unicode) and isinstance(correct, str)) else False
 
     for draggable in user_answer['draggables']:
-        if not is_equal(draggable.values()[0],
-                        correct_answer[draggable.keys()[0]]):
+        user_img_location = draggable.values()[0]
+        corr_img_location = correct_answer.get(draggable.keys()[0], None)
+        if not corr_img_location:
+            return False
+        if not is_equal(user_img_location, corr_img_location):
             return False
 
     return True

From 58483319a30706a22686e3d0b5b40fe4ad846321 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Thu, 27 Dec 2012 12:40:05 +0200
Subject: [PATCH 441/541] Refactoring.

---
 .../js/capa/drag_and_drop/draggables.js       | 24 +++++++------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index acabe50034..714fe19597 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -213,38 +213,30 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                 }
 
                 function checkIfOnTarget() {
-                    var c1, c2, target;
+                    var c1, target;
 
-                    c1 = 0;
-
-                    while (c1 < state.targets.length) {
+                    for (c1 = 0; c1 < state.targets.length; c1++) {
                         target = state.targets[c1];
 
                         if (offsetDE.top + 50 < target.offset.top) {
-                            c1 += 1;
                             continue;
                         }
                         if (offsetDE.top + 50 > target.offset.top + target.h) {
-                            c1 += 1;
                             continue;
                         }
                         if (offsetDE.left + 50 < target.offset.left) {
-                            c1 += 1;
                             continue;
                         }
                         if (offsetDE.left + 50 > target.offset.left + target.w) {
-                            c1 += 1;
                             continue;
                         }
 
-                        if (state.config.one_per_target === true) {
-                            if (
-                                (target.draggable.length === 1) &&
-                                (target.draggable[0] !== obj.id)
-                            ) {
-                                c1 += 1;
-                                continue;
-                            }
+                        if (
+                            (state.config.one_per_target === true) &&
+                            (target.draggable.length === 1) &&
+                            (target.draggable[0] !== obj.id)
+                        ) {
+                            continue;
                         }
 
                         targetFound = true;

From d7801fdabe521ecece64eb6245930a820900e29e Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 27 Dec 2012 12:41:09 +0200
Subject: [PATCH 442/541] add test for different keys in correct and iser
 answer

---
 common/lib/capa/capa/graders/tests.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/lib/capa/capa/graders/tests.py b/common/lib/capa/capa/graders/tests.py
index 70208ab327..7b0b719a6a 100644
--- a/common/lib/capa/capa/graders/tests.py
+++ b/common/lib/capa/capa/graders/tests.py
@@ -71,6 +71,12 @@ class Test_DragAndDrop(unittest.TestCase):
         correct_answer = {'1': [[40, 10], 29], 'name_with_icon': [20, 20]}
         self.assertFalse(draganddrop.grade(user_input, correct_answer))
 
+    def test_correct_answer_not_has_key_from_user_answer(self):
+        user_input = '{"use_targets": true, "draggables": [{"1": "t1"}, \
+        {"name_with_icon": "t2"}]}'
+        correct_answer = {'3':   't3', 'name_with_icon': 't2'}
+        self.assertFalse(draganddrop.grade(user_input, correct_answer))
+
 
 def suite():
 

From f2e930a395932dd4e6e4dc5a4404838daaa703ba Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 27 Dec 2012 13:27:55 +0200
Subject: [PATCH 443/541] small improvements

---
 common/lib/capa/capa/graders/draganddrop.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/common/lib/capa/capa/graders/draganddrop.py b/common/lib/capa/capa/graders/draganddrop.py
index ddd94f13fc..1e847b105b 100644
--- a/common/lib/capa/capa/graders/draganddrop.py
+++ b/common/lib/capa/capa/graders/draganddrop.py
@@ -46,7 +46,7 @@ def grade(user_input, correct_answer):
             if use_targets is True:
                 {'1': 't1',  'name_with_icon': 't2'}
             else:
-                {'1': '(10, 10)',  'name_with_icon': '[(10, 10), 20]'}
+                {'1': '[10, 10]',  'name_with_icon': '[[10, 10], 20]'}
 
     Returns:
         True or False.
@@ -68,8 +68,7 @@ def grade(user_input, correct_answer):
 
             Returns: bool.
         """
-        if not isinstance(correct_answer, list) or \
-           not isinstance(user_answer, list):
+        if not isinstance(correct_answer, list) or isinstance(user_answer, list):
             return False
 
         r = 10

From 108b0fc384c1982a6b8704aaedc76873d8be7730 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Thu, 27 Dec 2012 18:03:28 +0200
Subject: [PATCH 444/541] Refactoring and code documentation.

---
 .../js/capa/drag_and_drop/base_image.js       |  34 +---
 .../js/capa/drag_and_drop/config_parser.js    |   4 +-
 .../js/capa/drag_and_drop/draggables.js       | 156 ++++++++++--------
 common/static/js/capa/drag_and_drop/main.js   |  13 +-
 .../static/js/capa/drag_and_drop/scroller.js  |  25 +++
 common/static/js/capa/drag_and_drop/state.js  |   2 +
 .../static/js/capa/drag_and_drop/targets.js   |  52 ++----
 .../js/capa/drag_and_drop/update_input.js     |  13 +-
 8 files changed, 149 insertions(+), 150 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/base_image.js b/common/static/js/capa/drag_and_drop/base_image.js
index 185325512c..9cee42feb2 100644
--- a/common/static/js/capa/drag_and_drop/base_image.js
+++ b/common/static/js/capa/drag_and_drop/base_image.js
@@ -8,53 +8,25 @@ define(['logme'], function (logme) {
     return BaseImage;
 
     function BaseImage(state) {
-        var targetImgSrc, baseImageElContainer, mouseMoveDiv;
-
-        targetImgSrc = state.config.imageDir + '/' + state.config.base_image;
+        var baseImageElContainer;
 
         baseImageElContainer = $(
             '<div ' +
                 'class="base_image_container" ' +
                 'style=" ' +
                     'position: relative; ' +
+                    'margin-bottom: 25px; ' +
                 '" ' +
             '></div>'
         );
 
         state.baseImageEl = $(
             '<img ' +
-                'src="' + targetImgSrc + '" ' +
+                'src="' + state.config.imageDir + '/' + state.config.base_image + '" ' +
             '/>'
         );
         state.baseImageEl.appendTo(baseImageElContainer);
 
-        state.baseImageElWidth = null;
-        $('<img/>') // Make in memory copy of image to avoid css issues.
-            .attr('src', state.baseImageEl.attr('src'))
-            .load(function () {
-                state.baseImageElWidth = this.width;
-            });
-
-        // state.baseImageEl.mousemove(
-        //     function (event) {
-        //         mouseMoveDiv.html(
-        //             '[' + event.offsetX + ', ' + event.offsetY + ']'
-        //         );
-        //     }
-        // );
-
-        mouseMoveDiv = $(
-            '<div ' +
-                'style=" ' +
-                    'clear: both; ' +
-                    'width: auto; ' +
-                    'height: 25px; ' +
-                    'text-align: center; ' +
-                '" ' +
-            '></div>'
-        );
-        mouseMoveDiv.appendTo(baseImageElContainer);
-
         baseImageElContainer.appendTo(state.containerEl);
     }
 });
diff --git a/common/static/js/capa/drag_and_drop/config_parser.js b/common/static/js/capa/drag_and_drop/config_parser.js
index 58f6114009..664324e0b9 100644
--- a/common/static/js/capa/drag_and_drop/config_parser.js
+++ b/common/static/js/capa/drag_and_drop/config_parser.js
@@ -78,9 +78,9 @@ define(['logme'], function (logme) {
 
         if (typeof config.target_outline === 'string') {
             if (config.target_outline.toLowerCase() === 'true') {
-                state.config.target_outline = true;
+                state.config.targetOutline = true;
             } else if (config.target_outline.toLowerCase() === 'false') {
-                state.config.target_outline = false;
+                state.config.targetOutline = false;
             } else {
                 logme('ERROR: Property config.target_outline can either be "true", or "false".');
                 returnStatus = false;
diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index 714fe19597..faf0f7b3f3 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -8,22 +8,13 @@ define(['logme', 'update_input'], function (logme, updateInput) {
     return Draggables;
 
     function Draggables(state) {
-        var _draggables, numDraggables;
+        var c1;
 
-        numDraggables = state.config.draggables.length;
-        _draggables = [];
         state.draggables = [];
 
-        (function (i) {
-            while (i < numDraggables) {
-                processDraggable(state.config.draggables[i], i + 1);
-                i += 1;
-            }
-
-            if (state.individualTargets === false) {
-                updateInput(state, true);
-            }
-        }(0));
+        for (c1 = 0; c1 < state.config.draggables.length; c1 += 1) {
+            processDraggable(state.config.draggables[c1], c1 + 1);
+        }
 
         state.currentMovingDraggable = null;
 
@@ -39,8 +30,8 @@ define(['logme', 'update_input'], function (logme, updateInput) {
         return;
 
         function processDraggable(obj, objIndex) {
-            var draggableContainerEl, imgEl, inContainer, ousePressed,
-                onTarget, draggableObj, marginCss;
+            var draggableContainerEl, inContainer, mousePressed, onTarget,
+                draggableObj, marginCss;
 
             draggableContainerEl = $(
                 '<div ' +
@@ -51,20 +42,16 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         'float: left; ' +
                         'overflow: hidden; ' +
                         'z-index: ' + objIndex + '; ' +
-                        'border: 1px solid gray; ' +
+                        'border: 1px solid #CCC; ' +
                     '" ' +
                     'data-draggable-position-index="' + objIndex + '" ' +
                     '></div>'
             );
 
             if (obj.icon.length > 0) {
-                imgEl = $(
-                    '<img ' +
-                        'src="' + state.config.imageDir + '/' + obj.icon + '" ' +
-                    '/>'
+                draggableContainerEl.append(
+                    $('<img src="' + state.config.imageDir + '/' + obj.icon + '" />')
                 );
-
-                draggableContainerEl.append(imgEl);
             }
 
             if (obj.label.length > 0) {
@@ -80,7 +67,6 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             }
 
             draggableContainerEl.appendTo(state.sliderEl);
-            _draggables.push(draggableContainerEl);
 
             inContainer = true;
             mousePressed = false;
@@ -102,12 +88,6 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             draggableContainerEl.mouseup(mouseUp);
             draggableContainerEl.mousemove(mouseMove);
 
-            if (objIndex + 1 === numDraggables) {
-                state.draggablesLoaded = true;
-
-                state.updateArrowOpacity();
-            }
-
             return;
 
             function mouseDown(event) {
@@ -134,10 +114,9 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                 }
             }
 
-            function mouseUp(event) {
+            function mouseUp() {
                 if (mousePressed === true) {
                     state.currentMovingDraggable = null;
-                    normalizeEvent(event);
 
                     checkLandingElement(event);
                 }
@@ -150,14 +129,30 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                 }
             }
 
-            function checkLandingElement(event) {
+            // At this point the mouse was realeased, and we need to check
+            // where the draggable eneded up. Based on several things, we
+            // will either move the draggable back to the slider, or update
+            // the input with the user's answer (X-Y position of the draggable,
+            // or the ID of the target where it landed.
+            function checkLandingElement() {
                 var offsetDE, indexes, DEindex, targetFound;
 
                 mousePressed = false;
 
                 offsetDE = draggableContainerEl.position();
 
-                if (state.individualTargets === false) {
+                if (state.individualTargets === true) {
+                    targetFound = false;
+
+                    checkIfOnTarget();
+
+                    if (targetFound === true) {
+                        correctZIndexes();
+                    } else {
+                        moveBackToSlider();
+                        removeObjIdFromTarget();
+                    }
+                } else {
                     if (
                         (offsetDE.left < 0) ||
                         (offsetDE.left + 100 > state.baseImageEl.width()) ||
@@ -174,21 +169,9 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         draggableObj.x = offsetDE.left + 50;
                         draggableObj.y = offsetDE.top + 50;
                     }
-                } else if (state.individualTargets === true) {
-                    targetFound = false;
-
-                    checkIfOnTarget();
-
-                    if (targetFound === true) {
-                        correctZIndexes();
-                    } else {
-                        moveBackToSlider();
-                        removeObjIdFromTarget();
-                    }
                 }
 
                 state.updateArrowOpacity();
-
                 updateInput(state);
 
                 return;
@@ -197,25 +180,26 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                     var c1;
 
                     if (onTarget !== null) {
-                        c1 = 0;
-
-                        while (c1 < onTarget.draggable.length) {
+                        for (c1 = 0; c1 < onTarget.draggable.length; c1 += 1) {
                             if (onTarget.draggable[c1] === obj.id) {
                                 onTarget.draggable.splice(c1, 1);
 
                                 break;
                             }
-                            c1 += 1;
                         }
 
                         onTarget = null;
                     }
                 }
 
+                // Determine if a draggable, after it was relased, ends up on a
+                // target. We do this by iterating over all of the targets, and
+                // for each one we check whether the draggable's center is
+                // within the target's dimensions.
                 function checkIfOnTarget() {
                     var c1, target;
 
-                    for (c1 = 0; c1 < state.targets.length; c1++) {
+                    for (c1 = 0; c1 < state.targets.length; c1 += 1) {
                         target = state.targets[c1];
 
                         if (offsetDE.top + 50 < target.offset.top) {
@@ -241,10 +225,21 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
                         targetFound = true;
 
-                        removeObjIdFromTarget();
-                        onTarget = target;
+                        // If the draggable was moved from one target to
+                        // another, then we need to remove it's ID from the
+                        // previous target's draggables list, and add it to the
+                        // new target's draggables list.
+                        if ((onTarget !== null) && (onTarget.id !== target.id)) {
+                            removeObjIdFromTarget();
+                            onTarget = target;
+                            target.draggable.push(obj.id);
+                        } else if (onTarget === null) {
+                            onTarget = target;
+                            target.draggable.push(obj.id);
+                        }
 
-                        target.draggable.push(obj.id);
+                        // Reposition the draggable so that it's center
+                        // coincides with the center of the target.
                         snapToTarget(target);
 
                         break;
@@ -256,30 +251,47 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                     draggableContainerEl.css('top', target.offset.top + 0.5 * target.h - 50);
                 }
 
+                // Go through all of the draggables subtract 1 from the z-index
+                // of all whose z-index is higher than the old z-index of the
+                // current element. After, set the z-index of the current
+                // element to 1 + N (where N is the number of draggables - i.e.
+                // the highest z-index possible).
+                //
+                // This will make sure that after releasing a draggable, it
+                // will be on top of all of the other draggables. Also, the
+                // ordering of the visibility (z-index) of the other draggables
+                // will not change.
                 function correctZIndexes() {
                     var c1;
 
-                    c1 = 0;
-
-                    while (c1 < _draggables.length) {
-                        if (parseInt(draggableContainerEl.attr('data-old-z-index'), 10) < parseInt(_draggables[c1].css('z-index'), 10)) {
-                            _draggables[c1].css('z-index', parseInt(_draggables[c1].css('z-index'), 10) - 1);
+                    for (c1 = 0; c1 < state.draggables.length; c1++) {
+                        if (
+                            parseInt(draggableContainerEl.attr('data-old-z-index'), 10) <
+                            parseInt(state.draggables[c1].el.css('z-index'), 10)
+                        ) {
+                            state.draggables[c1].el.css(
+                                'z-index',
+                                parseInt(state.draggables[c1].el.css('z-index'), 10) - 1
+                            );
                         }
-                        c1 += 1;
                     }
 
                     draggableContainerEl.css('z-index', c1);
                 }
 
+                // If a draggable was released in a wrong positione, we will
+                // move it back to the slider, placing it in the same position
+                // that it was dragged out of.
                 function moveBackToSlider() {
                     var c1;
 
                     draggableContainerEl.detach();
                     draggableContainerEl.css('position', 'static');
 
+                    // Get the position indexes of all draggables that are
+                    // currently in the slider, along with the corresponding
+                    // jQuery element.
                     indexes = [];
-                    DEindex = parseInt(draggableContainerEl.attr('data-draggable-position-index'), 10);
-
                     state.sliderEl.children().each(function (index, value) {
                         indexes.push({
                             'index': parseInt($(value).attr('data-draggable-position-index'), 10),
@@ -287,27 +299,39 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         });
                     });
 
-                    c1 = 0;
+                    // Get the position index of the element that we are
+                    // inserting back into the slider.
+                    DEindex = parseInt(draggableContainerEl.attr('data-draggable-position-index'), 10);
 
-                    while (c1 < indexes.length) {
+                    // Starting from the first position index that we
+                    // retrieved, and going up, if we find a position index
+                    // that is more than 'DEindex', we know that we must insert
+                    // the current element before the element with the greater
+                    // position index.
+                    for (c1 = 0; c1 < indexes.length; c1 += 1) {
                         if ((inContainer === false) && (indexes[c1].index > DEindex)) {
                             indexes[c1].el.before(draggableContainerEl);
                             inContainer = true;
                         }
-
-                        c1 += 1;
                     }
 
+                    // If we did not find a greater postion index, then either
+                    // there are no elements in the slider, or all of them
+                    // have a lesser position index. In both cases we add the
+                    // current draggable to the end.
                     if (inContainer === false) {
                         draggableContainerEl.appendTo(state.sliderEl);
-                        inContainer = true;
                     }
 
+                    inContainer = true;
+
                     draggableContainerEl.css('border', '1px solid gray');
                 }
             }
         }
 
+        // In firefox the event does not have a proper pageX and pageY
+        // coordinates.
         function normalizeEvent(event) {
             if(!event.offsetX) {
                 event.offsetX = (event.pageX - $(event.target).offset().left);
diff --git a/common/static/js/capa/drag_and_drop/main.js b/common/static/js/capa/drag_and_drop/main.js
index 9027f55d01..0ccfb47051 100644
--- a/common/static/js/capa/drag_and_drop/main.js
+++ b/common/static/js/capa/drag_and_drop/main.js
@@ -5,8 +5,10 @@
 (function (requirejs, require, define) {
 
 define(
-    ['logme', 'state', 'config_parser', 'container', 'base_image', 'scroller', 'draggables', 'targets'],
-    function (logme, State, configParser, Container, BaseImage, Scroller, Draggables, Targets) {
+    ['logme', 'state', 'config_parser', 'container', 'base_image', 'scroller',
+     'draggables', 'targets', 'update_input'],
+    function (logme, State, configParser, Container, BaseImage, Scroller,
+              Draggables, Targets, updateInput) {
     return Main;
 
     function Main() {
@@ -58,12 +60,13 @@ define(
 
         Container(state);
         BaseImage(state);
+        Targets(state);
         Scroller(state);
         Draggables(state);
-        Targets(state);
 
-        logme('config', config);
-        logme('state', state);
+        // Update the input element, checking first that it is not filled with
+        // an answer from the server.
+        updateInput(state, true);
     }
 });
 
diff --git a/common/static/js/capa/drag_and_drop/scroller.js b/common/static/js/capa/drag_and_drop/scroller.js
index 46af42bb1b..d3a4d23eab 100644
--- a/common/static/js/capa/drag_and_drop/scroller.js
+++ b/common/static/js/capa/drag_and_drop/scroller.js
@@ -61,14 +61,20 @@ define(['logme'], function (logme) {
         moveLeftEl.mousemove(function (event) { event.preventDefault(); });
         moveLeftEl.mousedown(function (event) { event.preventDefault(); });
 
+        // This event will be responsible for moving the scroller left.
+        // Hidden draggables will be shown.
         moveLeftEl.mouseup(function (event) {
             event.preventDefault();
 
+            // When there are no more hidden draggables, prevent from
+            // scrolling infinitely.
             if (showElLeftMargin > -102) {
                 return;
             }
 
             showElLeftMargin += 102;
+
+            // We scroll by changing the 'margin-left' CSS property smoothly.
             state.sliderEl.animate({
                 'margin-left': showElLeftMargin + 'px'
             }, 100, function () {
@@ -91,6 +97,10 @@ define(['logme'], function (logme) {
 
         showElLeftMargin = 0;
 
+        // Element where the draggables will be contained. It is very long
+        // so that any SANE number of draggables will fit in a single row. It
+        // will be contained in a parent element whose 'overflow' CSS value
+        // will be hidden, preventing the long row from fully being visible.
         state.sliderEl = $(
             '<div ' +
                 'style=" ' +
@@ -141,15 +151,20 @@ define(['logme'], function (logme) {
         moveRightEl.mousemove(function (event) { event.preventDefault(); });
         moveRightEl.mousedown(function (event) { event.preventDefault(); });
 
+        // This event will be responsible for moving the scroller right.
+        // Hidden draggables will be shown.
         moveRightEl.mouseup(function (event) {
             event.preventDefault();
 
+            // When there are no more hidden draggables, prevent from
+            // scrolling infinitely.
             if (showElLeftMargin < -102 * (state.sliderEl.children().length - 6)) {
                 return;
             }
 
             showElLeftMargin -= 102;
 
+            // We scroll by changing the 'margin-left' CSS property smoothly.
             state.sliderEl.animate({
                 'margin-left': showElLeftMargin + 'px'
             }, 100, function () {
@@ -159,6 +174,16 @@ define(['logme'], function (logme) {
 
         parentEl.appendTo(state.containerEl);
 
+        // Make the function available throughout the application. We need to
+        // call it in several places:
+        //
+        // 1.) When initially reading answer from server, if draggables will be
+        // positioned on the base image, the scroller's right and left arrows
+        // opacity must be updated.
+        //
+        // 2.) When creating draggable elements, the scroller's right and left
+        // arrows opacity must be updated according to the number of
+        // draggables.
         state.updateArrowOpacity = updateArrowOpacity;
 
         return;
diff --git a/common/static/js/capa/drag_and_drop/state.js b/common/static/js/capa/drag_and_drop/state.js
index eb693347d7..5bf957eff5 100644
--- a/common/static/js/capa/drag_and_drop/state.js
+++ b/common/static/js/capa/drag_and_drop/state.js
@@ -11,6 +11,8 @@ define([], function () {
         return {
             'problemId': problemId,
 
+            // Will indicate when all targetsand draggables have been loaded,
+            // processed, and postioned intially.
             'targetsLoaded': false,
             'draggablesLoaded': false
         };
diff --git a/common/static/js/capa/drag_and_drop/targets.js b/common/static/js/capa/drag_and_drop/targets.js
index 8a98cee473..e00bfdb4b5 100644
--- a/common/static/js/capa/drag_and_drop/targets.js
+++ b/common/static/js/capa/drag_and_drop/targets.js
@@ -4,48 +4,29 @@
 // See https://edx-wiki.atlassian.net/wiki/display/LMS/Integration+of+Require+JS+into+the+system
 (function (requirejs, require, define) {
 
-define(['logme', 'update_input'], function (logme, updateInput) {
+define(['logme'], function (logme) {
     return Targets;
 
     function Targets(state) {
-        var numTargets;
+        var c1;
 
-        numTargets = state.config.targets.length;
         state.targets = [];
 
-        (function (c1) {
-            while (c1 < numTargets) {
-                processTarget(state.config.targets[c1], c1);
-                c1 += 1;
-            }
-
-            if (state.individualTargets === true) {
-                updateInput(state, true);
-            }
-        }(0));
+        for (c1 = 0; c1 < state.config.targets.length; c1++) {
+            processTarget(state.config.targets[c1]);
+        }
 
         return;
 
-        function processTarget(obj, objIndex) {
-            var baseImageElOffset, tEl, left, borderCss;
-
-            // if (state.baseImageElWidth === null) {
-            //     window.setTimeout(function () {
-            //         processTarget(obj);
-            //     }, 50);
-            //
-            //     return;
-            // }
-
-            // left = obj.x + 0.5 * (state.baseImageEl.parent().width() - state.baseImageElWidth);
-            left = obj.x;
+        function processTarget(obj) {
+            var targetEl, borderCss;
 
             borderCss = '';
-            if (state.config.target_outline === true) {
+            if (state.config.targetOutline === true) {
                 borderCss = 'border: 1px dashed gray; ';
             }
 
-            tEl = $(
+            targetEl = $(
                 '<div ' +
                     'style=" ' +
                         'display: block; ' +
@@ -53,27 +34,26 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         'width: ' + obj.w + 'px; ' +
                         'height: ' + obj.h + 'px; ' +
                         'top: ' + obj.y + 'px; ' +
-                        'left: ' + left + 'px; ' +
+                        'left: ' + obj.x + 'px; ' +
                         borderCss +
                     '" ' +
                     'data-target-id="' + obj.id + '" ' +
                 '></div>'
             );
 
-            tEl.appendTo(state.baseImageEl.parent());
+            targetEl.appendTo(state.baseImageEl.parent());
 
             state.targets.push({
                 'id': obj.id,
-                'offset': tEl.position(),
+
                 'w': obj.w,
                 'h': obj.h,
-                'el': tEl,
+
+                'el': targetEl,
+                'offset': targetEl.position(),
+
                 'draggable': []
             });
-
-            if (objIndex + 1 === numTargets) {
-                state.targetsLoaded = true;
-            }
         }
     }
 });
diff --git a/common/static/js/capa/drag_and_drop/update_input.js b/common/static/js/capa/drag_and_drop/update_input.js
index 7b5cd6acfa..6ebf62ef11 100644
--- a/common/static/js/capa/drag_and_drop/update_input.js
+++ b/common/static/js/capa/drag_and_drop/update_input.js
@@ -54,6 +54,8 @@ define(['logme'], function (logme) {
         inputEl = $('#input_' + state.problemId);
         inputEl.val(stateStr);
 
+        logme(inputEl.val());
+
         return;
 
         // Check if input has an answer from server. If yes, then position
@@ -75,16 +77,7 @@ define(['logme'], function (logme) {
             var draggableId, draggable, targetId, target, draggablePosition,
                 c1;
 
-            if (
-                ((state.individualTargets === true) && (state.targetsLoaded === false)) ||
-                (state.draggablesLoaded === false)
-            ) {
-                window.setTimeout(function () {
-                    repositionDraggables(answer);
-                }, 50);
-
-                return;
-            }
+            logme(answer);
 
             if (
                 ((typeof answer.use_targets === 'boolean') && (answer.use_targets === true)) ||

From 505fefb802444a54b84211e4241ce7401ffd4006 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Thu, 27 Dec 2012 18:18:53 +0200
Subject: [PATCH 445/541] Initiated DOCS for Drag and Drop.

---
 docs/source/drag_and_drop_input.rst | 352 ++++++++++++++++++++++++++++
 docs/source/xml_formats.rst         |   3 +-
 2 files changed, 354 insertions(+), 1 deletion(-)
 create mode 100644 docs/source/drag_and_drop_input.rst

diff --git a/docs/source/drag_and_drop_input.rst b/docs/source/drag_and_drop_input.rst
new file mode 100644
index 0000000000..d977270269
--- /dev/null
+++ b/docs/source/drag_and_drop_input.rst
@@ -0,0 +1,352 @@
+**********************************************
+Xml format of drag and drop input [inputtypes]
+**********************************************
+
+.. module:: drag_and_drop_input
+
+Format description
+==================
+
+Graphical slider tool (GST) main tag is::
+
+    <graphical_slider_tool> BODY </graphical_slider_tool>
+
+``graphical_slider_tool`` tag must have two children tags: ``render``
+and ``configuration``.
+
+Render tag
+----------
+
+Render tag can contain usual html tags mixed with some GST specific tags::
+
+    <slider/> - represents jQuery slider
+    <textbox/> - represents input
+    <plot/> - represents Flot plot
+
+Also GST will track all elements inside ``<render></render>`` where ``id``
+attribute is set.
+
+The contents of the <render> section will be shown to the user after
+all occurrences of::
+
+    <slider var="{parameter name}" [style="{CSS statements}"]/>
+    <input var="parameter name" [style="{CSS statements}"] [readonly="true" | readonly="false"]/>
+    <plot [style="{CSS statements}"]/>
+
+have been converted to actual sliders, text inputs, and a plot graph.
+Everything in square brackets is optional.
+
+``{parameter name}`` specifies the parameter to which the slider or text
+input will be attached to.
+
+There is a one-to-one relationship between a slider and a parameter.
+I.e. for one parameter you can put only one ``<slider ...<`` in the
+``<render>`` section. However, you don't have to specify a slider - they
+are optional.
+
+There is a many-to-one relationship between text inputs and a
+parameter. I.e. for one parameter you can put many '<input ...<' in
+the ``<render>`` section. However, you don't have to specify a text
+input - they are optional.
+
+You can put only one ``<plot ...<`` in the ``<render>`` section. It is not
+required.
+
+NOTE: MathJax, independently of this module, will render all TeX code
+within the ``<render>`` section into nice mathematical formulas. Just
+remember to wrap it in one of::
+
+    \(  and  \)  -  for inline formulas (formulas surrounded by
+                  standard text)
+    \[  and  \]  -  if you want the formula to be a separate line
+
+Slider tag
+..........
+
+Slider tag must have ``var`` attribute and optional ``style`` attribute::
+
+    <slider var='a' style="width:400px;float:left;"/>
+
+After processing slider tags will be replaced by jQuery UI sliders with applied
+``style`` attribute.
+
+
+``Var`` attribute must correspond to parameter in one of ``function`` tags in
+``functions`` tag. By moving slider, value of parameter ``a`` will change, and so
+result of function, that depends on parameter ``a``, will change.
+
+
+Textbox tag
+...........
+
+
+Texbox tag must have ``var`` attribute and optional ``style`` and ``readonly``
+attributes::
+
+    <textbox var="b" readonly="true" style="width:50px; float:left; margin-left:10px;"/>
+
+After processing tetbox tags will be replaced by html inputs with applied
+``style`` attribute. If ``readonly`` is set to ``true`` input will be
+not-editable, default is ``false``.
+
+``Var`` attribute must correspond to parameter in one of ``function`` tags in
+``functions`` tag. By entering value in input, value of parameter ``b`` will change, and so
+result of function, that depends on parameter ``b``, will change.
+
+Plot tag
+........
+
+Plot tag may have optional ``style`` attribute::
+
+    <plot style="width:50px; float:left; margin-left:10px;"/>
+
+After processing plot tags will be replaced by Flot plot with applied
+``style`` attribute.
+
+HTML tags with id
+.................
+
+Any html tag with id, e.g. ``<span id="answer_span_1">`` will be counted as
+place where result of function can be rendered. To render function result to
+element, element id must be included in ``function`` tag as ``el_id`` attribute
+and ``output`` value must be ``"element"``::
+
+    <function output="element" el_id="answer_span_1">
+                    function add(a, b, precision) {
+                        var x = Math.pow(10, precision || 2);
+                        return (Math.round(a * x) + Math.round(b * x)) / x;
+                    }
+
+                    return add(a, b, 5);
+    </function>
+
+
+
+Configuration tag
+-----------------
+
+The configuration tag contain sparameter settings, graph
+settings, and function definitions which are to be plotted on the
+graph and that use specified parameters.
+
+Configuration tag contains two mandatory tag ``functions`` and ``parameters`` and
+may contain another ``plot`` tag.
+
+Parameters tag
+..............
+
+``Parameters`` tag contains ``parameter`` tags. Each ``parameter`` tag must have
+``var``, ``max``, ``min``, ``step`` and ``initial`` attributes::
+
+        <parameters>
+                <param var="a" min="-10.0" max="10.0" step="0.1" initial="0" />
+                <param var="b" min="-10.0" max="10.0" step="0.1" initial="0" />
+        </parameters>
+
+``Var`` attribute links min, max, step and initial values to parameter name.
+``Min`` attribute is minimal value that parameter can take. Slider and input
+values can not go below it.
+
+``Max`` attribute is maximal value that parameter can take. Slider and input
+values can not go over it.
+
+``Step`` attribute is value of slider step. When a slider increase or decreases
+the specified parameter, it will do so by the amount specified with 'step'
+
+``Initial`` attribute is the initial value that the specified parameter should be
+set to.
+
+The parameter's name is specified by the 'var' property. All occurrences
+of sliders and/or text inputs that specify a 'var' property, will be
+connected to this parameter - i.e. they will reflect the current
+value of the parameter and will be updated when the parameter
+changes.
+
+
+If at lest one of these attributes is not set, then the parameter
+will not be used, slider's and/or text input elements that specify
+this parameter will not be activated, and the specified functions
+which use this parameter will return a non valid value. This means
+that neglecting to specify at least one of the attributes for some
+parameter will have the result of the whole GST instance not working
+properly.
+
+
+Functions tag
+.............
+
+
+For the GST to do something, you must defined at least one
+function, which can use any of the specified parameter values. The
+function expects to take the ``x`` value, do some calculations, and
+return the ``y`` value. I.e. this is a 2D plot in Cartesian
+coordinates.
+
+Each function must be defined inside ``function`` tag in  ``functions`` tag::
+
+    <functions>
+        <function output="element" el_id="answer_span_1">
+            function add(a, b, precision) {
+                var x = Math.pow(10, precision || 2);
+                return (Math.round(a * x) + Math.round(b * x)) / x;
+            }
+
+            return add(a, b, 5);
+        </function>
+    </functions>
+
+The parameter names (along with their values, as provided from text
+inputs and/or sliders), will be available inside all defined
+functions. A defined function body string will be parsed internally
+by the browser's JavaScript engine and converted to a true JS
+function.
+
+The function's parameter list will automatically be created and
+populated, and will include the ``x``, and all of the specified
+parameter values (from sliders and text inputs). This means that
+each of the defined functions will have access to all of the
+parameter values. You don't have to use them, but they will be
+there.
+
+Examples::
+
+    <function>
+        return x;
+    </function>
+
+    <function dot="true" label="\(y_2\)">
+        return (x + a) * Math.sin(x * b);
+    </function>
+
+    <function color="green">
+        function helperFunc(c1) {
+            return c1 * c1 - a;
+        }
+        return helperFunc(x + 10 * a * b) + Math.sin(a - x);
+    </function>
+
+Required parameters::
+
+    function body:
+
+    A string composing a normal JavaScript function
+    except that there is no function declaration
+    (along with parameters), and no closing bracket.
+
+    So if you normally would have written your
+    JavaScript function like this:
+
+        function myFunc(x, a, b) {
+            return x * a + b;
+        }
+
+    here you must specify just the function body
+    (everything that goes between '{' and '}'). So,
+    you would specify the above function like so (the
+    bare-bone minimum):
+
+        <function>
+            return x * a + b;
+        </function>
+
+Optional parameters::
+
+
+    color:  Color name (red, green, etc.) or in the form of
+            '#FFFF00'. If not specified, a default color (different
+            one for each function) will be given by Flot;
+    line:   A string - 'true' or 'false'. Should the data points be
+            connected by a line on the graph? Default is 'true'.
+    dot:    A string - 'true' or 'false'. Should points be shown for
+            each data point on the graph? Default is 'false'.
+    label:  A string. If provided, will be shown in the legend, along
+            with the color that was used to plot the function.
+    output: "element" or "plot". If not defined, function will be plotted.
+            If defined, function will not be plotted, but rendered to element
+            with id set in 'el_id' attribute.
+    el_id:  Id of html element, defined in 'render' section. Value of
+            function will be rendered to content of this element.
+
+With ``output`` and ``el_id`` set together you can update html elements with
+function value, also function will not be plotted.
+
+[note on MathJax and labels]:
+
+It is possible to define a label in standard TeX notation. The JS
+library MathJax will work on these labels also because they are
+inserted on top of the plot as standard HTML (text within a DIV).
+
+Plot tag
+........
+
+``Plot`` tag inside ``configuration`` tag defines settings for plot output.
+
+Required parameters::
+
+    xrange: 2 functions that must return value. Value is constant (3.1415)
+            or depend on parameter from parameters section:
+                <xrange>
+                    <min>return 0;</min>
+                    <max>return 30;</max>
+                </xrange>
+                                        or
+                <xrange>
+                    <min>return -a;</min>
+                    <max>return a;</max>
+                </xrange>
+
+            All functions will be calculated over domain between xrange:min
+            and xrange:max. Xrange depending on parameter is extremely
+            useful when domain(s) of your function(s) depends on parameter
+            (like circle, when parameter is radius and you want to allow
+            to change it).
+
+Optional parameters::
+
+    num_points: Number of data points to generated for the plot. If
+                this is not set, the number of points will be
+                calculated as width / 5.
+    xticks,
+    yticks:    3 floating point numbers separated by commas. This
+               specifies how many ticks are created, what number they
+               start at, and what number they end at. This is different
+               from the 'xrange' setting in that it has nothing to do
+               with the data points - it control what area of the
+               Cartesian space you will see. The first number is the
+               first tick's value, the second number is the step
+               between each tick, the third number is the value of the
+               last tick. If these configurations are not specified,
+               Flot will chose them for you based on the data points
+               set that he is currently plotting. Usually, this results
+               in a nice graph, however, sometimes you need to fine
+               grain the controls. For example, when you want to show
+               a fixed area of the Cartesian space, even when the data
+               set changes. On it's own, Flot will recalculate the
+               ticks, which will result in a different graph each time.
+               By specifying the xticks, yticks configurations, only
+               the plotted data will change - the axes (ticks) will
+               remain as you have defined them.
+
+    xunits,
+    yunits:   Units values to be set on axes. Use MathJax. Example:
+                <xunits>\(cm\)</xunits>
+                <yunits>\(m\)</yunits>
+
+Example
+=======
+
+Plotting, sliders and inputs
+----------------------------
+
+.. literalinclude:: gst_example_with_documentation.xml
+
+Update of html elements, no plotting
+------------------------------------
+
+.. literalinclude:: gst_example_html_element_output.xml
+
+
+Circle with dynamic radius
+--------------------------
+
+.. literalinclude:: gst_example_dynamic_range.xml
diff --git a/docs/source/xml_formats.rst b/docs/source/xml_formats.rst
index b76ee11642..7c92546a5e 100644
--- a/docs/source/xml_formats.rst
+++ b/docs/source/xml_formats.rst
@@ -5,4 +5,5 @@ Contents:
 .. toctree::
    :maxdepth: 2
 
-   graphical_slider_tool.rst
\ No newline at end of file
+   graphical_slider_tool.rst
+   drag_and_drop_input.rst

From f1f3b2ea8ba5ad7c14c0108109f97f13fc5496df Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Fri, 28 Dec 2012 09:52:26 +0200
Subject: [PATCH 446/541] Slight UI design change. Draggables are now
 positioned in the center of their container DIV.

---
 common/static/js/capa/drag_and_drop/draggables.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index faf0f7b3f3..1c4a6cad8b 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -43,6 +43,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         'overflow: hidden; ' +
                         'z-index: ' + objIndex + '; ' +
                         'border: 1px solid #CCC; ' +
+                        'text-align: center; ' +
                     '" ' +
                     'data-draggable-position-index="' + objIndex + '" ' +
                     '></div>'

From 744b7947e60ea10a5dc78fe7e79ff76bd91ba56a Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Fri, 28 Dec 2012 11:00:55 +0200
Subject: [PATCH 447/541] Added initial docs for Drag and Drop.

---
 docs/source/drag-n-drop-demo.xml    | 188 ++++++++++++++
 docs/source/drag_and_drop_input.rst | 376 ++++------------------------
 2 files changed, 243 insertions(+), 321 deletions(-)
 create mode 100644 docs/source/drag-n-drop-demo.xml

diff --git a/docs/source/drag-n-drop-demo.xml b/docs/source/drag-n-drop-demo.xml
new file mode 100644
index 0000000000..574a188c33
--- /dev/null
+++ b/docs/source/drag-n-drop-demo.xml
@@ -0,0 +1,188 @@
+<problem display_name="Drag and drop demo" >
+
+<text>
+    <p>
+      Drag and drop pictures to proper positions.
+    </p>
+    <p>
+      Drag images to the cow)).
+    </p>
+</text>
+
+<customresponse>
+    <text>
+        <h3>Individual targets with outlines. One draggable per target.</h3>
+        <p> Drag ant to first and star to 3rd. </p>
+        <br />
+    </text>
+
+    <drag_and_drop_input img="cow.png" target_outline="true">
+        <draggable id="1" label="Label 1"/>
+        <draggable id="name_with_icon" label="Ant" icon="images_list/ant.jpg"/>
+        <draggable id="with_icon" label="Cloud" icon="images_list/cloud.jpg" />
+        <draggable id="5" label="Label2" />
+        <draggable id="2" label="Drop" icon="images_list/drop.jpg" />
+        <draggable id="name_label_icon3" label="Grass" icon="images_list/grass.jpg" />
+        <draggable id="name4" label="Star" icon="images_list/star.png" />
+        <draggable id="7" label="Label3" />
+
+        <target id="t1" x="20" y="20" w="90" h="90"/>
+        <target id="t2" x="300" y="100" w="90" h="90"/>
+        <target id="t3" x="150" y="40" w="50" h="50"/>
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = {'name_with_icon': 't1', 'name4': 't2'}
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h3>
+            Individual targets WITHOUT outlines. Move Star to the
+            volcano opening, and Label3 on to the right ear of the cow.
+            One draggable per target.
+        </h3>
+        <br />
+    </text>
+
+    <drag_and_drop_input img="cow.png" target_outline="false">
+        <draggable id="1" label="Label 1"/>
+        <draggable id="name_with_icon" label="Ant" icon="images_list/ant.jpg"/>
+        <draggable id="with_icon" label="Cloud" icon="images_list/cloud.jpg" />
+        <draggable id="5" label="Label2" />
+        <draggable id="2" label="Drop" icon="images_list/drop.jpg" />
+        <draggable id="name_label_icon3" label="Grass" icon="images_list/grass.jpg" />
+        <draggable id="name4" label="Star" icon="images_list/star.png" />
+        <draggable id="7" label="Label3" />
+
+        <target id="t1" x="210" y="90" w="90" h="90"/>
+        <target id="t2" x="400" y="190" w="90" h="90"/>
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = {'name4': 't1',
+                '7': 't2'}
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h3>Many draggable per target. Move star and ant to most left target
+            and lable 3 and label 2 to most right target.</h3>
+        <br />
+    </text>
+
+    <drag_and_drop_input img="cow.png" target_outline="true" one_per_target="false">
+        <draggable id="1" label="Label 1"/>
+        <draggable id="name_with_icon" label="Ant" icon="images_list/ant.jpg"/>
+        <draggable id="with_icon" label="Cloud" icon="images_list/cloud.jpg" />
+        <draggable id="5" label="Label2" />
+        <draggable id="2" label="Drop" icon="images_list/drop.jpg" />
+        <draggable id="name_label_icon3" label="Grass" icon="images_list/grass.jpg" />
+        <draggable id="name4" label="Star" icon="images_list/star.png" />
+        <draggable id="7" label="Label3" />
+
+        <target id="t1" x="20" y="20" w="90" h="90"/>
+        <target id="t2" x="300" y="100" w="90" h="90"/>
+        <target id="t3" x="150" y="40" w="50" h="50"/>
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = {'name4': 't1',
+                'name_with_icon': 't1',
+                '5': 't2',
+                '7':'t2'}
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h3>Draggables can be places anywhere on base image.
+            Place grass in the middle of the image and ant in the
+            right upper corner.</h3>
+        <br />
+    </text>
+
+    <drag_and_drop_input img="cow.png" >
+        <draggable id="1" label="Label 1"/>
+        <draggable id="ant" label="Ant" icon="images_list/ant.jpg"/>
+        <draggable id="with_icon" label="Cloud" icon="images_list/cloud.jpg" />
+        <draggable id="5" label="Label2" />
+        <draggable id="2" label="Drop" icon="images_list/drop.jpg" />
+        <draggable id="grass" label="Grass" icon="images_list/grass.jpg" />
+        <draggable id="name4" label="Star" icon="images_list/star.png" />
+        <draggable id="7" label="Label3" />
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = {'grass':     [[300, 200], 200],
+                  'ant': [[500, 0], 200]}
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h3>Please identify the Carbon and Oxygen atoms in the molecule.</h3>
+        <br />
+    </text>
+
+    <drag_and_drop_input img="images_list/ethglycol.jpg" target_outline="true" one_per_target="true">
+        <draggable id="l1_c" label="Carbon" />
+        <draggable id="l2" label="Methane"/>
+        <draggable id="l3_o" label="Oxygen" />
+        <draggable id="l4" label="Calcium" />
+        <draggable id="l5" label="Methane"/>
+        <draggable id="l6" label="Calcium" />
+        <draggable id="l7" label="Hydrogen" />
+        <draggable id="l8_c" label="Carbon" />
+        <draggable id="l9" label="Hydrogen" />
+        <draggable id="l10_o" label="Oxygen" />
+
+        <target id="t1_o" x="10" y="67" w="100" h="100"/>
+        <target id="t2" x="133" y="3" w="70" h="70"/>
+        <target id="t3" x="2" y="384" w="70" h="70"/>
+        <target id="t4" x="95" y="386" w="70" h="70"/>
+        <target id="t5_c" x="94" y="293" w="91" h="91"/>
+        <target id="t6_c" x="328" y="294" w="91" h="91"/>
+        <target id="t7" x="393" y="463" w="70" h="70"/>
+        <target id="t8" x="344" y="214" w="70" h="70"/>
+        <target id="t9_o" x="445" y="162" w="100" h="100"/>
+        <target id="t10" x="591" y="132" w="70" h="70"/>
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = {'l3_o': 't1_o',
+                  'l10_o': 't9_o',
+
+                  'l1_c': 't5_c',
+                  'l8_c': 't6_c'}
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+</problem>
diff --git a/docs/source/drag_and_drop_input.rst b/docs/source/drag_and_drop_input.rst
index d977270269..75e77b97e2 100644
--- a/docs/source/drag_and_drop_input.rst
+++ b/docs/source/drag_and_drop_input.rst
@@ -7,346 +7,80 @@ Xml format of drag and drop input [inputtypes]
 Format description
 ==================
 
-Graphical slider tool (GST) main tag is::
+The main tag of Drag and Drop (DnD) input is::
 
-    <graphical_slider_tool> BODY </graphical_slider_tool>
+    <drag_and_drop_input> ... </drag_and_drop_input>
 
-``graphical_slider_tool`` tag must have two children tags: ``render``
-and ``configuration``.
+``drag_and_drop_input`` can include any number of the following 2 tags:
+``draggable`` and ``target``.
 
-Render tag
-----------
+drag_and_drop_input tag
+-----------------------
 
-Render tag can contain usual html tags mixed with some GST specific tags::
+The main container for a single instance of DnD. The following attributes can
+be specified for this tag::
 
-    <slider/> - represents jQuery slider
-    <textbox/> - represents input
-    <plot/> - represents Flot plot
+    img - Relative path to an image that will be the base image. All draggables
+          can be dragged onto it.
+    target_outline - Specify whether an outline (gray dashed line) should be
+          drawn around targets (if they are specified). It can be either
+          'true' or 'false'. If not specified, the default value is
+          'false'.
+    one_per_target - Specify whether to allow more than one draggable to be
+          placed onto a single target. It can be either 'true' or 'false'. If
+          not specified, the default value is 'true'.
 
-Also GST will track all elements inside ``<render></render>`` where ``id``
-attribute is set.
+draggable tag
+-------------
 
-The contents of the <render> section will be shown to the user after
-all occurrences of::
-
-    <slider var="{parameter name}" [style="{CSS statements}"]/>
-    <input var="parameter name" [style="{CSS statements}"] [readonly="true" | readonly="false"]/>
-    <plot [style="{CSS statements}"]/>
-
-have been converted to actual sliders, text inputs, and a plot graph.
-Everything in square brackets is optional.
-
-``{parameter name}`` specifies the parameter to which the slider or text
-input will be attached to.
-
-There is a one-to-one relationship between a slider and a parameter.
-I.e. for one parameter you can put only one ``<slider ...<`` in the
-``<render>`` section. However, you don't have to specify a slider - they
-are optional.
-
-There is a many-to-one relationship between text inputs and a
-parameter. I.e. for one parameter you can put many '<input ...<' in
-the ``<render>`` section. However, you don't have to specify a text
-input - they are optional.
-
-You can put only one ``<plot ...<`` in the ``<render>`` section. It is not
-required.
-
-NOTE: MathJax, independently of this module, will render all TeX code
-within the ``<render>`` section into nice mathematical formulas. Just
-remember to wrap it in one of::
-
-    \(  and  \)  -  for inline formulas (formulas surrounded by
-                  standard text)
-    \[  and  \]  -  if you want the formula to be a separate line
-
-Slider tag
-..........
-
-Slider tag must have ``var`` attribute and optional ``style`` attribute::
-
-    <slider var='a' style="width:400px;float:left;"/>
-
-After processing slider tags will be replaced by jQuery UI sliders with applied
-``style`` attribute.
-
-
-``Var`` attribute must correspond to parameter in one of ``function`` tags in
-``functions`` tag. By moving slider, value of parameter ``a`` will change, and so
-result of function, that depends on parameter ``a``, will change.
-
-
-Textbox tag
-...........
-
-
-Texbox tag must have ``var`` attribute and optional ``style`` and ``readonly``
+Draggable tag specifies a single draggable object which has the following
 attributes::
 
-    <textbox var="b" readonly="true" style="width:50px; float:left; margin-left:10px;"/>
+    id - Unique identifier of the draggable object.
+    label - Human readable label that will be shown to the user.
+    icon - Relative path to an image that will be shown to the user.
 
-After processing tetbox tags will be replaced by html inputs with applied
-``style`` attribute. If ``readonly`` is set to ``true`` input will be
-not-editable, default is ``false``.
+A draggable is what the user must drag out of the slider and place onto the
+base image. After a drag operation, if the center of the draggable ends up
+outside the rectangular dimensions of the image, it will be returned back
+to the slider.
 
-``Var`` attribute must correspond to parameter in one of ``function`` tags in
-``functions`` tag. By entering value in input, value of parameter ``b`` will change, and so
-result of function, that depends on parameter ``b``, will change.
+In order for the grader to work, it is essential that a unique ID
+is provided. Otherwise, there will be no way to tell which draggable is at what
+coordinate, or over what target. Label and icon attributes are optional. If
+they are provided they will be used, otherwise, you can have an empty
+draggable. The path is relative to 'course_folder/static/images/' folder.
 
-Plot tag
-........
+target tag
+----------
 
-Plot tag may have optional ``style`` attribute::
+Target tag specifies a single target object which has the following required
+attributes::
 
-    <plot style="width:50px; float:left; margin-left:10px;"/>
+    id - Unique identifier of the target object.
+    x - X-coordinate on the base image where the top left corner of the target
+        will be positioned.
+    y - Y-coordinate on the base image where the top left corner of the target
+        will be positioned.
+    w - Width of the target.
+    h - Height of the target.
 
-After processing plot tags will be replaced by Flot plot with applied
-``style`` attribute.
+A target specifies a place on the base image where a draggable can be
+positioned. By design, if the center of a draggable lies within the target
+(i.e. in the rectangle defined by [[x, y], [x + w, y + h]], then it is within
+the target. Otherwise, it is outside.
 
-HTML tags with id
-.................
+If at lest one target is provided, the behavior of the client side logic
+changes. If a draggable is not dragged on to a target, it is returned back to
+the slider.
 
-Any html tag with id, e.g. ``<span id="answer_span_1">`` will be counted as
-place where result of function can be rendered. To render function result to
-element, element id must be included in ``function`` tag as ``el_id`` attribute
-and ``output`` value must be ``"element"``::
-
-    <function output="element" el_id="answer_span_1">
-                    function add(a, b, precision) {
-                        var x = Math.pow(10, precision || 2);
-                        return (Math.round(a * x) + Math.round(b * x)) / x;
-                    }
-
-                    return add(a, b, 5);
-    </function>
-
-
-
-Configuration tag
------------------
-
-The configuration tag contain sparameter settings, graph
-settings, and function definitions which are to be plotted on the
-graph and that use specified parameters.
-
-Configuration tag contains two mandatory tag ``functions`` and ``parameters`` and
-may contain another ``plot`` tag.
-
-Parameters tag
-..............
-
-``Parameters`` tag contains ``parameter`` tags. Each ``parameter`` tag must have
-``var``, ``max``, ``min``, ``step`` and ``initial`` attributes::
-
-        <parameters>
-                <param var="a" min="-10.0" max="10.0" step="0.1" initial="0" />
-                <param var="b" min="-10.0" max="10.0" step="0.1" initial="0" />
-        </parameters>
-
-``Var`` attribute links min, max, step and initial values to parameter name.
-``Min`` attribute is minimal value that parameter can take. Slider and input
-values can not go below it.
-
-``Max`` attribute is maximal value that parameter can take. Slider and input
-values can not go over it.
-
-``Step`` attribute is value of slider step. When a slider increase or decreases
-the specified parameter, it will do so by the amount specified with 'step'
-
-``Initial`` attribute is the initial value that the specified parameter should be
-set to.
-
-The parameter's name is specified by the 'var' property. All occurrences
-of sliders and/or text inputs that specify a 'var' property, will be
-connected to this parameter - i.e. they will reflect the current
-value of the parameter and will be updated when the parameter
-changes.
-
-
-If at lest one of these attributes is not set, then the parameter
-will not be used, slider's and/or text input elements that specify
-this parameter will not be activated, and the specified functions
-which use this parameter will return a non valid value. This means
-that neglecting to specify at least one of the attributes for some
-parameter will have the result of the whole GST instance not working
-properly.
-
-
-Functions tag
-.............
-
-
-For the GST to do something, you must defined at least one
-function, which can use any of the specified parameter values. The
-function expects to take the ``x`` value, do some calculations, and
-return the ``y`` value. I.e. this is a 2D plot in Cartesian
-coordinates.
-
-Each function must be defined inside ``function`` tag in  ``functions`` tag::
-
-    <functions>
-        <function output="element" el_id="answer_span_1">
-            function add(a, b, precision) {
-                var x = Math.pow(10, precision || 2);
-                return (Math.round(a * x) + Math.round(b * x)) / x;
-            }
-
-            return add(a, b, 5);
-        </function>
-    </functions>
-
-The parameter names (along with their values, as provided from text
-inputs and/or sliders), will be available inside all defined
-functions. A defined function body string will be parsed internally
-by the browser's JavaScript engine and converted to a true JS
-function.
-
-The function's parameter list will automatically be created and
-populated, and will include the ``x``, and all of the specified
-parameter values (from sliders and text inputs). This means that
-each of the defined functions will have access to all of the
-parameter values. You don't have to use them, but they will be
-there.
-
-Examples::
-
-    <function>
-        return x;
-    </function>
-
-    <function dot="true" label="\(y_2\)">
-        return (x + a) * Math.sin(x * b);
-    </function>
-
-    <function color="green">
-        function helperFunc(c1) {
-            return c1 * c1 - a;
-        }
-        return helperFunc(x + 10 * a * b) + Math.sin(a - x);
-    </function>
-
-Required parameters::
-
-    function body:
-
-    A string composing a normal JavaScript function
-    except that there is no function declaration
-    (along with parameters), and no closing bracket.
-
-    So if you normally would have written your
-    JavaScript function like this:
-
-        function myFunc(x, a, b) {
-            return x * a + b;
-        }
-
-    here you must specify just the function body
-    (everything that goes between '{' and '}'). So,
-    you would specify the above function like so (the
-    bare-bone minimum):
-
-        <function>
-            return x * a + b;
-        </function>
-
-Optional parameters::
-
-
-    color:  Color name (red, green, etc.) or in the form of
-            '#FFFF00'. If not specified, a default color (different
-            one for each function) will be given by Flot;
-    line:   A string - 'true' or 'false'. Should the data points be
-            connected by a line on the graph? Default is 'true'.
-    dot:    A string - 'true' or 'false'. Should points be shown for
-            each data point on the graph? Default is 'false'.
-    label:  A string. If provided, will be shown in the legend, along
-            with the color that was used to plot the function.
-    output: "element" or "plot". If not defined, function will be plotted.
-            If defined, function will not be plotted, but rendered to element
-            with id set in 'el_id' attribute.
-    el_id:  Id of html element, defined in 'render' section. Value of
-            function will be rendered to content of this element.
-
-With ``output`` and ``el_id`` set together you can update html elements with
-function value, also function will not be plotted.
-
-[note on MathJax and labels]:
-
-It is possible to define a label in standard TeX notation. The JS
-library MathJax will work on these labels also because they are
-inserted on top of the plot as standard HTML (text within a DIV).
-
-Plot tag
-........
-
-``Plot`` tag inside ``configuration`` tag defines settings for plot output.
-
-Required parameters::
-
-    xrange: 2 functions that must return value. Value is constant (3.1415)
-            or depend on parameter from parameters section:
-                <xrange>
-                    <min>return 0;</min>
-                    <max>return 30;</max>
-                </xrange>
-                                        or
-                <xrange>
-                    <min>return -a;</min>
-                    <max>return a;</max>
-                </xrange>
-
-            All functions will be calculated over domain between xrange:min
-            and xrange:max. Xrange depending on parameter is extremely
-            useful when domain(s) of your function(s) depends on parameter
-            (like circle, when parameter is radius and you want to allow
-            to change it).
-
-Optional parameters::
-
-    num_points: Number of data points to generated for the plot. If
-                this is not set, the number of points will be
-                calculated as width / 5.
-    xticks,
-    yticks:    3 floating point numbers separated by commas. This
-               specifies how many ticks are created, what number they
-               start at, and what number they end at. This is different
-               from the 'xrange' setting in that it has nothing to do
-               with the data points - it control what area of the
-               Cartesian space you will see. The first number is the
-               first tick's value, the second number is the step
-               between each tick, the third number is the value of the
-               last tick. If these configurations are not specified,
-               Flot will chose them for you based on the data points
-               set that he is currently plotting. Usually, this results
-               in a nice graph, however, sometimes you need to fine
-               grain the controls. For example, when you want to show
-               a fixed area of the Cartesian space, even when the data
-               set changes. On it's own, Flot will recalculate the
-               ticks, which will result in a different graph each time.
-               By specifying the xticks, yticks configurations, only
-               the plotted data will change - the axes (ticks) will
-               remain as you have defined them.
-
-    xunits,
-    yunits:   Units values to be set on axes. Use MathJax. Example:
-                <xunits>\(cm\)</xunits>
-                <yunits>\(m\)</yunits>
+If no targets are provided, then a draggable can be dragged and placed anywhere
+on the base image.
 
 Example
 =======
 
-Plotting, sliders and inputs
-----------------------------
+Various configuration of DnD on one page
+----------------------------------------
 
-.. literalinclude:: gst_example_with_documentation.xml
-
-Update of html elements, no plotting
-------------------------------------
-
-.. literalinclude:: gst_example_html_element_output.xml
-
-
-Circle with dynamic radius
---------------------------
-
-.. literalinclude:: gst_example_dynamic_range.xml
+.. literalinclude:: drag-n-drop-demo.xml

From 7ab1325647f2a4f9e2fcbb3257aeffbcac317a4d Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 2 Jan 2013 13:34:14 +0200
Subject: [PATCH 448/541] extended grader

---
 common/lib/capa/capa/graders/draganddrop.py | 232 ++++++++++++++++----
 1 file changed, 184 insertions(+), 48 deletions(-)

diff --git a/common/lib/capa/capa/graders/draganddrop.py b/common/lib/capa/capa/graders/draganddrop.py
index 1e847b105b..eaee4bc58e 100644
--- a/common/lib/capa/capa/graders/draganddrop.py
+++ b/common/lib/capa/capa/graders/draganddrop.py
@@ -28,74 +28,210 @@ values are (x,y) coordinates of centers of dragged images.
 """
 
 import json
+from collections import OrderedDict
 
 
-def grade(user_input, correct_answer):
-    '''
-    Grade drag and drop problem.
-    If use_targets is True - checks if image placed on proper target.
-    If use_targets is False - checks if image placed on proper coordinates,
-    with setted radius of forgiveness (default is 10)
+class PositionsCompare(list):
+    """Inputs are: "abc" - target
+                    [10, 20] - list of integers
+                    [[10,20], 200] list of list and integer
 
-    Args:
-        user_input, correct_answer: json. Format:
+    """
+    def __eq__(self, other):
+        # Default lists behaviour is convers "abc" to ["a", "b", "c"].
+        # We will use that.
+        # import ipdb; ipdb.set_trace()
 
-        user_input: see module docstring
+        #check if self or other is not empty list (empty lists  = false)
+        if not self or not other:
+            return False
 
-        correct_answer:
-            if use_targets is True:
-                {'1': 't1',  'name_with_icon': 't2'}
-            else:
-                {'1': '[10, 10]',  'name_with_icon': '[[10, 10], 20]'}
+        # check correct input types
+        if (not isinstance(self[0], (str, unicode, list, int)) or
+            not isinstance(other[0], (str, unicode, list, int))):
+            print 'Incorrect input type'
+            return False
 
-    Returns:
-        True or False.
-    '''
+        if (isinstance(self[0], (list, int)) and
+            isinstance(other[0], (list, int))):
+            print 'Numerical position compare'
+            return self.coordinate_positions_compare(other)
+        elif (isinstance(self[0], (unicode, str)) and
+              isinstance(other[0], (unicode, str))):
+            print 'Targets compare'
+            return ''.join(self) == ''.join(other)
+        else:
+            # we do not have ints or lists of lists or two string/unicode lists
+            # on both sides
+            print type(self[0]), type(other[0]), "not correct"
+            return False
 
-    user_answer = json.loads(user_input)
+    def __ne__(self, other):
+        return not self.__eq__(other)
 
-    if len(correct_answer.keys()) != len(user_answer['draggables']):
-        return False
-
-    def is_equal(user_answer, correct_answer):
-        """ Checks if user_answer is  equal to correct_answer inside radius
+    def coordinate_positions_compare(self, other, r=10):
+        """ Checks if pos1 is  equal to pos2 inside radius
         of forgiveness (default 10 px).
 
             Args:
-                user_answer:    [x, y]  - list of floats;
-                correct_answer: [x, y] or [[x, y], r], where
-                                r is radius of forgiveness;
+                self, other: [x, y] or [[x, y], r], where
+                             r is radius of forgiveness;
+                             x, y, r: int
 
             Returns: bool.
         """
-        if not isinstance(correct_answer, list) or isinstance(user_answer, list):
-            return False
+        print 'I am called',  self, other
 
-        r = 10
-        if isinstance(correct_answer[0], list):  # [(x, y), r] case
-            r = correct_answer[1]
-            corr_x = correct_answer[0][0]
-            corr_y = correct_answer[0][1]
-        else:  # (x, y) case
-            corr_x = correct_answer[0]
-            corr_y = correct_answer[1]
+        # get max radius of forgiveness
+        if isinstance(self[0], list):  # [(x, y), r] case
+            r = max(self[1], r)
+            x1, y1 = self[0]
+        else:
+            x1, y1 = self
 
-        if ((user_answer[0] - corr_x) ** 2 +
-            (user_answer[1] - corr_y) ** 2) > r * r:
+        if isinstance(other[0], list):  # [(x, y), r] case
+            r = max(other[1], r)
+            x2, y2 = other[0]
+        else:
+            x2, y2 = other
+
+        if (x2 - x1) ** 2 + (y2 - y1) ** 2 > r * r:
             return False
 
         return True
 
-    if user_answer["use_targets"]:
-        is_equal = lambda user, correct: user == correct if (
-             isinstance(user, unicode) and isinstance(correct, str)) else False
 
-    for draggable in user_answer['draggables']:
-        user_img_location = draggable.values()[0]
-        corr_img_location = correct_answer.get(draggable.keys()[0], None)
-        if not corr_img_location:
-            return False
-        if not is_equal(user_img_location, corr_img_location):
+class DragAndDrop(object):
+
+    def __init__(self):
+        self.correct_groups = OrderedDict()  # groups
+        self.correct_positions = OrderedDict()  # positions of comparing
+        self.user_groups = OrderedDict()
+        self.user_positions = OrderedDict()
+
+    def grade(self):
+        '''
+        Grade drag and drop problem.
+        If use_targets is True - checks if image placed on proper target.
+        If use_targets is False - checks if image placed on proper coordinates,
+        with setted radius of forgiveness (default is 10)
+
+        Args:
+            user_input, correct_answer: json. Format:
+
+            user_input: see module docstring
+
+            correct_answer:
+                if use_targets is True:
+                    {'1': 't1',  'name_with_icon': 't2'}
+                else:
+                    {'1': '[10, 10]',  'name_with_icon': '[[10, 10], 20]'}
+
+        Returns:
+            True or False.
+        '''
+        if sorted(self.correct_groups.keys()) != sorted(self.user_groups.keys()):
             return False
 
-    return True
+        for groupname, draggable_ids in self.correct_groups.items():
+            if sorted(draggable_ids) != sorted(self.user_groups[groupname]):
+                return False
+
+        # from now self.groups and self.user_groups are equal
+        assert self.correct_groups == self.user_groups
+
+        # Check fo every group that positions of every group element are equal
+        # with positions
+
+        # 'denied' rule
+        # import ipdb; ipdb.set_trace()
+        denied_positions = [self.correct_positions[g].get('denied', [])
+                               for g in self.correct_groups.keys()]
+        all_user_positions = [self.user_positions[g]['user']
+                                for g in self.correct_groups.keys()]
+        if not self.compare_positions(denied_positions,
+                                          all_user_positions, flag='denied'):
+            return False
+
+        no_exact, no_allowed = False, False
+        # 'exact' rule
+        for groupname in self.correct_groups:
+            if self.correct_positions[groupname].get('exact', []):
+                if not self.compare_positions(
+                        self.correct_positions[groupname]['exact'],
+                        self.user_positions[groupname]['user'], flag='exact'):
+                    return False
+            else:
+                no_exact = True
+
+        # 'allowed' rule
+        for groupname in self.correct_groups:
+            if self.correct_positions[groupname].get('allowed', []):
+                if not self.compare_positions(
+                        self.correct_positions[groupname]['allowed'],
+                        self.user_positions[groupname]['user'], flag='allowed'):
+                    return False
+            else:
+                no_allowed = True
+
+        if no_allowed and no_exact:
+            return False
+
+        return True
+
+    def compare_positions(self, list1, list2, flag):
+        # import ipdb; ipdb.set_trace()
+        if flag == 'denied':
+            for el1 in list1:
+                for el2 in list2:
+                    if PositionsCompare(el1) == PositionsCompare(el2):
+                        return False
+
+        if flag == 'allowed':
+            for el1, el2 in zip(sorted(list1), sorted(list2)):
+                if PositionsCompare(el1) != PositionsCompare(el2):
+                    return False
+
+        if flag == 'exact':
+            for el1, el2 in zip(list1, list2):
+                if PositionsCompare(el1) != PositionsCompare(el2):
+                    return False
+
+        return True
+
+    def populate(self, correct_answer, user_answer):
+        """  """
+
+        if isinstance(correct_answer, dict):
+            for key, value in correct_answer.items():
+                self.correct_groups[key] = [key]
+                self.correct_positions[key] = {'exact': [value]}
+
+        user_answer = json.loads(user_answer)
+        self.use_targets = user_answer.get('use_targets')
+
+        # create identical data structures
+        # user groups must mirror correct_groups
+        # and positions  must reflect order in groups
+
+        for groupname in self.correct_groups:
+            self.user_groups[groupname] = []
+            self.user_positions[groupname] = {'user': []}
+            for draggable_dict in user_answer['draggables']:
+                # draggable_dict is 1-to-1 {draggable_name: position}
+                draggable_name = draggable_dict.keys()[0]
+                if draggable_name in self.correct_groups[groupname]:
+                    self.user_groups[groupname].append(draggable_name)
+                    self.user_positions[groupname]['user'].append(
+                                            draggable_dict[draggable_name])
+
+        # import ipdb; ipdb.set_trace()
+
+
+def grade(user_input, correct_answer):
+    """ Support 2 interfaces"""
+    if isinstance(correct_answer, dict):
+        dnd = DragAndDrop()
+
+    dnd.populate(correct_answer=correct_answer, user_answer=user_input)
+    return dnd.grade()

From ff782fff6c7a28e7e57569738dfd235ff57e1745 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 2 Jan 2013 13:34:29 +0200
Subject: [PATCH 449/541] test for drag and drop

---
 common/lib/capa/capa/graders/tests.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/lib/capa/capa/graders/tests.py b/common/lib/capa/capa/graders/tests.py
index 7b0b719a6a..a8616d808b 100644
--- a/common/lib/capa/capa/graders/tests.py
+++ b/common/lib/capa/capa/graders/tests.py
@@ -33,13 +33,13 @@ class Test_DragAndDrop(unittest.TestCase):
         user_input = '{"use_targets": true, "draggables": [{"1": [10,10]}, \
          {"name_with_icon": [[10,10],4]}]}'
         correct_answer = {'1':  [10, 10], 'name_with_icon': [[10, 10], 4]}
-        self.assertFalse(draganddrop.grade(user_input, correct_answer))
+        self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
     def test_position_and_targets(self):
         user_input = '{"use_targets": false, \
         "draggables": [{"1": "t1"}, {"name_with_icon": "t2"}]}'
         correct_answer = {'1':    't1', 'name_with_icon': 't2'}
-        self.assertFalse(draganddrop.grade(user_input, correct_answer))
+        self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
     def test_positions_exact(self):
         user_input = '{"use_targets": false, "draggables": \

From 37e3181c3634040f9e3305cac940d102bc25921d Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 2 Jan 2013 13:34:38 +0200
Subject: [PATCH 450/541] removed unidecode

---
 common/lib/capa/capa/inputtypes.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index 147251329b..d1e298564a 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -45,7 +45,6 @@ import re
 import shlex  # for splitting quoted strings
 import sys
 import os
-import unidecode
 
 from registry import TagRegistry
 

From 604c42eb07c13f1551efdc39f19186025beac9b5 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 2 Jan 2013 16:07:49 +0200
Subject: [PATCH 451/541] added anyof flag

---
 common/lib/capa/capa/graders/draganddrop.py | 51 +++++++++++++++------
 1 file changed, 36 insertions(+), 15 deletions(-)

diff --git a/common/lib/capa/capa/graders/draganddrop.py b/common/lib/capa/capa/graders/draganddrop.py
index eaee4bc58e..0d0750d970 100644
--- a/common/lib/capa/capa/graders/draganddrop.py
+++ b/common/lib/capa/capa/graders/draganddrop.py
@@ -47,13 +47,13 @@ class PositionsCompare(list):
             return False
 
         # check correct input types
-        if (not isinstance(self[0], (str, unicode, list, int)) or
-            not isinstance(other[0], (str, unicode, list, int))):
+        if (not isinstance(self[0], (str, unicode, list, int, float)) or
+            not isinstance(other[0], (str, unicode, list, int, float))):
             print 'Incorrect input type'
             return False
 
-        if (isinstance(self[0], (list, int)) and
-            isinstance(other[0], (list, int))):
+        if (isinstance(self[0], (list, int, float)) and
+            isinstance(other[0], (list, int, float))):
             print 'Numerical position compare'
             return self.coordinate_positions_compare(other)
         elif (isinstance(self[0], (unicode, str)) and
@@ -81,7 +81,6 @@ class PositionsCompare(list):
             Returns: bool.
         """
         print 'I am called',  self, other
-
         # get max radius of forgiveness
         if isinstance(self[0], list):  # [(x, y), r] case
             r = max(self[1], r)
@@ -136,9 +135,8 @@ class DragAndDrop(object):
         for groupname, draggable_ids in self.correct_groups.items():
             if sorted(draggable_ids) != sorted(self.user_groups[groupname]):
                 return False
-
-        # from now self.groups and self.user_groups are equal
-        assert self.correct_groups == self.user_groups
+        # from now self.correct_groups and self.user_groups are equal if
+        # order is ignored
 
         # Check fo every group that positions of every group element are equal
         # with positions
@@ -153,7 +151,7 @@ class DragAndDrop(object):
                                           all_user_positions, flag='denied'):
             return False
 
-        no_exact, no_allowed = False, False
+        no_exact, no_allowed, no_anyof = False, False, False
         # 'exact' rule
         for groupname in self.correct_groups:
             if self.correct_positions[groupname].get('exact', []):
@@ -174,29 +172,50 @@ class DragAndDrop(object):
             else:
                 no_allowed = True
 
-        if no_allowed and no_exact:
+        # 'anyof' rule
+        for groupname in self.correct_groups:
+            if self.correct_positions[groupname].get('anyof', []):
+                if not self.compare_positions(
+                        self.correct_positions[groupname]['anyof'],
+                        self.user_positions[groupname]['user'], flag='anyof'):
+                    return False
+            else:
+                no_anyof = True
+
+        if no_allowed and no_exact and no_anyof:
             return False
 
         return True
 
-    def compare_positions(self, list1, list2, flag):
+    def compare_positions(self, correct, user, flag):
+        """ order of correct/user is matter only in anyof_flag"""
         # import ipdb; ipdb.set_trace()
         if flag == 'denied':
-            for el1 in list1:
-                for el2 in list2:
+            for el1 in correct:
+                for el2 in user:
                     if PositionsCompare(el1) == PositionsCompare(el2):
                         return False
 
         if flag == 'allowed':
-            for el1, el2 in zip(sorted(list1), sorted(list2)):
+            for el1, el2 in zip(sorted(correct), sorted(user)):
                 if PositionsCompare(el1) != PositionsCompare(el2):
                     return False
 
         if flag == 'exact':
-            for el1, el2 in zip(list1, list2):
+            for el1, el2 in zip(correct, user):
                 if PositionsCompare(el1) != PositionsCompare(el2):
                     return False
 
+        if flag == 'anyof':
+            count = 0
+            for u_el in user:
+                for c_el in correct:
+                    if PositionsCompare(u_el) == PositionsCompare(c_el):
+                        count += 1
+                        continue
+            if count != len(user):
+                return False
+
         return True
 
     def populate(self, correct_answer, user_answer):
@@ -232,6 +251,8 @@ def grade(user_input, correct_answer):
     """ Support 2 interfaces"""
     if isinstance(correct_answer, dict):
         dnd = DragAndDrop()
+    else:
+        dnd = correct_answer
 
     dnd.populate(correct_answer=correct_answer, user_answer=user_input)
     return dnd.grade()

From 961285a4d10a369511e123e3c59dcebc3b1b43c4 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 2 Jan 2013 16:08:01 +0200
Subject: [PATCH 452/541] added no_labels flag

---
 common/lib/capa/capa/inputtypes.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index d1e298564a..4cb75c9ce3 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -836,11 +836,15 @@ class DragAndDropInput(InputTypeBase):
                 dic[attr_name] = Attribute(attr_name,
                     default=tag_attrs[tag_type][attr_name]).parse_from_xml(tag)
 
-            if tag_type == 'draggable':
+            if tag_type == 'draggable' and not self.no_labels:
                 dic['label'] = dic['label'] or dic['id']
 
             return dic
 
+        # add labels to images:
+        self.no_labels = Attribute('no_labels',
+                                        default="False").parse_from_xml(self.xml)
+
         to_js = dict()
 
         # image drag and drop onto

From 590e63639e971dab123faffa61a146b0d8f51d01 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 2 Jan 2013 16:08:47 +0200
Subject: [PATCH 453/541] added anywhere test

---
 common/lib/capa/capa/graders/tests.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/common/lib/capa/capa/graders/tests.py b/common/lib/capa/capa/graders/tests.py
index a8616d808b..4ffee39aaa 100644
--- a/common/lib/capa/capa/graders/tests.py
+++ b/common/lib/capa/capa/graders/tests.py
@@ -77,6 +77,15 @@ class Test_DragAndDrop(unittest.TestCase):
         correct_answer = {'3':   't3', 'name_with_icon': 't2'}
         self.assertFalse(draganddrop.grade(user_input, correct_answer))
 
+    def test_anywhere(self):
+        """Draggables can be places anywhere on base image.
+            Place grass in the middle of the image and ant in the
+            right upper corner."""
+        user_input = '{"use_targets": false, "draggables": \
+        [{"ant":[610.5,57.449951171875]},{"grass":[322.5,199.449951171875]}]}'
+        correct_answer = {'grass':     [[300, 200], 200], 'ant': [[500, 0], 200]}
+        self.assertTrue(draganddrop.grade(user_input, correct_answer))
+
 
 def suite():
 

From a0f99ac3ce8dd6783f2f5dd3d15e2d9bc40c01b3 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 2 Jan 2013 17:16:37 +0200
Subject: [PATCH 454/541] added case for extra draggables

---
 common/lib/capa/capa/graders/draganddrop.py | 28 ++++++---
 common/lib/capa/capa/graders/tests.py       | 66 +++++++++++++++++++++
 2 files changed, 86 insertions(+), 8 deletions(-)

diff --git a/common/lib/capa/capa/graders/draganddrop.py b/common/lib/capa/capa/graders/draganddrop.py
index 0d0750d970..e02304aef0 100644
--- a/common/lib/capa/capa/graders/draganddrop.py
+++ b/common/lib/capa/capa/graders/draganddrop.py
@@ -107,6 +107,7 @@ class DragAndDrop(object):
         self.correct_positions = OrderedDict()  # positions of comparing
         self.user_groups = OrderedDict()
         self.user_positions = OrderedDict()
+        self.incorrect = False
 
     def grade(self):
         '''
@@ -129,9 +130,12 @@ class DragAndDrop(object):
         Returns:
             True or False.
         '''
-        if sorted(self.correct_groups.keys()) != sorted(self.user_groups.keys()):
+
+        if self.incorrect:
             return False
 
+        if sorted(self.correct_groups.keys()) != sorted(self.user_groups.keys()):
+            return False
         for groupname, draggable_ids in self.correct_groups.items():
             if sorted(draggable_ids) != sorted(self.user_groups[groupname]):
                 return False
@@ -142,11 +146,10 @@ class DragAndDrop(object):
         # with positions
 
         # 'denied' rule
-        # import ipdb; ipdb.set_trace()
-        denied_positions = [self.correct_positions[g].get('denied', [])
-                               for g in self.correct_groups.keys()]
-        all_user_positions = [self.user_positions[g]['user']
-                                for g in self.correct_groups.keys()]
+        denied_positions = [item for g in self.correct_groups.keys()
+                        for item in self.correct_positions[g].get('denied', [])]
+        all_user_positions = [item for g in self.correct_groups.keys()
+                                for item in self.user_positions[g]['user']]
         if not self.compare_positions(denied_positions,
                                           all_user_positions, flag='denied'):
             return False
@@ -229,10 +232,12 @@ class DragAndDrop(object):
         user_answer = json.loads(user_answer)
         self.use_targets = user_answer.get('use_targets')
 
+        # check if we have draggables that are not in correct answer:
+        check_extra_draggables = {}
+
         # create identical data structures
         # user groups must mirror correct_groups
-        # and positions  must reflect order in groups
-
+        # and positions  must reflect order in group
         for groupname in self.correct_groups:
             self.user_groups[groupname] = []
             self.user_positions[groupname] = {'user': []}
@@ -243,7 +248,14 @@ class DragAndDrop(object):
                     self.user_groups[groupname].append(draggable_name)
                     self.user_positions[groupname]['user'].append(
                                             draggable_dict[draggable_name])
+                    check_extra_draggables[draggable_name] = True
+                else:
+                    check_extra_draggables[draggable_name] = \
+                    check_extra_draggables.get(draggable_name, False)
 
+        for draggable in check_extra_draggables:
+            if not check_extra_draggables[draggable]:
+                self.incorrect = True
         # import ipdb; ipdb.set_trace()
 
 
diff --git a/common/lib/capa/capa/graders/tests.py b/common/lib/capa/capa/graders/tests.py
index 4ffee39aaa..0e95b810a9 100644
--- a/common/lib/capa/capa/graders/tests.py
+++ b/common/lib/capa/capa/graders/tests.py
@@ -86,6 +86,72 @@ class Test_DragAndDrop(unittest.TestCase):
         correct_answer = {'grass':     [[300, 200], 200], 'ant': [[500, 0], 200]}
         self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
+    def test_lcao_correct(self):
+        """Describe carbon molecule in LCAO-MO"""
+        user_input = '{"use_targets":true,"draggables":[{"1":"s_left"}, \
+        {"5":"s_right"},{"4":"s_sigma"},{"6":"s_sigma_star"},{"7":"p_left_1"}, \
+        {"8":"p_left_2"},{"10":"p_right_1"},{"9":"p_right_2"}, \
+        {"2":"p_pi_1"},{"3":"p_pi_2"},{"11":"s_sigma_name"}, \
+        {"13":"s_sigma_star_name"},{"15":"p_pi_name"},{"16":"p_pi_star_name"}, \
+        {"12":"p_sigma_name"},{"14":"p_sigma_star_name"}]}'
+        correct_answer = draganddrop.DragAndDrop()
+        correct_answer.correct_groups['filled_levels'] = ['1', '2', '3', '4', '5', '6']
+        correct_answer.correct_positions['filled_levels'] = {'allowed': [
+        's_left', 's_right', 's_sigma', 's_sigma_star', 'p_pi_1', 'p_pi_2']}
+
+        correct_answer.correct_groups['spin_up'] = ['7', '8', '9', '10']
+        correct_answer.correct_positions['spin_up'] = {'allowed':
+            ['p_left_1', 'p_left_2', 'p_right_1', 'p_right_2']}
+
+        correct_answer.correct_groups['sigma'] = ['11', '12']
+        correct_answer.correct_positions['sigma'] = {'allowed':
+            ['s_sigma_name', 'p_sigma_name']}
+
+        correct_answer.correct_groups['sigma_star'] = ['13', '14']
+        correct_answer.correct_positions['sigma_star'] = {'allowed':
+            ['s_sigma_star_name', 'p_sigma_star_name']}
+
+        correct_answer.correct_groups['pi'] = ['15']
+        correct_answer.correct_positions['pi'] = {'allowed': ['p_pi_name']}
+
+        correct_answer.correct_groups['pi_star'] = ['16']
+        correct_answer.correct_positions['pi_star'] = {'allowed': ['p_pi_star_name']}
+
+        self.assertTrue(draganddrop.grade(user_input, correct_answer))
+
+    def test_lcao_extra_element_incorrect(self):
+        """Describe carbon molecule in LCAO-MO"""
+        user_input = '{"use_targets":true,"draggables":[{"1":"s_left"}, \
+        {"5":"s_right"},{"4":"s_sigma"},{"6":"s_sigma_star"},{"7":"p_left_1"}, \
+        {"8":"p_left_2"},{"17":"p_left_3"},{"10":"p_right_1"},{"9":"p_right_2"}, \
+        {"2":"p_pi_1"},{"3":"p_pi_2"},{"11":"s_sigma_name"}, \
+        {"13":"s_sigma_star_name"},{"15":"p_pi_name"},{"16":"p_pi_star_name"}, \
+        {"12":"p_sigma_name"},{"14":"p_sigma_star_name"}]}'
+        correct_answer = draganddrop.DragAndDrop()
+        correct_answer.correct_groups['filled_levels'] = ['1', '2', '3', '4', '5', '6']
+        correct_answer.correct_positions['filled_levels'] = {'allowed': [
+        's_left', 's_right', 's_sigma', 's_sigma_star', 'p_pi_1', 'p_pi_2']}
+
+        correct_answer.correct_groups['spin_up'] = ['7', '8', '9', '10']
+        correct_answer.correct_positions['spin_up'] = {'allowed':
+            ['p_left_1', 'p_left_2', 'p_right_1', 'p_right_2']}
+
+        correct_answer.correct_groups['sigma'] = ['11', '12']
+        correct_answer.correct_positions['sigma'] = {'allowed':
+            ['s_sigma_name', 'p_sigma_name']}
+
+        correct_answer.correct_groups['sigma_star'] = ['13', '14']
+        correct_answer.correct_positions['sigma_star'] = {'allowed':
+            ['s_sigma_star_name', 'p_sigma_star_name']}
+
+        correct_answer.correct_groups['pi'] = ['15']
+        correct_answer.correct_positions['pi'] = {'allowed': ['p_pi_name']}
+
+        correct_answer.correct_groups['pi_star'] = ['16']
+        correct_answer.correct_positions['pi_star'] = {'allowed': ['p_pi_star_name']}
+
+        self.assertFalse(draganddrop.grade(user_input, correct_answer))
+
 
 def suite():
 

From 2e08ece7ffd73ee573222b1eac2888b16e91de34 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Thu, 3 Jan 2013 07:45:49 +0200
Subject: [PATCH 455/541] Fixed drag behavior. Now drag of icon itself rather
 than container element. This allows for finer selection (no overlap of
 transparent areas), and positioning of icon precisely onto a target. This
 breaks labels - TODO fix.

---
 .../js/capa/drag_and_drop/draggables.js       | 207 +++++++++---------
 1 file changed, 104 insertions(+), 103 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index 1c4a6cad8b..f70ae108b4 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -22,18 +22,31 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             normalizeEvent(event);
 
             if (state.currentMovingDraggable !== null) {
-                state.currentMovingDraggable.css('left', event.pageX - state.baseImageEl.offset().left - 50);
-                state.currentMovingDraggable.css('top', event.pageY - state.baseImageEl.offset().top - 50);
+                state.currentMovingDraggable.iconEl.css(
+                    'left',
+                    event.pageX -
+                        state.baseImageEl.offset().left -
+                        state.currentMovingDraggable.iconWidth * 0.5
+                );
+                state.currentMovingDraggable.iconEl.css(
+                    'top',
+                    event.pageY -
+                        state.baseImageEl.offset().top -
+                        state.currentMovingDraggable.iconHeight * 0.5
+                );
             }
         });
 
         return;
 
         function processDraggable(obj, objIndex) {
-            var draggableContainerEl, inContainer, mousePressed, onTarget,
-                draggableObj, marginCss;
+            var inContainer, mousePressed, onTarget, draggableObj, marginCss;
 
-            draggableContainerEl = $(
+            draggableObj = {};
+
+            draggableObj.zIndex = objIndex;
+
+            draggableObj.containerEl = $(
                 '<div ' +
                     'style=" ' +
                         'width: 100px; ' +
@@ -44,71 +57,84 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         'z-index: ' + objIndex + '; ' +
                         'border: 1px solid #CCC; ' +
                         'text-align: center; ' +
+                        'position: relative; ' +
                     '" ' +
-                    'data-draggable-position-index="' + objIndex + '" ' +
                     '></div>'
             );
+            draggableObj.containerEl.appendTo(state.sliderEl);
 
             if (obj.icon.length > 0) {
-                draggableContainerEl.append(
-                    $('<img src="' + state.config.imageDir + '/' + obj.icon + '" />')
+                draggableObj.iconEl = $('<img />');
+                draggableObj.iconEl.attr(
+                    'src',
+                    state.config.imageDir + '/' + obj.icon
                 );
+                draggableObj.iconEl.load(function () {
+                    draggableObj.iconWidth = this.width;
+                    draggableObj.iconHeight = this.height;
+
+                    draggableObj.iconEl.css('position', 'absolute');
+                    draggableObj.iconEl.css('top', (50 - this.height * 0.5) + 'px');
+                    draggableObj.iconEl.css('left', (50 - this.width * 0.5) + 'px');
+
+                    draggableObj.iconEl.appendTo(draggableObj.containerEl);
+                });
+
+                draggableObj.iconEl.mousedown(mouseDown);
+                draggableObj.iconEl.mouseup(mouseUp);
+                draggableObj.iconEl.mousemove(mouseMove);
+            } else {
+                // Must fix - add +label support, and just label support.
+                return;
             }
 
-            if (obj.label.length > 0) {
-                marginCss = '';
+            // if (obj.label.length > 0) {
+            //     marginCss = '';
+            //
+            //     if (obj.icon.length === 0) {
+            //         marginCss = 'margin-top: 38px;';
+            //     }
 
-                if (obj.icon.length === 0) {
-                    marginCss = 'margin-top: 38px;';
-                }
-
-                draggableContainerEl.append(
-                    $('<div style="clear: both; text-align: center; ' + marginCss + ' ">' + obj.label + '</div>')
-                );
-            }
-
-            draggableContainerEl.appendTo(state.sliderEl);
+            //     draggableContainerEl.append(
+            //         $('<div style="clear: both; text-align: center; ' + marginCss + ' ">' + obj.label + '</div>')
+            //     );
+            // }
 
             inContainer = true;
             mousePressed = false;
 
             onTarget = null;
 
-            draggableObj = {
-                'id': obj.id,
-                'el': draggableContainerEl,
-                'x': -1,
-                'y': -1,
+            draggableObj.id = obj.id;
+            draggableObj.x = -1;
+            draggableObj.y = -1;
+
+            draggableObj.setInContainer = function (val) { inContainer = val; };
+            draggableObj.setOnTarget = function (val) { onTarget = val; };
 
-                'setInContainer': function (val) { inContainer = val; },
-                'setOnTarget': function (val) { onTarget = val; },
-            };
             state.draggables.push(draggableObj);
 
-            draggableContainerEl.mousedown(mouseDown);
-            draggableContainerEl.mouseup(mouseUp);
-            draggableContainerEl.mousemove(mouseMove);
-
             return;
 
             function mouseDown(event) {
                 if (mousePressed === false) {
-                    state.currentMovingDraggable = draggableContainerEl;
+                    state.currentMovingDraggable = draggableObj;
                     normalizeEvent(event);
 
                     if (inContainer === true) {
-                        draggableContainerEl.detach();
-                        draggableContainerEl.css('border', 'none');
-                        draggableContainerEl.css('position', 'absolute');
-                        draggableContainerEl.css('left', event.pageX - state.baseImageEl.offset().left - 50);
-                        draggableContainerEl.css('top', event.pageY - state.baseImageEl.offset().top - 50);
-                        draggableContainerEl.appendTo(state.baseImageEl.parent());
+                        draggableObj.containerEl.hide();
+
+                        draggableObj.iconEl.detach();
+                        draggableObj.iconEl.css('left', event.pageX - state.baseImageEl.offset().left - draggableObj.iconWidth * 0.5);
+                        draggableObj.iconEl.css('top', event.pageY - state.baseImageEl.offset().top - draggableObj.iconHeight * 0.5);
+                        draggableObj.iconEl.appendTo(state.baseImageEl.parent());
 
                         inContainer = false;
                     }
 
-                    draggableContainerEl.attr('data-old-z-index', draggableContainerEl.css('z-index'));
-                    draggableContainerEl.css('z-index', '1000');
+                    draggableObj.oldZIndex = draggableObj.zIndex;
+                    draggableObj.zIndex = 1000;
+                    draggableObj.iconEl.css('z-index', '1000');
 
                     mousePressed = true;
                     event.preventDefault();
@@ -119,14 +145,14 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                 if (mousePressed === true) {
                     state.currentMovingDraggable = null;
 
-                    checkLandingElement(event);
+                    checkLandingElement();
                 }
             }
 
             function mouseMove() {
                 if (mousePressed === true) {
-                    draggableContainerEl.css('left', event.pageX - state.baseImageEl.offset().left - 50);
-                    draggableContainerEl.css('top', event.pageY - state.baseImageEl.offset().top - 50);
+                    draggableObj.iconEl.css('left', event.pageX - state.baseImageEl.offset().left - draggableObj.iconWidth * 0.5);
+                    draggableObj.iconEl.css('top', event.pageY - state.baseImageEl.offset().top - draggableObj.iconHeight * 0.5);
                 }
             }
 
@@ -136,11 +162,11 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             // the input with the user's answer (X-Y position of the draggable,
             // or the ID of the target where it landed.
             function checkLandingElement() {
-                var offsetDE, indexes, DEindex, targetFound;
+                var offsetIE, targetFound;
 
                 mousePressed = false;
 
-                offsetDE = draggableContainerEl.position();
+                offsetIE = draggableObj.iconEl.position();
 
                 if (state.individualTargets === true) {
                     targetFound = false;
@@ -155,10 +181,10 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                     }
                 } else {
                     if (
-                        (offsetDE.left < 0) ||
-                        (offsetDE.left + 100 > state.baseImageEl.width()) ||
-                        (offsetDE.top < 0) ||
-                        (offsetDE.top + 100 > state.baseImageEl.height())
+                        (offsetIE.left < 0) ||
+                        (offsetIE.left + draggableObj.iconWidth > state.baseImageEl.width()) ||
+                        (offsetIE.top < 0) ||
+                        (offsetIE.top + draggableObj.iconHeight > state.baseImageEl.height())
                     ) {
                         moveBackToSlider();
 
@@ -182,7 +208,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
                     if (onTarget !== null) {
                         for (c1 = 0; c1 < onTarget.draggable.length; c1 += 1) {
-                            if (onTarget.draggable[c1] === obj.id) {
+                            if (onTarget.draggable[c1] === draggableObj.id) {
                                 onTarget.draggable.splice(c1, 1);
 
                                 break;
@@ -203,23 +229,23 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                     for (c1 = 0; c1 < state.targets.length; c1 += 1) {
                         target = state.targets[c1];
 
-                        if (offsetDE.top + 50 < target.offset.top) {
+                        if (offsetIE.top + draggableObj.iconHeight * 0.5 < target.offset.top) {
                             continue;
                         }
-                        if (offsetDE.top + 50 > target.offset.top + target.h) {
+                        if (offsetIE.top + draggableObj.iconHeight * 0.5 > target.offset.top + target.h) {
                             continue;
                         }
-                        if (offsetDE.left + 50 < target.offset.left) {
+                        if (offsetIE.left + draggableObj.iconWidth * 0.5 < target.offset.left) {
                             continue;
                         }
-                        if (offsetDE.left + 50 > target.offset.left + target.w) {
+                        if (offsetIE.left + draggableObj.iconWidth * 0.5 > target.offset.left + target.w) {
                             continue;
                         }
 
                         if (
                             (state.config.one_per_target === true) &&
                             (target.draggable.length === 1) &&
-                            (target.draggable[0] !== obj.id)
+                            (target.draggable[0] !== draggableObj.id)
                         ) {
                             continue;
                         }
@@ -233,10 +259,10 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         if ((onTarget !== null) && (onTarget.id !== target.id)) {
                             removeObjIdFromTarget();
                             onTarget = target;
-                            target.draggable.push(obj.id);
+                            target.draggable.push(draggableObj.id);
                         } else if (onTarget === null) {
                             onTarget = target;
-                            target.draggable.push(obj.id);
+                            target.draggable.push(draggableObj.id);
                         }
 
                         // Reposition the draggable so that it's center
@@ -248,8 +274,15 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                 }
 
                 function snapToTarget(target) {
-                    draggableContainerEl.css('left', target.offset.left + 0.5 * target.w - 50);
-                    draggableContainerEl.css('top', target.offset.top + 0.5 * target.h - 50);
+                    var offset;
+
+                    offset = 0;
+                    if (state.config.targetOutline === true) {
+                        offset = 1;
+                    }
+
+                    draggableObj.iconEl.css('left', target.offset.left + 0.5 * target.w - draggableObj.iconWidth * 0.5 + offset);
+                    draggableObj.iconEl.css('top', target.offset.top + 0.5 * target.h - draggableObj.iconHeight * 0.5 + offset);
                 }
 
                 // Go through all of the draggables subtract 1 from the z-index
@@ -266,18 +299,17 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                     var c1;
 
                     for (c1 = 0; c1 < state.draggables.length; c1++) {
-                        if (
-                            parseInt(draggableContainerEl.attr('data-old-z-index'), 10) <
-                            parseInt(state.draggables[c1].el.css('z-index'), 10)
-                        ) {
-                            state.draggables[c1].el.css(
+                        if (draggableObj.oldZIndex < state.draggables[c1].zIndex) {
+                            state.draggables[c1].zIndex -= 1;
+                            state.draggables[c1].iconEl.css(
                                 'z-index',
-                                parseInt(state.draggables[c1].el.css('z-index'), 10) - 1
+                                state.draggables[c1].zIndex
                             );
                         }
                     }
 
-                    draggableContainerEl.css('z-index', c1);
+                    draggableObj.zIndex = c1;
+                    draggableObj.iconEl.css('z-index', c1);
                 }
 
                 // If a draggable was released in a wrong positione, we will
@@ -286,47 +318,16 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                 function moveBackToSlider() {
                     var c1;
 
-                    draggableContainerEl.detach();
-                    draggableContainerEl.css('position', 'static');
+                    draggableObj.containerEl.show();
 
-                    // Get the position indexes of all draggables that are
-                    // currently in the slider, along with the corresponding
-                    // jQuery element.
-                    indexes = [];
-                    state.sliderEl.children().each(function (index, value) {
-                        indexes.push({
-                            'index': parseInt($(value).attr('data-draggable-position-index'), 10),
-                            'el': $(value)
-                        });
-                    });
+                    draggableObj.iconEl.detach();
 
-                    // Get the position index of the element that we are
-                    // inserting back into the slider.
-                    DEindex = parseInt(draggableContainerEl.attr('data-draggable-position-index'), 10);
+                    draggableObj.iconEl.css('top', (50 - draggableObj.iconHeight * 0.5) + 'px');
+                    draggableObj.iconEl.css('left', (50 - draggableObj.iconWidth * 0.5) + 'px');
 
-                    // Starting from the first position index that we
-                    // retrieved, and going up, if we find a position index
-                    // that is more than 'DEindex', we know that we must insert
-                    // the current element before the element with the greater
-                    // position index.
-                    for (c1 = 0; c1 < indexes.length; c1 += 1) {
-                        if ((inContainer === false) && (indexes[c1].index > DEindex)) {
-                            indexes[c1].el.before(draggableContainerEl);
-                            inContainer = true;
-                        }
-                    }
-
-                    // If we did not find a greater postion index, then either
-                    // there are no elements in the slider, or all of them
-                    // have a lesser position index. In both cases we add the
-                    // current draggable to the end.
-                    if (inContainer === false) {
-                        draggableContainerEl.appendTo(state.sliderEl);
-                    }
+                    draggableObj.iconEl.appendTo(draggableObj.containerEl);
 
                     inContainer = true;
-
-                    draggableContainerEl.css('border', '1px solid gray');
                 }
             }
         }

From 1cc23e3a4d0622198f191085409ea8c21e5fa7b1 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Thu, 3 Jan 2013 10:05:30 +0200
Subject: [PATCH 456/541] Bugfixing.

---
 common/static/js/capa/drag_and_drop/draggables.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index f70ae108b4..2123e7650a 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -193,8 +193,8 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                     } else {
                         correctZIndexes();
 
-                        draggableObj.x = offsetDE.left + 50;
-                        draggableObj.y = offsetDE.top + 50;
+                        draggableObj.x = offsetIE.left + draggableObj.iconWidth * 0.5;
+                        draggableObj.y = offsetIE.top + draggableObj.iconHeight * 0.5;
                     }
                 }
 

From 5a6e587a55312a2cab47a2874c60d1311fabcd59 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 3 Jan 2013 14:10:29 +0200
Subject: [PATCH 457/541] added case for mocking

---
 common/lib/capa/capa/inputtypes.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index 4cb75c9ce3..7bfc093a4d 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -869,7 +869,12 @@ class DragAndDropInput(InputTypeBase):
 
         self.loaded_attributes['drag_and_drop_json'] = json.dumps(to_js)
         self.to_render.add('drag_and_drop_json')
-        self.loaded_attributes['course_folder'] = self.system.course_id.split('/')[1]
+        # import ipdb; ipdb.set_trace()
+        try:  # for tests and mock up, work normally not in tets
+            self.loaded_attributes['course_folder'] = \
+                self.system.course_id.split('/')[1]
+        except:
+            self.loaded_attributes['course_folder'] = 'mock'
         self.to_render.add('course_folder')
 
 registry.register(DragAndDropInput)

From cac564de7e35ab96a47bb8b9c532bee8b7b97be8 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 3 Jan 2013 14:10:42 +0200
Subject: [PATCH 458/541] added test for inputtypes

---
 common/lib/capa/capa/tests/test_inputtypes.py | 52 +++++++++++++------
 1 file changed, 35 insertions(+), 17 deletions(-)

diff --git a/common/lib/capa/capa/tests/test_inputtypes.py b/common/lib/capa/capa/tests/test_inputtypes.py
index 4a4c6ee5bc..58b0bb2f9f 100644
--- a/common/lib/capa/capa/tests/test_inputtypes.py
+++ b/common/lib/capa/capa/tests/test_inputtypes.py
@@ -508,17 +508,24 @@ class DragAndDropTest(unittest.TestCase):
     '''
 
     def test_rendering(self):
-        height = '12'
-        width = '33'
-        template = "path to template"
-        images = "list of pathes to images"
+        path_to_images = '/static/images/'
 
-        xml_str = """<drag_and_drop_input id="prob_1_2"
-        height="{h}"
-        width="{w}"
-        template="{t}"
-        images="{i}"
-        />""".format(h=height, w=width, t=template, i=images)
+        xml_str = """
+        <drag_and_drop_input id="prob_1_2" img="{path}about_1.png" target_outline="false">
+            <draggable id="1" label="Label 1"/>
+            <draggable id="name_with_icon" label="cc" icon="{path}cc.jpg"/>
+            <draggable id="with_icon" label="arrow-left" icon="{path}arrow-left.png" />
+            <draggable id="5" label="Label2" />
+            <draggable id="2" label="Mute" icon="{path}mute.png" />
+            <draggable id="name_label_icon3" label="spinner" icon="{path}spinner.gif" />
+            <draggable id="name4" label="Star" icon="{path}volume.png" />
+            <draggable id="7" label="Label3" />
+
+            <target id="t1" x="210" y="90" w="90" h="90"/>
+            <target id="t2" x="370" y="160" w="90" h="90"/>
+
+        </drag_and_drop_input>
+        """.format(path=path_to_images)
 
         element = etree.fromstring(xml_str)
 
@@ -529,15 +536,26 @@ class DragAndDropTest(unittest.TestCase):
         the_input = lookup_tag('drag_and_drop_input')(test_system, element, state)
 
         context = the_input._get_render_context()
-
         expected = {'id': 'prob_1_2',
                     'value': value,
                     'status': 'unsubmitted',
+                    'course_folder': 'mock',
                     'msg': '',
-                    'width': width,
-                    'height': height,
-                    'template': template,
-                    'images': images,
-                   }
-
+                    'drag_and_drop_json': '{"use_targets": "True", \
+"target_outline": "false", "one_per_target": "True", \
+"draggables": [{"label": "Label 1", "id": "1", "icon": ""}, \
+{"label": "cc", "id": "name_with_icon", "icon": \
+"/static/images/cc.jpg"}, {"label": "arrow-left", "id": \
+"with_icon", "icon": "/static/images/arrow-left.png"}, \
+{"label": "Label2", "id": "5", "icon": ""}, {"label": \
+"Mute", "id": "2", "icon": "/static/images/mute.png"}, \
+{"label": "spinner", "id": "name_label_icon3", "icon": \
+"/static/images/spinner.gif"}, {"label": "Star", "id": \
+"name4", "icon": "/static/images/volume.png"}, {"label": \
+"Label3", "id": "7", "icon": ""}], "base_image": \
+"/static/images/about_1.png", "targets": \
+[{"y": "90", "x": "210", "id": "t1", "w": "90", "h": "90"}, \
+{"y": "160", "x": "370", "id": "t2", "w": "90", "h": "90"}]}',
+                    }
+        # import ipdb; ipdb.set_trace()
         self.assertEqual(context, expected)

From 6ed8598f53e4244555ededf38f2240010cf7ccf0 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 3 Jan 2013 14:10:54 +0200
Subject: [PATCH 459/541] added soem tests

---
 common/lib/capa/capa/graders/tests.py | 34 +++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/common/lib/capa/capa/graders/tests.py b/common/lib/capa/capa/graders/tests.py
index 0e95b810a9..0207b14b97 100644
--- a/common/lib/capa/capa/graders/tests.py
+++ b/common/lib/capa/capa/graders/tests.py
@@ -1,6 +1,40 @@
 import unittest
 
 import draganddrop
+from draganddrop import PositionsCompare
+
+
+class Test_PositionsCompare(unittest.TestCase):
+
+    def test_nested_list_and_list1(self):
+        self.assertEqual(PositionsCompare([[1, 2], 40]), PositionsCompare([1, 3]))
+
+    def test_nested_list_and_list2(self):
+        self.assertNotEqual(PositionsCompare([1, 12]), PositionsCompare([1, 1]))
+
+    def test_list_and_list1(self):
+        self.assertNotEqual(PositionsCompare([[1, 2], 12]), PositionsCompare([1, 15]))
+
+    def test_list_and_list2(self):
+        self.assertEqual(PositionsCompare([1, 11]), PositionsCompare([1, 1]))
+
+    def test_numerical_list_and_string_list(self):
+        self.assertNotEqual(PositionsCompare([1, 2]), PositionsCompare(["1"]))
+
+    def test_string_and_string_list1(self):
+        self.assertEqual(PositionsCompare("1"), PositionsCompare(["1"]))
+
+    def test_string_and_string_list2(self):
+        self.assertEqual(PositionsCompare("abc"), PositionsCompare("abc"))
+
+    def test_string_and_string_list3(self):
+        self.assertNotEqual(PositionsCompare("abd"), PositionsCompare("abe"))
+
+    def test_float_and_string(self):
+        self.assertNotEqual(PositionsCompare([3.5, 5.7]), PositionsCompare(["1"]))
+
+    def test_floats_and_ints(self):
+        self.assertEqual(PositionsCompare([3.5, 4.5]), PositionsCompare([5, 7]))
 
 
 class Test_DragAndDrop(unittest.TestCase):

From b436e6d4d1277956c807bf602d32134ca19630e0 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 3 Jan 2013 14:11:41 +0200
Subject: [PATCH 460/541] removed debugger call

---
 common/lib/capa/capa/tests/test_inputtypes.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/common/lib/capa/capa/tests/test_inputtypes.py b/common/lib/capa/capa/tests/test_inputtypes.py
index 58b0bb2f9f..0b3eeea0c6 100644
--- a/common/lib/capa/capa/tests/test_inputtypes.py
+++ b/common/lib/capa/capa/tests/test_inputtypes.py
@@ -557,5 +557,4 @@ class DragAndDropTest(unittest.TestCase):
 [{"y": "90", "x": "210", "id": "t1", "w": "90", "h": "90"}, \
 {"y": "160", "x": "370", "id": "t2", "w": "90", "h": "90"}]}',
                     }
-        # import ipdb; ipdb.set_trace()
         self.assertEqual(context, expected)

From 792cd34ce98d863c722d23d63a6846aeb761e8ca Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 3 Jan 2013 14:18:11 +0200
Subject: [PATCH 461/541] documentation for drag and drop inputtype python
 subclass

---
 common/lib/capa/capa/inputtypes.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index 7bfc093a4d..5cc5d8117b 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -791,8 +791,8 @@ registry.register(OpenEndedInput)
 
 class DragAndDropInput(InputTypeBase):
     """
-    Input for molecular geometry--show possible structures, let student
-    pick structure and label positions with atoms or electron pairs.
+    Input for drag and drop problems. Allows student to drag and drop images and
+    labels to base image.
     """
 
     template = 'drag_and_drop_input.html'
@@ -801,12 +801,14 @@ class DragAndDropInput(InputTypeBase):
     def setup(self):
 
         def parse(tag, tag_type):
-            """Parses <tag ... /> xml element to dictionary.
+            """Parses <tag ... /> xml element to dictionary. Stores
+                'draggable' and 'target' tags with attributes to dictionary and
+                returns last.
 
                 Args:
                     tag: xml etree element <tag...> with attributes
 
-                    tag_type: type of tag: 'draggable' or 'target'.
+                    tag_type: 'draggable' or 'target'.
 
                     If tag_type is 'draggable' : all attributes (name or label or
                     icon) are optional, but at least one attribute must be
@@ -841,7 +843,7 @@ class DragAndDropInput(InputTypeBase):
 
             return dic
 
-        # add labels to images:
+        # add labels to images?:
         self.no_labels = Attribute('no_labels',
                                         default="False").parse_from_xml(self.xml)
 
@@ -869,7 +871,6 @@ class DragAndDropInput(InputTypeBase):
 
         self.loaded_attributes['drag_and_drop_json'] = json.dumps(to_js)
         self.to_render.add('drag_and_drop_json')
-        # import ipdb; ipdb.set_trace()
         try:  # for tests and mock up, work normally not in tets
             self.loaded_attributes['course_folder'] = \
                 self.system.course_id.split('/')[1]

From 586a47a2ad2d4210f02c08d22bc679196c6553e6 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Thu, 3 Jan 2013 14:25:53 +0200
Subject: [PATCH 462/541] Rewrote functionality to include labels as separate
 from the container. Fixed bugs. Refactoring.

---
 .../js/capa/drag_and_drop/config_parser.js    |   2 +
 .../js/capa/drag_and_drop/draggables.js       | 178 +++++++++++++++---
 .../static/js/capa/drag_and_drop/scroller.js  |   8 +-
 common/static/js/capa/drag_and_drop/state.js  |   4 +-
 .../js/capa/drag_and_drop/update_input.js     | 103 +++++++---
 5 files changed, 242 insertions(+), 53 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/config_parser.js b/common/static/js/capa/drag_and_drop/config_parser.js
index 664324e0b9..6800cb7c97 100644
--- a/common/static/js/capa/drag_and_drop/config_parser.js
+++ b/common/static/js/capa/drag_and_drop/config_parser.js
@@ -12,6 +12,8 @@ define(['logme'], function (logme) {
 
         returnStatus = true;
 
+        logme('imageDir', imageDir);
+
         state.config = {
             'imageDir': '/static/' + imageDir + '/images',
             'draggables': [],
diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index 2123e7650a..c4c5a94ec0 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -11,11 +11,13 @@ define(['logme', 'update_input'], function (logme, updateInput) {
         var c1;
 
         state.draggables = [];
+        state.numDraggablesInSlider = 0;
 
         for (c1 = 0; c1 < state.config.draggables.length; c1 += 1) {
             processDraggable(state.config.draggables[c1], c1 + 1);
         }
 
+        state.updateArrowOpacity();
         state.currentMovingDraggable = null;
 
         $(document).mousemove(function (event) {
@@ -34,17 +36,35 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         state.baseImageEl.offset().top -
                         state.currentMovingDraggable.iconHeight * 0.5
                 );
+
+                if (state.currentMovingDraggable.labelEl !== null) {
+                    state.currentMovingDraggable.labelEl.css(
+                        'top',
+                        event.pageY -
+                            state.baseImageEl.offset().top +
+                            state.currentMovingDraggable.iconHeight * 0.5 +
+                            5
+                    );
+                    state.currentMovingDraggable.labelEl.css(
+                        'left',
+                        event.pageX -
+                            state.baseImageEl.offset().left -
+                            state.currentMovingDraggable.labelWidth * 0.5
+                    );
+                }
             }
         });
 
         return;
 
         function processDraggable(obj, objIndex) {
-            var inContainer, mousePressed, onTarget, draggableObj, marginCss;
+            var inContainer, mousePressed, onTarget, draggableObj;
 
-            draggableObj = {};
-
-            draggableObj.zIndex = objIndex;
+            draggableObj = {
+                'zIndex': objIndex,
+                'labelEl': null,
+                'hasLoaded': false
+            };
 
             draggableObj.containerEl = $(
                 '<div ' +
@@ -55,15 +75,19 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         'float: left; ' +
                         'overflow: hidden; ' +
                         'z-index: ' + objIndex + '; ' +
-                        'border: 1px solid #CCC; ' +
+                        'border-left: 1px solid #CCC; ' +
+                        'border-right: 1px solid #CCC; ' +
                         'text-align: center; ' +
                         'position: relative; ' +
                     '" ' +
                     '></div>'
             );
+
             draggableObj.containerEl.appendTo(state.sliderEl);
 
             if (obj.icon.length > 0) {
+                draggableObj.hasIcon = true;
+
                 draggableObj.iconEl = $('<img />');
                 draggableObj.iconEl.attr(
                     'src',
@@ -73,32 +97,90 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                     draggableObj.iconWidth = this.width;
                     draggableObj.iconHeight = this.height;
 
+                    if (draggableObj.iconWidth >= draggableObj.iconHeight) {
+                        draggableObj.iconWidthSmall = 60;
+                        draggableObj.iconHeightSmall = draggableObj.iconWidthSmall * (draggableObj.iconHeight / draggableObj.iconWidth);
+                    } else {
+                        draggableObj.iconHeightSmall = 60;
+                        draggableObj.iconWidthSmall = draggableObj.iconHeightSmall * (draggableObj.iconWidth / draggableObj.iconHeight);
+                    }
+
                     draggableObj.iconEl.css('position', 'absolute');
-                    draggableObj.iconEl.css('top', (50 - this.height * 0.5) + 'px');
-                    draggableObj.iconEl.css('left', (50 - this.width * 0.5) + 'px');
+
+                    draggableObj.iconEl.css('width', draggableObj.iconWidthSmall);
+                    draggableObj.iconEl.css('height', draggableObj.iconHeightSmall);
+
+                    draggableObj.iconEl.css('left', 50 - draggableObj.iconWidthSmall * 0.5);
+
+                    if (obj.label.length > 0) {
+                        draggableObj.iconEl.css('top', 5);
+                    } else {
+                        draggableObj.iconEl.css('top', 50 - draggableObj.iconHeightSmall * 0.5);
+                    }
 
                     draggableObj.iconEl.appendTo(draggableObj.containerEl);
-                });
 
-                draggableObj.iconEl.mousedown(mouseDown);
-                draggableObj.iconEl.mouseup(mouseUp);
-                draggableObj.iconEl.mousemove(mouseMove);
+                    if (obj.label.length > 0) {
+                        draggableObj.labelEl = $(
+                            '<div ' +
+                                'style=" ' +
+                                    'position: absolute; ' +
+                                '" ' +
+                            '>' +
+                                obj.label +
+                            '</div>'
+                        );
+
+                        draggableObj.labelEl.appendTo(draggableObj.containerEl);
+
+                        draggableObj.labelWidth = draggableObj.labelEl.width();
+
+                        draggableObj.labelEl.css('left', 50 - draggableObj.labelWidth * 0.5);
+                        draggableObj.labelEl.css('top', 5 + draggableObj.iconHeightSmall + 5);
+
+                        draggableObj.labelEl.mousedown(mouseDown);
+                        draggableObj.labelEl.mouseup(mouseUp);
+                        draggableObj.labelEl.mousemove(mouseMove);
+                    }
+
+                    draggableObj.hasLoaded = true;
+                });
             } else {
-                // Must fix - add +label support, and just label support.
-                return;
+                // To make life easier, if there is no icon, but there is a
+                // label, we will create a label and store it as if it was an
+                // icon. All the existing code will work, and the user will
+                // see a label instead of an icon.
+                if (obj.label.length > 0) {
+                    logme('We have a label length > 0.');
+
+                    draggableObj.iconEl = $(
+                        '<div ' +
+                            'style=" ' +
+                                'position: absolute; ' +
+                            '" ' +
+                        '>' +
+                            obj.label +
+                        '</div>'
+                    );
+
+                    draggableObj.iconEl.appendTo(draggableObj.containerEl);
+
+                    draggableObj.iconWidth = draggableObj.iconEl.width();
+                    draggableObj.iconHeight = draggableObj.iconEl.height();
+                    draggableObj.iconWidthSmall = draggableObj.iconWidth;
+                    draggableObj.iconHeightSmall = draggableObj.iconHeight;
+
+                    draggableObj.iconEl.css('left', 50 - draggableObj.iconWidthSmall * 0.5);
+                    draggableObj.iconEl.css('top', 50 - draggableObj.iconHeightSmall * 0.5);
+                } else {
+                    // If no icon and no label, don't create a draggable.
+                    return;
+                }
             }
 
-            // if (obj.label.length > 0) {
-            //     marginCss = '';
-            //
-            //     if (obj.icon.length === 0) {
-            //         marginCss = 'margin-top: 38px;';
-            //     }
-
-            //     draggableContainerEl.append(
-            //         $('<div style="clear: both; text-align: center; ' + marginCss + ' ">' + obj.label + '</div>')
-            //     );
-            // }
+            draggableObj.iconEl.mousedown(mouseDown);
+            draggableObj.iconEl.mouseup(mouseUp);
+            draggableObj.iconEl.mousemove(mouseMove);
 
             inContainer = true;
             mousePressed = false;
@@ -114,6 +196,12 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
             state.draggables.push(draggableObj);
 
+            state.numDraggablesInSlider += 1;
+
+            if (obj.icon.length === 0) {
+                draggableObj.hasLoaded = true;
+            }
+
             return;
 
             function mouseDown(event) {
@@ -125,11 +213,23 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         draggableObj.containerEl.hide();
 
                         draggableObj.iconEl.detach();
+
+                        draggableObj.iconEl.css('width', draggableObj.iconWidth);
+                        draggableObj.iconEl.css('height', draggableObj.iconHeight);
+
                         draggableObj.iconEl.css('left', event.pageX - state.baseImageEl.offset().left - draggableObj.iconWidth * 0.5);
                         draggableObj.iconEl.css('top', event.pageY - state.baseImageEl.offset().top - draggableObj.iconHeight * 0.5);
                         draggableObj.iconEl.appendTo(state.baseImageEl.parent());
 
+                        if (draggableObj.labelEl !== null) {
+                            draggableObj.labelEl.detach();
+                            draggableObj.labelEl.css('left', event.pageX - state.baseImageEl.offset().left - draggableObj.labelWidth * 0.5);
+                            draggableObj.labelEl.css('top', event.pageY - state.baseImageEl.offset().top + draggableObj.iconHeight * 0.5 + 5);
+                            draggableObj.labelEl.appendTo(state.baseImageEl.parent());
+                        }
+
                         inContainer = false;
+                        state.numDraggablesInSlider -= 1;
                     }
 
                     draggableObj.oldZIndex = draggableObj.zIndex;
@@ -178,6 +278,8 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                     } else {
                         moveBackToSlider();
                         removeObjIdFromTarget();
+
+                        state.numDraggablesInSlider += 1;
                     }
                 } else {
                     if (
@@ -190,6 +292,8 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
                         draggableObj.x = -1;
                         draggableObj.y = -1;
+
+                        state.numDraggablesInSlider += 1;
                     } else {
                         correctZIndexes();
 
@@ -283,6 +387,11 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
                     draggableObj.iconEl.css('left', target.offset.left + 0.5 * target.w - draggableObj.iconWidth * 0.5 + offset);
                     draggableObj.iconEl.css('top', target.offset.top + 0.5 * target.h - draggableObj.iconHeight * 0.5 + offset);
+
+                    if (draggableObj.labelEl !== null) {
+                        draggableObj.labelEl.css('left', target.offset.left + 0.5 * target.w - draggableObj.labelWidth * 0.5 + offset);
+                        draggableObj.labelEl.css('top', target.offset.top + 0.5 * target.h + draggableObj.iconHeight * 0.5 + 5 + offset);
+                    }
                 }
 
                 // Go through all of the draggables subtract 1 from the z-index
@@ -316,17 +425,30 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                 // move it back to the slider, placing it in the same position
                 // that it was dragged out of.
                 function moveBackToSlider() {
-                    var c1;
-
                     draggableObj.containerEl.show();
 
                     draggableObj.iconEl.detach();
 
-                    draggableObj.iconEl.css('top', (50 - draggableObj.iconHeight * 0.5) + 'px');
-                    draggableObj.iconEl.css('left', (50 - draggableObj.iconWidth * 0.5) + 'px');
+                    draggableObj.iconEl.css('width', draggableObj.iconWidthSmall);
+                    draggableObj.iconEl.css('height', draggableObj.iconHeightSmall);
+
+                    draggableObj.iconEl.css('left', 50 - draggableObj.iconWidthSmall * 0.5);
+
+                    if (draggableObj.labelEl !== null) {
+                        draggableObj.iconEl.css('top', 5);
+                    } else {
+                        draggableObj.iconEl.css('top', 50 - draggableObj.iconHeightSmall * 0.5);
+                    }
 
                     draggableObj.iconEl.appendTo(draggableObj.containerEl);
 
+                    if (draggableObj.labelEl !== null) {
+                        draggableObj.labelEl.detach();
+                        draggableObj.labelEl.css('left', 50 - draggableObj.labelWidth * 0.5);
+                        draggableObj.labelEl.css('top', 5 + draggableObj.iconHeightSmall + 5);
+                        draggableObj.labelEl.appendTo(draggableObj.containerEl);
+                    }
+
                     inContainer = true;
                 }
             }
diff --git a/common/static/js/capa/drag_and_drop/scroller.js b/common/static/js/capa/drag_and_drop/scroller.js
index d3a4d23eab..505785086d 100644
--- a/common/static/js/capa/drag_and_drop/scroller.js
+++ b/common/static/js/capa/drag_and_drop/scroller.js
@@ -105,7 +105,9 @@ define(['logme'], function (logme) {
             '<div ' +
                 'style=" ' +
                     'width: 20000px; ' +
-                    'height: 102px; ' +
+                    'height: 100px; ' +
+                    'border-top: 1px solid #CCC; ' +
+                    'border-bottom: 1px solid #CCC; ' +
                 '" ' +
             '></div>'
         );
@@ -158,7 +160,7 @@ define(['logme'], function (logme) {
 
             // When there are no more hidden draggables, prevent from
             // scrolling infinitely.
-            if (showElLeftMargin < -102 * (state.sliderEl.children().length - 6)) {
+            if (showElLeftMargin < -102 * (state.numDraggablesInSlider - 6)) {
                 return;
             }
 
@@ -192,7 +194,7 @@ define(['logme'], function (logme) {
             moveLeftEl.children('div').css('opacity', '1');
             moveRightEl.children('div').css('opacity', '1');
 
-            if (showElLeftMargin < -102 * (state.sliderEl.children().length - 6)) {
+            if (showElLeftMargin < -102 * (state.numDraggablesInSlider - 6)) {
                 moveRightEl.children('div').css('opacity', '.4');
             }
             if (showElLeftMargin > -102) {
diff --git a/common/static/js/capa/drag_and_drop/state.js b/common/static/js/capa/drag_and_drop/state.js
index 5bf957eff5..c3a4d3c4ac 100644
--- a/common/static/js/capa/drag_and_drop/state.js
+++ b/common/static/js/capa/drag_and_drop/state.js
@@ -14,7 +14,9 @@ define([], function () {
             // Will indicate when all targetsand draggables have been loaded,
             // processed, and postioned intially.
             'targetsLoaded': false,
-            'draggablesLoaded': false
+            'draggablesLoaded': false,
+
+            'numDraggablesInSlider': 0
         };
     }
 });
diff --git a/common/static/js/capa/drag_and_drop/update_input.js b/common/static/js/capa/drag_and_drop/update_input.js
index 6ebf62ef11..0ae95e6a30 100644
--- a/common/static/js/capa/drag_and_drop/update_input.js
+++ b/common/static/js/capa/drag_and_drop/update_input.js
@@ -75,7 +75,12 @@ define(['logme'], function (logme) {
 
         function repositionDraggables(answer) {
             var draggableId, draggable, targetId, target, draggablePosition,
-                c1;
+                c1, offset;
+
+            offset = 0;
+            if (state.config.targetOutline === true) {
+                offset = 1;
+            }
 
             logme(answer);
 
@@ -98,22 +103,47 @@ define(['logme'], function (logme) {
                             continue;
                         }
 
+                        (function (c1, draggableId, draggable) {
+                            moveDraggableToBaseImage();
+                            return;
 
-                        draggable.setInContainer(false);
+                            function moveDraggableToBaseImage() {
+                                if (draggable.hasLoaded === false) {
+                                    setTimeout(moveDraggableToBaseImage, 50);
+                                    return;
+                                }
 
-                        draggable.el.detach();
-                        draggable.el.css('border', 'none');
-                        draggable.el.css('position', 'absolute');
-                        draggable.el.css('left', answer.draggables[c1][draggableId][0] - 50);
-                        draggable.el.css('top', answer.draggables[c1][draggableId][1] - 50);
+                                draggable.setInContainer(false);
+                                draggable.containerEl.hide();
 
-                        draggable.el.css('left', target.offset.left + 0.5 * target.w - 50);
-                        draggable.el.css('top', target.offset.top + 0.5 * target.h - 50);
+                                draggable.iconEl.detach();
 
-                        draggable.el.appendTo(state.baseImageEl.parent());
+                                draggable.iconEl.css('width', draggable.iconWidth);
+                                draggable.iconEl.css('height', draggable.iconHeight);
+                                draggable.iconEl.css(
+                                    'left',
+                                    target.offset.left + 0.5 * target.w - draggable.iconWidth * 0.5 + offset
+                                );
+                                draggable.iconEl.css(
+                                    'top',
+                                    target.offset.top + 0.5 * target.h - draggable.iconHeight * 0.5 + offset
+                                );
 
-                        draggable.setOnTarget(target);
-                        target.draggable.push(draggableId);
+                                draggable.iconEl.appendTo(state.baseImageEl.parent());
+
+                                if (draggable.labelEl !== null) {
+                                    draggable.labelEl.detach();
+
+                                    draggable.labelEl.css('left', target.offset.left + 0.5 * target.w - draggable.labelWidth * 0.5 + offset);
+                                    draggable.labelEl.css('top', target.offset.top + 0.5 * target.h + draggable.iconHeight * 0.5 + 5 + offset);
+
+                                    draggable.labelEl.appendTo(state.baseImageEl.parent());
+                                }
+
+                                draggable.setOnTarget(target);
+                                target.draggable.push(draggableId);
+                            }
+                        }(c1, draggableId, draggable));
                     }
                 }
             } else if (
@@ -128,17 +158,47 @@ define(['logme'], function (logme) {
                             continue;
                         }
 
-                        draggable.setInContainer(false);
+                        (function (c1, draggableId, draggable) {
+                            moveDraggableToBaseImage();
+                            return;
 
-                        draggable.el.detach();
-                        draggable.el.css('border', 'none');
-                        draggable.el.css('position', 'absolute');
-                        draggable.el.css('left', answer.draggables[c1][draggableId][0] - 50);
-                        draggable.el.css('top', answer.draggables[c1][draggableId][1] - 50);
-                        draggable.el.appendTo(state.baseImageEl.parent());
+                            function moveDraggableToBaseImage() {
+                                if (draggable.hasLoaded === false) {
+                                    setTimeout(moveDraggableToBaseImage, 50);
+                                    return;
+                                }
 
-                        draggable.x = answer.draggables[c1][draggableId][0];
-                        draggable.y = answer.draggables[c1][draggableId][1];
+                                draggable.setInContainer(false);
+                                draggable.containerEl.hide();
+
+                                draggable.iconEl.detach();
+
+                                draggable.iconEl.css('width', draggable.iconWidth);
+                                draggable.iconEl.css('height', draggable.iconHeight);
+                                draggable.iconEl.css(
+                                    'left',
+                                    answer.draggables[c1][draggableId][0] - draggable.iconWidth * 0.5 + offset
+                                );
+                                draggable.iconEl.css(
+                                    'top',
+                                    answer.draggables[c1][draggableId][0] - draggable.iconHeight * 0.5 + offset
+                                );
+
+                                draggable.iconEl.appendTo(state.baseImageEl.parent());
+
+                                if (draggable.labelEl !== null) {
+                                    draggable.labelEl.detach();
+
+                                    draggable.labelEl.css('left', answer.draggables[c1][draggableId][0] - draggable.iconWidth * 0.5 - draggable.labelWidth * 0.5 + offset);
+                                    draggable.labelEl.css('top', answer.draggables[c1][draggableId][0] - draggable.iconHeight * 0.5 + draggable.iconHeight + 5 + offset);
+
+                                    draggable.labelEl.appendTo(state.baseImageEl.parent());
+                                }
+
+                                draggable.x = answer.draggables[c1][draggableId][0];
+                                draggable.y = answer.draggables[c1][draggableId][1];
+                            }
+                        }(c1, draggableId, draggable));
                     }
                 }
             } else {
@@ -147,6 +207,7 @@ define(['logme'], function (logme) {
                 return;
             }
 
+            state.numDraggablesInSlider -= 1;
             state.updateArrowOpacity();
         }
 

From 28f7a68e4238c57db001333d35f313f94983418b Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 3 Jan 2013 14:26:14 +0200
Subject: [PATCH 463/541] fix grammar

---
 common/lib/capa/capa/inputtypes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index 5cc5d8117b..c968130fdc 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -815,7 +815,7 @@ class DragAndDropInput(InputTypeBase):
                     presented.
 
                     If tag_type is 'target' all attributes (name, x, y, w, h)
-                    are requred. (x, y) - coordinates of center of target,
+                    are required. (x, y) - coordinates of center of target,
                     w, h - weight and height of target.
 
                 Returns:

From 17b01071d075d0126126814c63f63ada555ff96a Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Thu, 3 Jan 2013 15:11:37 +0200
Subject: [PATCH 464/541] Fixed bug.

---
 common/static/js/capa/drag_and_drop/update_input.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/update_input.js b/common/static/js/capa/drag_and_drop/update_input.js
index 0ae95e6a30..31e2295edb 100644
--- a/common/static/js/capa/drag_and_drop/update_input.js
+++ b/common/static/js/capa/drag_and_drop/update_input.js
@@ -82,6 +82,7 @@ define(['logme'], function (logme) {
                 offset = 1;
             }
 
+            logme('!!!!!!!!!!!!!!!! answer');
             logme(answer);
 
             if (
@@ -103,7 +104,7 @@ define(['logme'], function (logme) {
                             continue;
                         }
 
-                        (function (c1, draggableId, draggable) {
+                        (function (c1, draggableId, draggable, targetId, target) {
                             moveDraggableToBaseImage();
                             return;
 
@@ -113,6 +114,8 @@ define(['logme'], function (logme) {
                                     return;
                                 }
 
+                                logme('use_targets = false; draggableId: ' + draggableId);
+
                                 draggable.setInContainer(false);
                                 draggable.containerEl.hide();
 
@@ -143,7 +146,7 @@ define(['logme'], function (logme) {
                                 draggable.setOnTarget(target);
                                 target.draggable.push(draggableId);
                             }
-                        }(c1, draggableId, draggable));
+                        }(c1, draggableId, draggable, targetId, target));
                     }
                 }
             } else if (
@@ -164,10 +167,13 @@ define(['logme'], function (logme) {
 
                             function moveDraggableToBaseImage() {
                                 if (draggable.hasLoaded === false) {
+                                    logme('draggable.hasLoaded === false');
                                     setTimeout(moveDraggableToBaseImage, 50);
                                     return;
                                 }
 
+                                logme('use_targets = false; draggableId: ' + draggableId);
+
                                 draggable.setInContainer(false);
                                 draggable.containerEl.hide();
 

From ab95193252581086e3e3313554f3ad9d3e655ee6 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Thu, 3 Jan 2013 15:21:18 +0200
Subject: [PATCH 465/541] Bugfixing.

---
 common/static/js/capa/drag_and_drop/update_input.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/update_input.js b/common/static/js/capa/drag_and_drop/update_input.js
index 31e2295edb..87f82dd146 100644
--- a/common/static/js/capa/drag_and_drop/update_input.js
+++ b/common/static/js/capa/drag_and_drop/update_input.js
@@ -74,8 +74,7 @@ define(['logme'], function (logme) {
         }
 
         function repositionDraggables(answer) {
-            var draggableId, draggable, targetId, target, draggablePosition,
-                c1, offset;
+            var draggableId, draggable, targetId, target, c1, offset;
 
             offset = 0;
             if (state.config.targetOutline === true) {
@@ -104,7 +103,7 @@ define(['logme'], function (logme) {
                             continue;
                         }
 
-                        (function (c1, draggableId, draggable, targetId, target) {
+                        (function (draggableId, draggable, targetId, target) {
                             moveDraggableToBaseImage();
                             return;
 
@@ -146,7 +145,7 @@ define(['logme'], function (logme) {
                                 draggable.setOnTarget(target);
                                 target.draggable.push(draggableId);
                             }
-                        }(c1, draggableId, draggable, targetId, target));
+                        }(draggableId, draggable, targetId, target));
                     }
                 }
             } else if (
@@ -187,7 +186,7 @@ define(['logme'], function (logme) {
                                 );
                                 draggable.iconEl.css(
                                     'top',
-                                    answer.draggables[c1][draggableId][0] - draggable.iconHeight * 0.5 + offset
+                                    answer.draggables[c1][draggableId][1] - draggable.iconHeight * 0.5 + offset
                                 );
 
                                 draggable.iconEl.appendTo(state.baseImageEl.parent());
@@ -196,7 +195,7 @@ define(['logme'], function (logme) {
                                     draggable.labelEl.detach();
 
                                     draggable.labelEl.css('left', answer.draggables[c1][draggableId][0] - draggable.iconWidth * 0.5 - draggable.labelWidth * 0.5 + offset);
-                                    draggable.labelEl.css('top', answer.draggables[c1][draggableId][0] - draggable.iconHeight * 0.5 + draggable.iconHeight + 5 + offset);
+                                    draggable.labelEl.css('top', answer.draggables[c1][draggableId][1] - draggable.iconHeight * 0.5 + draggable.iconHeight + 5 + offset);
 
                                     draggable.labelEl.appendTo(state.baseImageEl.parent());
                                 }

From 75ff3aaaa044d5009dc4f3040a910ebc4dc83781 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 3 Jan 2013 15:24:13 +0200
Subject: [PATCH 466/541] docs and denied rule refactores

---
 common/lib/capa/capa/graders/draganddrop.py | 129 ++++++++++----------
 1 file changed, 67 insertions(+), 62 deletions(-)

diff --git a/common/lib/capa/capa/graders/draganddrop.py b/common/lib/capa/capa/graders/draganddrop.py
index e02304aef0..414cef91a5 100644
--- a/common/lib/capa/capa/graders/draganddrop.py
+++ b/common/lib/capa/capa/graders/draganddrop.py
@@ -18,13 +18,12 @@ If use_targets is false:
  {
     "use_targets": false,
     "draggable": [
-        { "image1": "(10, 20)"  },
-        { "ant": "(30, 40)"  },
-        { "molecule": "(100, 200)"  },
+        { "image1": "[10, 20]"  },
+        { "ant": "[30, 40]"  },
+        { "molecule": "[100, 200]"  },
                 ]
 }
 values are (x,y) coordinates of centers of dragged images.
-
 """
 
 import json
@@ -32,55 +31,58 @@ from collections import OrderedDict
 
 
 class PositionsCompare(list):
-    """Inputs are: "abc" - target
+    """ Class for comparing positions.
+
+        Args:
+                list or string::
+                    "abc" - target
                     [10, 20] - list of integers
                     [[10,20], 200] list of list and integer
 
     """
     def __eq__(self, other):
-        # Default lists behaviour is convers "abc" to ["a", "b", "c"].
-        # We will use that.
-        # import ipdb; ipdb.set_trace()
+        """ Compares two arguments.
 
-        #check if self or other is not empty list (empty lists  = false)
+        Default lists behavior is conversion of string "abc" to  list
+        ["a", "b", "c"]. We will use that.
+
+        If self or other is empty - returns False.
+
+        Args:
+                self, other: str, unicode, list, int, float
+
+        Returns: bool
+        """
+        # checks if self or other is not empty list (empty lists  = false)
         if not self or not other:
             return False
 
-        # check correct input types
-        if (not isinstance(self[0], (str, unicode, list, int, float)) or
-            not isinstance(other[0], (str, unicode, list, int, float))):
-            print 'Incorrect input type'
-            return False
-
         if (isinstance(self[0], (list, int, float)) and
             isinstance(other[0], (list, int, float))):
-            print 'Numerical position compare'
             return self.coordinate_positions_compare(other)
+
         elif (isinstance(self[0], (unicode, str)) and
               isinstance(other[0], (unicode, str))):
-            print 'Targets compare'
             return ''.join(self) == ''.join(other)
-        else:
-            # we do not have ints or lists of lists or two string/unicode lists
-            # on both sides
-            print type(self[0]), type(other[0]), "not correct"
+        else:  # improper argument types
+            # Now we have no (float / int or lists of list and float / int pair)
+            # or two string / unicode lists pair
             return False
 
     def __ne__(self, other):
         return not self.__eq__(other)
 
     def coordinate_positions_compare(self, other, r=10):
-        """ Checks if pos1 is  equal to pos2 inside radius
-        of forgiveness (default 10 px).
+        """ Checks if self is equal to other inside radius of forgiveness
+            (default 10 px).
 
             Args:
-                self, other: [x, y] or [[x, y], r], where
-                             r is radius of forgiveness;
+                self, other: [x, y] or [[x, y], r], where r is radius of
+                             forgiveness;
                              x, y, r: int
 
             Returns: bool.
         """
-        print 'I am called',  self, other
         # get max radius of forgiveness
         if isinstance(self[0], list):  # [(x, y), r] case
             r = max(self[1], r)
@@ -101,62 +103,56 @@ class PositionsCompare(list):
 
 
 class DragAndDrop(object):
+    """ Grader for drag and drop inputtype.
+    """
 
     def __init__(self):
-        self.correct_groups = OrderedDict()  # groups
-        self.correct_positions = OrderedDict()  # positions of comparing
-        self.user_groups = OrderedDict()
-        self.user_positions = OrderedDict()
+        self.correct_groups = OrderedDict()  # correct groups from xml
+        self.correct_positions = OrderedDict()  # correct positions for comparing
+        self.user_groups = OrderedDict()  # will be populated from user answer
+        self.user_positions = OrderedDict()  # will be populated from user answer
+
+        # flag to check if user answer has more draggables than correct answer
         self.incorrect = False
 
     def grade(self):
-        '''
-        Grade drag and drop problem.
-        If use_targets is True - checks if image placed on proper target.
-        If use_targets is False - checks if image placed on proper coordinates,
-        with setted radius of forgiveness (default is 10)
+        ''' Grader user answer.
 
-        Args:
-            user_input, correct_answer: json. Format:
+        If use_targets is True - checks if every draggable isplaced on proper
+         target.
 
-            user_input: see module docstring
+        If use_targets is False - checks if every draggable is placed on proper
+         coordinates within radius of forgiveness (default is 10).
 
-            correct_answer:
-                if use_targets is True:
-                    {'1': 't1',  'name_with_icon': 't2'}
-                else:
-                    {'1': '[10, 10]',  'name_with_icon': '[[10, 10], 20]'}
-
-        Returns:
-            True or False.
+        Returns: bool.
         '''
 
-        if self.incorrect:
+        if self.incorrect:  # user answer has more draggables than correct answer
             return False
 
+        # checks if we have same groups of draggables
         if sorted(self.correct_groups.keys()) != sorted(self.user_groups.keys()):
             return False
+
+        # checks if for every groups draggables names are same
         for groupname, draggable_ids in self.correct_groups.items():
             if sorted(draggable_ids) != sorted(self.user_groups[groupname]):
                 return False
+
         # from now self.correct_groups and self.user_groups are equal if
         # order is ignored
 
-        # Check fo every group that positions of every group element are equal
-        # with positions
+        # Checks in every group that user positions of every element are equal
+        # with correct positions for every rule
 
-        # 'denied' rule
-        denied_positions = [item for g in self.correct_groups.keys()
-                        for item in self.correct_positions[g].get('denied', [])]
-        all_user_positions = [item for g in self.correct_groups.keys()
-                                for item in self.user_positions[g]['user']]
-        if not self.compare_positions(denied_positions,
-                                          all_user_positions, flag='denied'):
-            return False
+        for group in self.correct_groups:  # 'denied' rule
+            if not self.compare_positions(self.correct_positions[group].get(
+            'denied', []), self.user_positions[group]['user'], flag='denied'):
+                return False
 
         no_exact, no_allowed, no_anyof = False, False, False
-        # 'exact' rule
-        for groupname in self.correct_groups:
+
+        for groupname in self.correct_groups:  # 'exact' rule
             if self.correct_positions[groupname].get('exact', []):
                 if not self.compare_positions(
                         self.correct_positions[groupname]['exact'],
@@ -165,8 +161,7 @@ class DragAndDrop(object):
             else:
                 no_exact = True
 
-        # 'allowed' rule
-        for groupname in self.correct_groups:
+        for groupname in self.correct_groups:  # 'allowed' rule
             if self.correct_positions[groupname].get('allowed', []):
                 if not self.compare_positions(
                         self.correct_positions[groupname]['allowed'],
@@ -260,7 +255,17 @@ class DragAndDrop(object):
 
 
 def grade(user_input, correct_answer):
-    """ Support 2 interfaces"""
+    """Args:
+            user_input, correct_answer: json. Format:
+
+            user_input: see module docstring
+
+            correct_answer:
+                if use_targets is True:
+                    {'1': 't1',  'name_with_icon': 't2'}
+                else:
+                    {'1': '[10, 10]',  'name_with_icon': '[[10, 10], 20]'}
+    Support 2 interfaces"""
     if isinstance(correct_answer, dict):
         dnd = DragAndDrop()
     else:

From 315137876890d69538d1cd4379ed8f7493331b39 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 3 Jan 2013 15:50:47 +0200
Subject: [PATCH 467/541] removed denied and allowed rule

---
 common/lib/capa/capa/graders/draganddrop.py | 71 ++++++++-------------
 1 file changed, 27 insertions(+), 44 deletions(-)

diff --git a/common/lib/capa/capa/graders/draganddrop.py b/common/lib/capa/capa/graders/draganddrop.py
index 414cef91a5..1eb1a1b495 100644
--- a/common/lib/capa/capa/graders/draganddrop.py
+++ b/common/lib/capa/capa/graders/draganddrop.py
@@ -145,42 +145,25 @@ class DragAndDrop(object):
         # Checks in every group that user positions of every element are equal
         # with correct positions for every rule
 
-        for group in self.correct_groups:  # 'denied' rule
-            if not self.compare_positions(self.correct_positions[group].get(
-            'denied', []), self.user_positions[group]['user'], flag='denied'):
-                return False
+        # for group in self.correct_groups:  # 'denied' rule
+        #     if not self.compare_positions(self.correct_positions[group].get(
+        #     'denied', []), self.user_positions[group]['user'], flag='denied'):
+        #         return False
 
-        no_exact, no_allowed, no_anyof = False, False, False
+        passed_rules = dict()
+        for rule in ('exact', 'anyof'):
+            passed_rules[rule] = True
+            for groupname in self.correct_groups:
+                if self.correct_positions[groupname].get(rule, []):
+                    if not self.compare_positions(
+                            self.correct_positions[groupname][rule],
+                            self.user_positions[groupname]['user'], flag=rule):
+                        return False
+                else:
+                    passed_rules[rule] = False
 
-        for groupname in self.correct_groups:  # 'exact' rule
-            if self.correct_positions[groupname].get('exact', []):
-                if not self.compare_positions(
-                        self.correct_positions[groupname]['exact'],
-                        self.user_positions[groupname]['user'], flag='exact'):
-                    return False
-            else:
-                no_exact = True
-
-        for groupname in self.correct_groups:  # 'allowed' rule
-            if self.correct_positions[groupname].get('allowed', []):
-                if not self.compare_positions(
-                        self.correct_positions[groupname]['allowed'],
-                        self.user_positions[groupname]['user'], flag='allowed'):
-                    return False
-            else:
-                no_allowed = True
-
-        # 'anyof' rule
-        for groupname in self.correct_groups:
-            if self.correct_positions[groupname].get('anyof', []):
-                if not self.compare_positions(
-                        self.correct_positions[groupname]['anyof'],
-                        self.user_positions[groupname]['user'], flag='anyof'):
-                    return False
-            else:
-                no_anyof = True
-
-        if no_allowed and no_exact and no_anyof:
+        # if all passed rules are false
+        if not reduce(lambda x, y: x or y, passed_rules):
             return False
 
         return True
@@ -188,16 +171,16 @@ class DragAndDrop(object):
     def compare_positions(self, correct, user, flag):
         """ order of correct/user is matter only in anyof_flag"""
         # import ipdb; ipdb.set_trace()
-        if flag == 'denied':
-            for el1 in correct:
-                for el2 in user:
-                    if PositionsCompare(el1) == PositionsCompare(el2):
-                        return False
+        # if flag == 'denied':
+        #     for el1 in correct:
+        #         for el2 in user:
+        #             if PositionsCompare(el1) == PositionsCompare(el2):
+        #                 return False
 
-        if flag == 'allowed':
-            for el1, el2 in zip(sorted(correct), sorted(user)):
-                if PositionsCompare(el1) != PositionsCompare(el2):
-                    return False
+        # if flag == 'allowed':
+        #     for el1, el2 in zip(sorted(correct), sorted(user)):
+        #         if PositionsCompare(el1) != PositionsCompare(el2):
+        #             return False
 
         if flag == 'exact':
             for el1, el2 in zip(correct, user):
@@ -210,7 +193,7 @@ class DragAndDrop(object):
                 for c_el in correct:
                     if PositionsCompare(u_el) == PositionsCompare(c_el):
                         count += 1
-                        continue
+                        break
             if count != len(user):
                 return False
 

From 16ecdadfc67284188ce89fc4ff309638c9158be4 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 3 Jan 2013 16:15:32 +0200
Subject: [PATCH 468/541] changed interface

---
 common/lib/capa/capa/graders/draganddrop.py | 23 +++++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/common/lib/capa/capa/graders/draganddrop.py b/common/lib/capa/capa/graders/draganddrop.py
index 1eb1a1b495..594f311b81 100644
--- a/common/lib/capa/capa/graders/draganddrop.py
+++ b/common/lib/capa/capa/graders/draganddrop.py
@@ -201,11 +201,15 @@ class DragAndDrop(object):
 
     def populate(self, correct_answer, user_answer):
         """  """
-
+        # convert from dict format to list format
+        tmp = []
         if isinstance(correct_answer, dict):
             for key, value in correct_answer.items():
-                self.correct_groups[key] = [key]
-                self.correct_positions[key] = {'exact': [value]}
+                tmp_dict = {'draggables': [], 'targets': [], 'rule': 'exact'}
+                tmp_dict['draggables'].append(key)
+                tmp_dict['targets'].append(value)
+                tmp.append(tmp_dict)
+        correct_answer = tmp
 
         user_answer = json.loads(user_answer)
         self.use_targets = user_answer.get('use_targets')
@@ -216,7 +220,12 @@ class DragAndDrop(object):
         # create identical data structures
         # user groups must mirror correct_groups
         # and positions  must reflect order in group
-        for groupname in self.correct_groups:
+        for i in xrange(0, len(correct_answer)):
+            groupname = str(i)
+            self.correct_groups = OrderedDict()
+            self.correct_groups[groupname] = correct_answer[i]['draggables']
+            self.correct_positions = OrderedDict()
+            self.correct_positions[groupname] = {correct_answer[i]['rule']: correct_answer[i]['targets']}
             self.user_groups[groupname] = []
             self.user_positions[groupname] = {'user': []}
             for draggable_dict in user_answer['draggables']:
@@ -249,10 +258,6 @@ def grade(user_input, correct_answer):
                 else:
                     {'1': '[10, 10]',  'name_with_icon': '[[10, 10], 20]'}
     Support 2 interfaces"""
-    if isinstance(correct_answer, dict):
-        dnd = DragAndDrop()
-    else:
-        dnd = correct_answer
-
+    dnd = DragAndDrop()
     dnd.populate(correct_answer=correct_answer, user_answer=user_input)
     return dnd.grade()

From efdc4c7b7cfdffd8d5920186e4298da68b3aa7a2 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Thu, 3 Jan 2013 16:17:55 +0200
Subject: [PATCH 469/541] Updated tests for new XML format.

---
 common/lib/capa/capa/graders/tests.py | 96 +++++++++++++++------------
 1 file changed, 54 insertions(+), 42 deletions(-)

diff --git a/common/lib/capa/capa/graders/tests.py b/common/lib/capa/capa/graders/tests.py
index 0207b14b97..a7876dd6a9 100644
--- a/common/lib/capa/capa/graders/tests.py
+++ b/common/lib/capa/capa/graders/tests.py
@@ -128,28 +128,34 @@ class Test_DragAndDrop(unittest.TestCase):
         {"2":"p_pi_1"},{"3":"p_pi_2"},{"11":"s_sigma_name"}, \
         {"13":"s_sigma_star_name"},{"15":"p_pi_name"},{"16":"p_pi_star_name"}, \
         {"12":"p_sigma_name"},{"14":"p_sigma_star_name"}]}'
-        correct_answer = draganddrop.DragAndDrop()
-        correct_answer.correct_groups['filled_levels'] = ['1', '2', '3', '4', '5', '6']
-        correct_answer.correct_positions['filled_levels'] = {'allowed': [
-        's_left', 's_right', 's_sigma', 's_sigma_star', 'p_pi_1', 'p_pi_2']}
 
-        correct_answer.correct_groups['spin_up'] = ['7', '8', '9', '10']
-        correct_answer.correct_positions['spin_up'] = {'allowed':
-            ['p_left_1', 'p_left_2', 'p_right_1', 'p_right_2']}
-
-        correct_answer.correct_groups['sigma'] = ['11', '12']
-        correct_answer.correct_positions['sigma'] = {'allowed':
-            ['s_sigma_name', 'p_sigma_name']}
-
-        correct_answer.correct_groups['sigma_star'] = ['13', '14']
-        correct_answer.correct_positions['sigma_star'] = {'allowed':
-            ['s_sigma_star_name', 'p_sigma_star_name']}
-
-        correct_answer.correct_groups['pi'] = ['15']
-        correct_answer.correct_positions['pi'] = {'allowed': ['p_pi_name']}
-
-        correct_answer.correct_groups['pi_star'] = ['16']
-        correct_answer.correct_positions['pi_star'] = {'allowed': ['p_pi_star_name']}
+        correct_answers = [{
+        'draggables': ['1', '2', '3', '4', '5', '6'],
+        'targets': [
+            's_left', 's_right', 's_sigma', 's_sigma_star', 'p_pi_1', 'p_pi_2'
+        ],
+        'rule': 'anyof'
+    }, {
+        'draggables': ['7','8', '9', '10'],
+        'targets': ['p_left_1', 'p_left_2', 'p_right_1','p_right_2'],
+        'rule': 'anyof'
+    }, {
+        'draggables': ['11', '12'],
+        'targets': ['s_sigma_name', 'p_sigma_name'],
+        'rule': 'anyof'
+    }, {
+        'draggables': ['13', '14'],
+        'targets': ['s_sigma_star_name', 'p_sigma_star_name'],
+        'rule': 'anyof'
+    }, {
+        'draggables': ['15'],
+        'targets': ['p_pi_name'],
+        'rule': 'anyof'
+    }, {
+        'draggables': ['16'],
+        'targets': ['p_pi_star_name'],
+        'rule': 'anyof'
+    }]
 
         self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
@@ -161,28 +167,34 @@ class Test_DragAndDrop(unittest.TestCase):
         {"2":"p_pi_1"},{"3":"p_pi_2"},{"11":"s_sigma_name"}, \
         {"13":"s_sigma_star_name"},{"15":"p_pi_name"},{"16":"p_pi_star_name"}, \
         {"12":"p_sigma_name"},{"14":"p_sigma_star_name"}]}'
-        correct_answer = draganddrop.DragAndDrop()
-        correct_answer.correct_groups['filled_levels'] = ['1', '2', '3', '4', '5', '6']
-        correct_answer.correct_positions['filled_levels'] = {'allowed': [
-        's_left', 's_right', 's_sigma', 's_sigma_star', 'p_pi_1', 'p_pi_2']}
 
-        correct_answer.correct_groups['spin_up'] = ['7', '8', '9', '10']
-        correct_answer.correct_positions['spin_up'] = {'allowed':
-            ['p_left_1', 'p_left_2', 'p_right_1', 'p_right_2']}
-
-        correct_answer.correct_groups['sigma'] = ['11', '12']
-        correct_answer.correct_positions['sigma'] = {'allowed':
-            ['s_sigma_name', 'p_sigma_name']}
-
-        correct_answer.correct_groups['sigma_star'] = ['13', '14']
-        correct_answer.correct_positions['sigma_star'] = {'allowed':
-            ['s_sigma_star_name', 'p_sigma_star_name']}
-
-        correct_answer.correct_groups['pi'] = ['15']
-        correct_answer.correct_positions['pi'] = {'allowed': ['p_pi_name']}
-
-        correct_answer.correct_groups['pi_star'] = ['16']
-        correct_answer.correct_positions['pi_star'] = {'allowed': ['p_pi_star_name']}
+        correct_answers = [{
+        'draggables': ['1', '2', '3', '4', '5', '6'],
+        'targets': [
+            's_left', 's_right', 's_sigma', 's_sigma_star', 'p_pi_1', 'p_pi_2'
+        ],
+        'rule': 'anyof'
+    }, {
+        'draggables': ['7','8', '9', '10'],
+        'targets': ['p_left_1', 'p_left_2', 'p_right_1','p_right_2'],
+        'rule': 'anyof'
+    }, {
+        'draggables': ['11', '12'],
+        'targets': ['s_sigma_name', 'p_sigma_name'],
+        'rule': 'anyof'
+    }, {
+        'draggables': ['13', '14'],
+        'targets': ['s_sigma_star_name', 'p_sigma_star_name'],
+        'rule': 'anyof'
+    }, {
+        'draggables': ['15'],
+        'targets': ['p_pi_name'],
+        'rule': 'anyof'
+    }, {
+        'draggables': ['16'],
+        'targets': ['p_pi_star_name'],
+        'rule': 'anyof'
+    }]
 
         self.assertFalse(draganddrop.grade(user_input, correct_answer))
 

From 17f11cef077e9972ef5f2705cd54a22cd899933b Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 3 Jan 2013 16:18:11 +0200
Subject: [PATCH 470/541] added comments

---
 common/lib/capa/capa/graders/tests.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/common/lib/capa/capa/graders/tests.py b/common/lib/capa/capa/graders/tests.py
index a7876dd6a9..d5a65c7596 100644
--- a/common/lib/capa/capa/graders/tests.py
+++ b/common/lib/capa/capa/graders/tests.py
@@ -199,6 +199,11 @@ class Test_DragAndDrop(unittest.TestCase):
         self.assertFalse(draganddrop.grade(user_input, correct_answer))
 
 
+        #test for every function in DND
+
+        # test for different denied-allowed positions inised
+        # different groups
+
 def suite():
 
     testcases = [Test_DragAndDrop]

From 6aaad83abc7e4c3a1eece6deabb64d82eea4e5f8 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 3 Jan 2013 16:33:34 +0200
Subject: [PATCH 471/541] finished interface change

---
 common/lib/capa/capa/graders/draganddrop.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/lib/capa/capa/graders/draganddrop.py b/common/lib/capa/capa/graders/draganddrop.py
index 594f311b81..980977d949 100644
--- a/common/lib/capa/capa/graders/draganddrop.py
+++ b/common/lib/capa/capa/graders/draganddrop.py
@@ -202,14 +202,14 @@ class DragAndDrop(object):
     def populate(self, correct_answer, user_answer):
         """  """
         # convert from dict format to list format
-        tmp = []
         if isinstance(correct_answer, dict):
+            tmp = []
             for key, value in correct_answer.items():
                 tmp_dict = {'draggables': [], 'targets': [], 'rule': 'exact'}
                 tmp_dict['draggables'].append(key)
                 tmp_dict['targets'].append(value)
                 tmp.append(tmp_dict)
-        correct_answer = tmp
+            correct_answer = tmp
 
         user_answer = json.loads(user_answer)
         self.use_targets = user_answer.get('use_targets')
@@ -222,9 +222,7 @@ class DragAndDrop(object):
         # and positions  must reflect order in group
         for i in xrange(0, len(correct_answer)):
             groupname = str(i)
-            self.correct_groups = OrderedDict()
             self.correct_groups[groupname] = correct_answer[i]['draggables']
-            self.correct_positions = OrderedDict()
             self.correct_positions[groupname] = {correct_answer[i]['rule']: correct_answer[i]['targets']}
             self.user_groups[groupname] = []
             self.user_positions[groupname] = {'user': []}
@@ -258,6 +256,8 @@ def grade(user_input, correct_answer):
                 else:
                     {'1': '[10, 10]',  'name_with_icon': '[[10, 10], 20]'}
     Support 2 interfaces"""
+    # import ipdb; ipdb.set_trace()
     dnd = DragAndDrop()
+    # import ipdb; ipdb.set_trace()
     dnd.populate(correct_answer=correct_answer, user_answer=user_input)
     return dnd.grade()

From 1afaec6f6102bef33dadb288a661d8c856080003 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 3 Jan 2013 16:34:19 +0200
Subject: [PATCH 472/541] update in tests

---
 common/lib/capa/capa/graders/tests.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/lib/capa/capa/graders/tests.py b/common/lib/capa/capa/graders/tests.py
index d5a65c7596..409b22fe05 100644
--- a/common/lib/capa/capa/graders/tests.py
+++ b/common/lib/capa/capa/graders/tests.py
@@ -129,7 +129,7 @@ class Test_DragAndDrop(unittest.TestCase):
         {"13":"s_sigma_star_name"},{"15":"p_pi_name"},{"16":"p_pi_star_name"}, \
         {"12":"p_sigma_name"},{"14":"p_sigma_star_name"}]}'
 
-        correct_answers = [{
+        correct_answer = [{
         'draggables': ['1', '2', '3', '4', '5', '6'],
         'targets': [
             's_left', 's_right', 's_sigma', 's_sigma_star', 'p_pi_1', 'p_pi_2'
@@ -168,7 +168,7 @@ class Test_DragAndDrop(unittest.TestCase):
         {"13":"s_sigma_star_name"},{"15":"p_pi_name"},{"16":"p_pi_star_name"}, \
         {"12":"p_sigma_name"},{"14":"p_sigma_star_name"}]}'
 
-        correct_answers = [{
+        correct_answer = [{
         'draggables': ['1', '2', '3', '4', '5', '6'],
         'targets': [
             's_left', 's_right', 's_sigma', 's_sigma_star', 'p_pi_1', 'p_pi_2'

From f283df9022394d475c784333cc260bc9a8f372ab Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Thu, 3 Jan 2013 16:51:23 +0200
Subject: [PATCH 473/541] Cleaning up code.

---
 .../js/capa/drag_and_drop/config_parser.js    |  2 --
 .../js/capa/drag_and_drop/draggables.js       |  2 --
 .../js/capa/drag_and_drop/update_input.js     | 19 ++++++-------------
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/config_parser.js b/common/static/js/capa/drag_and_drop/config_parser.js
index 6800cb7c97..664324e0b9 100644
--- a/common/static/js/capa/drag_and_drop/config_parser.js
+++ b/common/static/js/capa/drag_and_drop/config_parser.js
@@ -12,8 +12,6 @@ define(['logme'], function (logme) {
 
         returnStatus = true;
 
-        logme('imageDir', imageDir);
-
         state.config = {
             'imageDir': '/static/' + imageDir + '/images',
             'draggables': [],
diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index c4c5a94ec0..0800ce4c6b 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -151,8 +151,6 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                 // icon. All the existing code will work, and the user will
                 // see a label instead of an icon.
                 if (obj.label.length > 0) {
-                    logme('We have a label length > 0.');
-
                     draggableObj.iconEl = $(
                         '<div ' +
                             'style=" ' +
diff --git a/common/static/js/capa/drag_and_drop/update_input.js b/common/static/js/capa/drag_and_drop/update_input.js
index 87f82dd146..df7c5edb2e 100644
--- a/common/static/js/capa/drag_and_drop/update_input.js
+++ b/common/static/js/capa/drag_and_drop/update_input.js
@@ -54,8 +54,6 @@ define(['logme'], function (logme) {
         inputEl = $('#input_' + state.problemId);
         inputEl.val(stateStr);
 
-        logme(inputEl.val());
-
         return;
 
         // Check if input has an answer from server. If yes, then position
@@ -81,9 +79,6 @@ define(['logme'], function (logme) {
                 offset = 1;
             }
 
-            logme('!!!!!!!!!!!!!!!! answer');
-            logme(answer);
-
             if (
                 ((typeof answer.use_targets === 'boolean') && (answer.use_targets === true)) ||
                 ((typeof answer.use_targets === 'string') && (answer.use_targets === 'true'))
@@ -113,8 +108,6 @@ define(['logme'], function (logme) {
                                     return;
                                 }
 
-                                logme('use_targets = false; draggableId: ' + draggableId);
-
                                 draggable.setInContainer(false);
                                 draggable.containerEl.hide();
 
@@ -144,6 +137,9 @@ define(['logme'], function (logme) {
 
                                 draggable.setOnTarget(target);
                                 target.draggable.push(draggableId);
+
+                                state.numDraggablesInSlider -= 1;
+                                state.updateArrowOpacity();
                             }
                         }(draggableId, draggable, targetId, target));
                     }
@@ -166,13 +162,10 @@ define(['logme'], function (logme) {
 
                             function moveDraggableToBaseImage() {
                                 if (draggable.hasLoaded === false) {
-                                    logme('draggable.hasLoaded === false');
                                     setTimeout(moveDraggableToBaseImage, 50);
                                     return;
                                 }
 
-                                logme('use_targets = false; draggableId: ' + draggableId);
-
                                 draggable.setInContainer(false);
                                 draggable.containerEl.hide();
 
@@ -202,6 +195,9 @@ define(['logme'], function (logme) {
 
                                 draggable.x = answer.draggables[c1][draggableId][0];
                                 draggable.y = answer.draggables[c1][draggableId][1];
+
+                                state.numDraggablesInSlider -= 1;
+                                state.updateArrowOpacity();
                             }
                         }(c1, draggableId, draggable));
                     }
@@ -211,9 +207,6 @@ define(['logme'], function (logme) {
 
                 return;
             }
-
-            state.numDraggablesInSlider -= 1;
-            state.updateArrowOpacity();
         }
 
         return;

From aaf54c562ef310e7d31a24c692b0813caaf71f72 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 3 Jan 2013 17:36:57 +0200
Subject: [PATCH 474/541] fix in location id for course

---
 common/lib/capa/capa/inputtypes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index c968130fdc..86454d4fdb 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -873,7 +873,7 @@ class DragAndDropInput(InputTypeBase):
         self.to_render.add('drag_and_drop_json')
         try:  # for tests and mock up, work normally not in tets
             self.loaded_attributes['course_folder'] = \
-                self.system.course_id.split('/')[1]
+                self.system.location.split('/')[3]
         except:
             self.loaded_attributes['course_folder'] = 'mock'
         self.to_render.add('course_folder')

From b7be040222a115137717cdf452dbb376f456f8a9 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 3 Jan 2013 17:38:06 +0200
Subject: [PATCH 475/541] updated case when no rule is processed

---
 common/lib/capa/capa/graders/draganddrop.py | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/common/lib/capa/capa/graders/draganddrop.py b/common/lib/capa/capa/graders/draganddrop.py
index 980977d949..0b02181982 100644
--- a/common/lib/capa/capa/graders/draganddrop.py
+++ b/common/lib/capa/capa/graders/draganddrop.py
@@ -142,28 +142,22 @@ class DragAndDrop(object):
         # from now self.correct_groups and self.user_groups are equal if
         # order is ignored
 
-        # Checks in every group that user positions of every element are equal
+        # Next check in every group that user positions of every element are equal
         # with correct positions for every rule
 
-        # for group in self.correct_groups:  # 'denied' rule
-        #     if not self.compare_positions(self.correct_positions[group].get(
-        #     'denied', []), self.user_positions[group]['user'], flag='denied'):
-        #         return False
-
         passed_rules = dict()
         for rule in ('exact', 'anyof'):
-            passed_rules[rule] = True
+            passed_rules[rule] = 0
             for groupname in self.correct_groups:
                 if self.correct_positions[groupname].get(rule, []):
                     if not self.compare_positions(
                             self.correct_positions[groupname][rule],
                             self.user_positions[groupname]['user'], flag=rule):
                         return False
-                else:
-                    passed_rules[rule] = False
+                    passed_rules[rule] += 1
 
-        # if all passed rules are false
-        if not reduce(lambda x, y: x or y, passed_rules):
+        # if no rule was executed for all groups
+        if sum(passed_rules.values()) == 0:
             return False
 
         return True
@@ -201,7 +195,7 @@ class DragAndDrop(object):
 
     def populate(self, correct_answer, user_answer):
         """  """
-        # convert from dict format to list format
+        # convert from dict answer format to list format
         if isinstance(correct_answer, dict):
             tmp = []
             for key, value in correct_answer.items():

From d9d093099dafb95fb55ee2fa09011457d5547a0f Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 3 Jan 2013 17:52:37 +0200
Subject: [PATCH 476/541] fixed dirname

---
 common/lib/capa/capa/inputtypes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index 86454d4fdb..48ee45e8ac 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -873,7 +873,7 @@ class DragAndDropInput(InputTypeBase):
         self.to_render.add('drag_and_drop_json')
         try:  # for tests and mock up, work normally not in tets
             self.loaded_attributes['course_folder'] = \
-                self.system.location.split('/')[3]
+                self.system.filestore.root_path.split('/')[-1]
         except:
             self.loaded_attributes['course_folder'] = 'mock'
         self.to_render.add('course_folder')

From bdcf94dd406cda8a0e761dcec4e6b5b9699b183e Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Thu, 3 Jan 2013 18:17:13 +0200
Subject: [PATCH 477/541] comments and pepification

---
 common/lib/capa/capa/graders/draganddrop.py | 64 +++++++++++++++------
 1 file changed, 47 insertions(+), 17 deletions(-)

diff --git a/common/lib/capa/capa/graders/draganddrop.py b/common/lib/capa/capa/graders/draganddrop.py
index 0b02181982..38f4dc2fb3 100644
--- a/common/lib/capa/capa/graders/draganddrop.py
+++ b/common/lib/capa/capa/graders/draganddrop.py
@@ -163,19 +163,14 @@ class DragAndDrop(object):
         return True
 
     def compare_positions(self, correct, user, flag):
-        """ order of correct/user is matter only in anyof_flag"""
-        # import ipdb; ipdb.set_trace()
-        # if flag == 'denied':
-        #     for el1 in correct:
-        #         for el2 in user:
-        #             if PositionsCompare(el1) == PositionsCompare(el2):
-        #                 return False
+        """ Compares two lists of positions with flag rules. Order of
+        correct/user arguments is matter only in 'anyof' flag.
 
-        # if flag == 'allowed':
-        #     for el1, el2 in zip(sorted(correct), sorted(user)):
-        #         if PositionsCompare(el1) != PositionsCompare(el2):
-        #             return False
+        Args:
+            correst, user: lists of positions
 
+        Returns: True if within rule lists are equal, otherwise False.
+        """
         if flag == 'exact':
             for el1, el2 in zip(correct, user):
                 if PositionsCompare(el1) != PositionsCompare(el2):
@@ -194,7 +189,44 @@ class DragAndDrop(object):
         return True
 
     def populate(self, correct_answer, user_answer):
-        """  """
+        """ Populates DragAndDrop variables from user_answer and correct_answer.
+        If correct_answer is dict, converts it to list.
+        Correct answer in dict form is simpe structure for fast and simple
+        grading. Example of corrrect answer dict example::
+
+            correct_answer = {'name4': 't1',
+                            'name_with_icon': 't1',
+                            '5': 't2',
+                            '7':'t2'}
+
+            It is draggable_name: dragable_position mapping
+
+        Correct answer in list form is designed for complex cases::
+
+        correct_answers = [
+        {
+        'draggables': ['1', '2', '3', '4', '5', '6'],
+        'targets': [
+           's_left', 's_right', 's_sigma', 's_sigma_star', 'p_pi_1',  'p_pi_2'],
+        'rule': 'anyof'},
+        {
+        'draggables': ['7', '8', '9', '10'],
+        'targets': ['p_left_1', 'p_left_2', 'p_right_1', 'p_right_2'],
+        'rule': 'anyof'
+        }
+                        ]
+        Correct answer in list form is list of dicts, and every dict must have
+        3 keys: 'draggables', 'targets' and 'rule'. 'Draggables' value is
+        list of draggables ids, 'targes' values are list of targets ids, 'rule'
+        value is 'exact' or 'anyof'.
+
+        Args:
+            user_answer: json
+            correct_answer: dict  or list
+
+        Returns: None
+
+         """
         # convert from dict answer format to list format
         if isinstance(correct_answer, dict):
             tmp = []
@@ -211,13 +243,12 @@ class DragAndDrop(object):
         # check if we have draggables that are not in correct answer:
         check_extra_draggables = {}
 
-        # create identical data structures
-        # user groups must mirror correct_groups
-        # and positions  must reflect order in group
+        # create identical data structures from user answer and correct answer
         for i in xrange(0, len(correct_answer)):
             groupname = str(i)
             self.correct_groups[groupname] = correct_answer[i]['draggables']
-            self.correct_positions[groupname] = {correct_answer[i]['rule']: correct_answer[i]['targets']}
+            self.correct_positions[groupname] = {correct_answer[i]['rule']:
+                                                correct_answer[i]['targets']}
             self.user_groups[groupname] = []
             self.user_positions[groupname] = {'user': []}
             for draggable_dict in user_answer['draggables']:
@@ -235,7 +266,6 @@ class DragAndDrop(object):
         for draggable in check_extra_draggables:
             if not check_extra_draggables[draggable]:
                 self.incorrect = True
-        # import ipdb; ipdb.set_trace()
 
 
 def grade(user_input, correct_answer):

From e21048206a58ae4fac2c99b2bdb16524743374ee Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 4 Jan 2013 11:04:04 +0200
Subject: [PATCH 478/541] comments and refactoring

---
 common/lib/capa/capa/graders/draganddrop.py | 115 +++++++++++---------
 1 file changed, 64 insertions(+), 51 deletions(-)

diff --git a/common/lib/capa/capa/graders/draganddrop.py b/common/lib/capa/capa/graders/draganddrop.py
index 38f4dc2fb3..af28435bb6 100644
--- a/common/lib/capa/capa/graders/draganddrop.py
+++ b/common/lib/capa/capa/graders/draganddrop.py
@@ -64,9 +64,8 @@ class PositionsCompare(list):
         elif (isinstance(self[0], (unicode, str)) and
               isinstance(other[0], (unicode, str))):
             return ''.join(self) == ''.join(other)
-        else:  # improper argument types
-            # Now we have no (float / int or lists of list and float / int pair)
-            # or two string / unicode lists pair
+        else:  # improper argument types: no (float / int or lists of list
+            #and float / int pair) or two string / unicode lists pair
             return False
 
     def __ne__(self, other):
@@ -103,18 +102,14 @@ class PositionsCompare(list):
 
 
 class DragAndDrop(object):
-    """ Grader for drag and drop inputtype.
+    """ Grader class for drag and drop inputtype.
     """
-
     def __init__(self):
         self.correct_groups = OrderedDict()  # correct groups from xml
         self.correct_positions = OrderedDict()  # correct positions for comparing
         self.user_groups = OrderedDict()  # will be populated from user answer
         self.user_positions = OrderedDict()  # will be populated from user answer
 
-        # flag to check if user answer has more draggables than correct answer
-        self.incorrect = False
-
     def grade(self):
         ''' Grader user answer.
 
@@ -126,39 +121,30 @@ class DragAndDrop(object):
 
         Returns: bool.
         '''
+        for draggable in self.excess_draggables:
+            if not self.excess_draggables[draggable]:
+                return False  # user answer has more draggables than correct answer
 
-        if self.incorrect:  # user answer has more draggables than correct answer
-            return False
-
-        # checks if we have same groups of draggables
-        if sorted(self.correct_groups.keys()) != sorted(self.user_groups.keys()):
-            return False
-
-        # checks if for every groups draggables names are same
+        # Number of draggables in user_groups may be smaller that in
+        # correct_groups, that is incorrect.
         for groupname, draggable_ids in self.correct_groups.items():
             if sorted(draggable_ids) != sorted(self.user_groups[groupname]):
                 return False
 
-        # from now self.correct_groups and self.user_groups are equal if
-        # order is ignored
-
-        # Next check in every group that user positions of every element are equal
-        # with correct positions for every rule
-
-        passed_rules = dict()
-        for rule in ('exact', 'anyof'):
-            passed_rules[rule] = 0
-            for groupname in self.correct_groups:
+        # Check that in every group, for rule of that group, user positions of
+        #every element are equal with correct positions
+        for groupname in self.correct_groups:
+            rules_executed = 0
+            for rule in ('exact', 'anyof'):   # every group has only one rule
                 if self.correct_positions[groupname].get(rule, []):
+                    rules_executed += 1
                     if not self.compare_positions(
                             self.correct_positions[groupname][rule],
                             self.user_positions[groupname]['user'], flag=rule):
                         return False
-                    passed_rules[rule] += 1
-
-        # if no rule was executed for all groups
-        if sum(passed_rules.values()) == 0:
-            return False
+            if not rules_executed:  # no correct rules for current group
+            # probably xml content mistake - wrong rules names
+                return False
 
         return True
 
@@ -199,7 +185,7 @@ class DragAndDrop(object):
                             '5': 't2',
                             '7':'t2'}
 
-            It is draggable_name: dragable_position mapping
+            It is draggable_name: dragable_position mapping.
 
         Correct answer in list form is designed for complex cases::
 
@@ -215,6 +201,7 @@ class DragAndDrop(object):
         'rule': 'anyof'
         }
                         ]
+
         Correct answer in list form is list of dicts, and every dict must have
         3 keys: 'draggables', 'targets' and 'rule'. 'Draggables' value is
         list of draggables ids, 'targes' values are list of targets ids, 'rule'
@@ -241,7 +228,7 @@ class DragAndDrop(object):
         self.use_targets = user_answer.get('use_targets')
 
         # check if we have draggables that are not in correct answer:
-        check_extra_draggables = {}
+        self.excess_draggables = {}
 
         # create identical data structures from user answer and correct answer
         for i in xrange(0, len(correct_answer)):
@@ -258,30 +245,56 @@ class DragAndDrop(object):
                     self.user_groups[groupname].append(draggable_name)
                     self.user_positions[groupname]['user'].append(
                                             draggable_dict[draggable_name])
-                    check_extra_draggables[draggable_name] = True
+                    self.excess_draggables[draggable_name] = True
                 else:
-                    check_extra_draggables[draggable_name] = \
-                    check_extra_draggables.get(draggable_name, False)
-
-        for draggable in check_extra_draggables:
-            if not check_extra_draggables[draggable]:
-                self.incorrect = True
+                    self.excess_draggables[draggable_name] = \
+                    self.excess_draggables.get(draggable_name, False)
 
 
 def grade(user_input, correct_answer):
-    """Args:
-            user_input, correct_answer: json. Format:
+    """ Populates DragAndDrop instance from user_input and correct_answer and
+        calls DragAndDrop.drade for grading.
 
-            user_input: see module docstring
+        Supports two interfaces for correct_answer: dict and list.
 
-            correct_answer:
-                if use_targets is True:
-                    {'1': 't1',  'name_with_icon': 't2'}
-                else:
-                    {'1': '[10, 10]',  'name_with_icon': '[[10, 10], 20]'}
-    Support 2 interfaces"""
-    # import ipdb; ipdb.set_trace()
+        Args:
+            user_input: json. Format::
+
+                {"use_targets": false, "draggables":
+                [{"1": [10, 10]}, {"name_with_icon": [20, 20]}]}'
+
+                or
+
+                {"use_targets": true, "draggables": [{"1": "t1"}, \
+                {"name_with_icon": "t2"}]}
+
+            correct_answer: dict or list.
+
+                Dict form::
+
+                        {'1': 't1',  'name_with_icon': 't2'}
+
+                        or
+
+                        {'1': '[10, 10]',  'name_with_icon': '[[10, 10], 20]'}
+
+                List form::
+
+                    correct_answer = [
+                    {
+                        'draggables':  ['l3_o', 'l10_o'],
+                        'targets':  ['t1_o', 't9_o'],
+                        'rule': 'anyof'
+                    },
+                    {
+                        'draggables': ['l1_c','l8_c'],
+                        'targets': ['t5_c','t6_c'],
+                        'rule': 'anyof'
+                    }
+                    ]
+
+        Returns: bool
+    """
     dnd = DragAndDrop()
-    # import ipdb; ipdb.set_trace()
     dnd.populate(correct_answer=correct_answer, user_answer=user_input)
     return dnd.grade()

From ad0a7d308c7d243e6284e7037f8c0c6e586e68a8 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 4 Jan 2013 11:04:17 +0200
Subject: [PATCH 479/541] tests and test plan

---
 common/lib/capa/capa/graders/tests.py | 121 +++++++++++++++-----------
 1 file changed, 72 insertions(+), 49 deletions(-)

diff --git a/common/lib/capa/capa/graders/tests.py b/common/lib/capa/capa/graders/tests.py
index 409b22fe05..a38fbce3a4 100644
--- a/common/lib/capa/capa/graders/tests.py
+++ b/common/lib/capa/capa/graders/tests.py
@@ -37,7 +37,7 @@ class Test_PositionsCompare(unittest.TestCase):
         self.assertEqual(PositionsCompare([3.5, 4.5]), PositionsCompare([5, 7]))
 
 
-class Test_DragAndDrop(unittest.TestCase):
+class Test_DragAndDrop_Grade(unittest.TestCase):
 
     def test_targets_true(self):
         user_input = '{"use_targets": true, "draggables": [{"1": "t1"}, \
@@ -134,28 +134,28 @@ class Test_DragAndDrop(unittest.TestCase):
         'targets': [
             's_left', 's_right', 's_sigma', 's_sigma_star', 'p_pi_1', 'p_pi_2'
         ],
-        'rule': 'anyof'
-    }, {
-        'draggables': ['7','8', '9', '10'],
-        'targets': ['p_left_1', 'p_left_2', 'p_right_1','p_right_2'],
-        'rule': 'anyof'
-    }, {
-        'draggables': ['11', '12'],
-        'targets': ['s_sigma_name', 'p_sigma_name'],
-        'rule': 'anyof'
-    }, {
-        'draggables': ['13', '14'],
-        'targets': ['s_sigma_star_name', 'p_sigma_star_name'],
-        'rule': 'anyof'
-    }, {
-        'draggables': ['15'],
-        'targets': ['p_pi_name'],
-        'rule': 'anyof'
-    }, {
-        'draggables': ['16'],
-        'targets': ['p_pi_star_name'],
-        'rule': 'anyof'
-    }]
+            'rule': 'anyof'
+        }, {
+            'draggables': ['7', '8', '9', '10'],
+            'targets': ['p_left_1', 'p_left_2', 'p_right_1','p_right_2'],
+            'rule': 'anyof'
+        }, {
+            'draggables': ['11', '12'],
+            'targets': ['s_sigma_name', 'p_sigma_name'],
+            'rule': 'anyof'
+        }, {
+            'draggables': ['13', '14'],
+            'targets': ['s_sigma_star_name', 'p_sigma_star_name'],
+            'rule': 'anyof'
+        }, {
+            'draggables': ['15'],
+            'targets': ['p_pi_name'],
+            'rule': 'anyof'
+        }, {
+            'draggables': ['16'],
+            'targets': ['p_pi_star_name'],
+            'rule': 'anyof'
+        }]
 
         self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
@@ -172,41 +172,64 @@ class Test_DragAndDrop(unittest.TestCase):
         'draggables': ['1', '2', '3', '4', '5', '6'],
         'targets': [
             's_left', 's_right', 's_sigma', 's_sigma_star', 'p_pi_1', 'p_pi_2'
-        ],
-        'rule': 'anyof'
-    }, {
-        'draggables': ['7','8', '9', '10'],
-        'targets': ['p_left_1', 'p_left_2', 'p_right_1','p_right_2'],
-        'rule': 'anyof'
-    }, {
-        'draggables': ['11', '12'],
-        'targets': ['s_sigma_name', 'p_sigma_name'],
-        'rule': 'anyof'
-    }, {
-        'draggables': ['13', '14'],
-        'targets': ['s_sigma_star_name', 'p_sigma_star_name'],
-        'rule': 'anyof'
-    }, {
-        'draggables': ['15'],
-        'targets': ['p_pi_name'],
-        'rule': 'anyof'
-    }, {
-        'draggables': ['16'],
-        'targets': ['p_pi_star_name'],
-        'rule': 'anyof'
-    }]
+            ],
+            'rule': 'anyof'
+        }, {
+            'draggables': ['7', '8', '9', '10'],
+            'targets': ['p_left_1', 'p_left_2', 'p_right_1','p_right_2'],
+            'rule': 'anyof'
+        }, {
+            'draggables': ['11', '12'],
+            'targets': ['s_sigma_name', 'p_sigma_name'],
+            'rule': 'anyof'
+        }, {
+            'draggables': ['13', '14'],
+            'targets': ['s_sigma_star_name', 'p_sigma_star_name'],
+            'rule': 'anyof'
+        }, {
+            'draggables': ['15'],
+            'targets': ['p_pi_name'],
+            'rule': 'anyof'
+        }, {
+            'draggables': ['16'],
+            'targets': ['p_pi_star_name'],
+            'rule': 'anyof'
+        }]
 
         self.assertFalse(draganddrop.grade(user_input, correct_answer))
 
 
+class Test_DragAndDrop_Populate(unittest.TestCase):
         #test for every function in DND
 
-        # test for different denied-allowed positions inised
-        # different groups
+    def test1(self):
+            self.assertTrue(1)
+
+
+class Test_DraAndDrop_Compare_Positions(unittest.TestCase):
+
+    def test_exact_1(self):
+        self.assertTrue(1)
+
+    def test_exact_2(self):
+        self.assertTrue(1)
+
+    def test_anyof_1(self):
+        self.assertTrue(1)
+
+    def test_anyof_2(self):
+        self.assertTrue(1)
+
+    def test_5(self):
+        self.assertTrue(1)
+
 
 def suite():
 
-    testcases = [Test_DragAndDrop]
+    testcases = [Test_PositionsCompare,
+                 Test_DragAndDrop_Populate,
+                 Test_DragAndDrop_Grade,
+                 Test_DraAndDrop_Compare_Positions]
     suites = []
     for testcase in testcases:
         suites.append(unittest.TestLoader().loadTestsFromTestCase(testcase))

From 9817253850b457cbc6311f13bdfc13319f397db4 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Fri, 4 Jan 2013 11:13:54 +0200
Subject: [PATCH 480/541] Fixed problem with smaller and larger base images.
 Refactoring. Cleaning of code.

---
 .../js/capa/drag_and_drop/base_image.js       |  20 +-
 .../js/capa/drag_and_drop/draggables.js       | 289 ++++++++++++++----
 common/static/js/capa/drag_and_drop/main.js   |  21 +-
 common/static/js/capa/drag_and_drop/state.js  |   5 +-
 .../js/capa/drag_and_drop/update_input.js     | 144 ++++++---
 5 files changed, 359 insertions(+), 120 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/base_image.js b/common/static/js/capa/drag_and_drop/base_image.js
index 9cee42feb2..9c7c217214 100644
--- a/common/static/js/capa/drag_and_drop/base_image.js
+++ b/common/static/js/capa/drag_and_drop/base_image.js
@@ -16,18 +16,26 @@ define(['logme'], function (logme) {
                 'style=" ' +
                     'position: relative; ' +
                     'margin-bottom: 25px; ' +
+                    'margin-left: auto; ' +
+                    'margin-right: auto; ' +
                 '" ' +
             '></div>'
         );
 
-        state.baseImageEl = $(
-            '<img ' +
-                'src="' + state.config.imageDir + '/' + state.config.base_image + '" ' +
-            '/>'
+        state.baseImageEl = $('<img />');
+        state.baseImageEl.attr(
+            'src',
+            state.config.imageDir + '/' + state.config.base_image
         );
-        state.baseImageEl.appendTo(baseImageElContainer);
+        state.baseImageEl.load(function () {
+            baseImageElContainer.css('width', this.width);
+            baseImageElContainer.css('height', this.height);
 
-        baseImageElContainer.appendTo(state.containerEl);
+            state.baseImageEl.appendTo(baseImageElContainer);
+            baseImageElContainer.appendTo(state.containerEl);
+
+            state.baseImageLoaded = true;
+        });
     }
 });
 
diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index 0800ce4c6b..78fc47bf75 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -21,8 +21,6 @@ define(['logme', 'update_input'], function (logme, updateInput) {
         state.currentMovingDraggable = null;
 
         $(document).mousemove(function (event) {
-            normalizeEvent(event);
-
             if (state.currentMovingDraggable !== null) {
                 state.currentMovingDraggable.iconEl.css(
                     'left',
@@ -38,6 +36,12 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                 );
 
                 if (state.currentMovingDraggable.labelEl !== null) {
+                    state.currentMovingDraggable.labelEl.css(
+                        'left',
+                        event.pageX -
+                            state.baseImageEl.offset().left -
+                            state.currentMovingDraggable.labelWidth * 0.5
+                    );
                     state.currentMovingDraggable.labelEl.css(
                         'top',
                         event.pageY -
@@ -45,12 +49,6 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                             state.currentMovingDraggable.iconHeight * 0.5 +
                             5
                     );
-                    state.currentMovingDraggable.labelEl.css(
-                        'left',
-                        event.pageX -
-                            state.baseImageEl.offset().left -
-                            state.currentMovingDraggable.labelWidth * 0.5
-                    );
                 }
             }
         });
@@ -99,23 +97,39 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
                     if (draggableObj.iconWidth >= draggableObj.iconHeight) {
                         draggableObj.iconWidthSmall = 60;
-                        draggableObj.iconHeightSmall = draggableObj.iconWidthSmall * (draggableObj.iconHeight / draggableObj.iconWidth);
+                        draggableObj.iconHeightSmall =
+                            draggableObj.iconWidthSmall *
+                            (draggableObj.iconHeight / draggableObj.iconWidth);
                     } else {
                         draggableObj.iconHeightSmall = 60;
-                        draggableObj.iconWidthSmall = draggableObj.iconHeightSmall * (draggableObj.iconWidth / draggableObj.iconHeight);
+                        draggableObj.iconWidthSmall =
+                            draggableObj.iconHeightSmall *
+                            (draggableObj.iconWidth / draggableObj.iconHeight);
                     }
 
                     draggableObj.iconEl.css('position', 'absolute');
 
-                    draggableObj.iconEl.css('width', draggableObj.iconWidthSmall);
-                    draggableObj.iconEl.css('height', draggableObj.iconHeightSmall);
+                    draggableObj.iconEl.css(
+                        'width',
+                        draggableObj.iconWidthSmall
+                    );
+                    draggableObj.iconEl.css(
+                        'height',
+                        draggableObj.iconHeightSmall
+                    );
 
-                    draggableObj.iconEl.css('left', 50 - draggableObj.iconWidthSmall * 0.5);
+                    draggableObj.iconEl.css(
+                        'left',
+                        50 - draggableObj.iconWidthSmall * 0.5
+                    );
 
                     if (obj.label.length > 0) {
                         draggableObj.iconEl.css('top', 5);
                     } else {
-                        draggableObj.iconEl.css('top', 50 - draggableObj.iconHeightSmall * 0.5);
+                        draggableObj.iconEl.css(
+                            'top',
+                            50 - draggableObj.iconHeightSmall * 0.5
+                        );
                     }
 
                     draggableObj.iconEl.appendTo(draggableObj.containerEl);
@@ -131,12 +145,20 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                             '</div>'
                         );
 
-                        draggableObj.labelEl.appendTo(draggableObj.containerEl);
+                        draggableObj.labelEl.appendTo(
+                            draggableObj.containerEl
+                        );
 
                         draggableObj.labelWidth = draggableObj.labelEl.width();
 
-                        draggableObj.labelEl.css('left', 50 - draggableObj.labelWidth * 0.5);
-                        draggableObj.labelEl.css('top', 5 + draggableObj.iconHeightSmall + 5);
+                        draggableObj.labelEl.css(
+                            'left',
+                            50 - draggableObj.labelWidth * 0.5
+                        );
+                        draggableObj.labelEl.css(
+                            'top',
+                            5 + draggableObj.iconHeightSmall + 5
+                        );
 
                         draggableObj.labelEl.mousedown(mouseDown);
                         draggableObj.labelEl.mouseup(mouseUp);
@@ -168,8 +190,14 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                     draggableObj.iconWidthSmall = draggableObj.iconWidth;
                     draggableObj.iconHeightSmall = draggableObj.iconHeight;
 
-                    draggableObj.iconEl.css('left', 50 - draggableObj.iconWidthSmall * 0.5);
-                    draggableObj.iconEl.css('top', 50 - draggableObj.iconHeightSmall * 0.5);
+                    draggableObj.iconEl.css(
+                        'left',
+                        50 - draggableObj.iconWidthSmall * 0.5
+                    );
+                    draggableObj.iconEl.css(
+                        'top',
+                        50 - draggableObj.iconHeightSmall * 0.5
+                    );
                 } else {
                     // If no icon and no label, don't create a draggable.
                     return;
@@ -189,8 +217,12 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             draggableObj.x = -1;
             draggableObj.y = -1;
 
-            draggableObj.setInContainer = function (val) { inContainer = val; };
-            draggableObj.setOnTarget = function (val) { onTarget = val; };
+            draggableObj.setInContainer = function (val) {
+                inContainer = val;
+            };
+            draggableObj.setOnTarget = function (val) {
+                onTarget = val;
+            };
 
             state.draggables.push(draggableObj);
 
@@ -204,26 +236,58 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
             function mouseDown(event) {
                 if (mousePressed === false) {
-                    state.currentMovingDraggable = draggableObj;
-                    normalizeEvent(event);
+                    // So that the browser does not perform a default drag.
+                    // If we don't do this, each drag operation will
+                    // potentially cause the highlghting of the dragged element.
+                    event.preventDefault();
 
+                    // If this draggable is just being dragged out of the
+                    // container, we must perform some additional tasks.
                     if (inContainer === true) {
                         draggableObj.containerEl.hide();
 
                         draggableObj.iconEl.detach();
-
-                        draggableObj.iconEl.css('width', draggableObj.iconWidth);
-                        draggableObj.iconEl.css('height', draggableObj.iconHeight);
-
-                        draggableObj.iconEl.css('left', event.pageX - state.baseImageEl.offset().left - draggableObj.iconWidth * 0.5);
-                        draggableObj.iconEl.css('top', event.pageY - state.baseImageEl.offset().top - draggableObj.iconHeight * 0.5);
-                        draggableObj.iconEl.appendTo(state.baseImageEl.parent());
+                        draggableObj.iconEl.css(
+                            'width',
+                            draggableObj.iconWidth
+                        );
+                        draggableObj.iconEl.css(
+                            'height',
+                            draggableObj.iconHeight
+                        );
+                        draggableObj.iconEl.css(
+                            'left',
+                            event.pageX -
+                                state.baseImageEl.offset().left -
+                                draggableObj.iconWidth * 0.5
+                        );
+                        draggableObj.iconEl.css(
+                            'top',
+                            event.pageY -
+                                state.baseImageEl.offset().top -
+                                draggableObj.iconHeight * 0.5
+                        );
+                        draggableObj.iconEl.appendTo(
+                            state.baseImageEl.parent()
+                        );
 
                         if (draggableObj.labelEl !== null) {
                             draggableObj.labelEl.detach();
-                            draggableObj.labelEl.css('left', event.pageX - state.baseImageEl.offset().left - draggableObj.labelWidth * 0.5);
-                            draggableObj.labelEl.css('top', event.pageY - state.baseImageEl.offset().top + draggableObj.iconHeight * 0.5 + 5);
-                            draggableObj.labelEl.appendTo(state.baseImageEl.parent());
+                            draggableObj.labelEl.css(
+                                'left',
+                                event.pageX -
+                                    state.baseImageEl.offset().left -
+                                    draggableObj.labelWidth * 0.5
+                            );
+                            draggableObj.labelEl.css(
+                                'top',
+                                event.pageY -
+                                    state.baseImageEl.offset().top +
+                                    draggableObj.iconHeight * 0.5 + 5
+                            );
+                            draggableObj.labelEl.appendTo(
+                                state.baseImageEl.parent()
+                            );
                         }
 
                         inContainer = false;
@@ -235,7 +299,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                     draggableObj.iconEl.css('z-index', '1000');
 
                     mousePressed = true;
-                    event.preventDefault();
+                    state.currentMovingDraggable = draggableObj;
                 }
             }
 
@@ -249,8 +313,42 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
             function mouseMove() {
                 if (mousePressed === true) {
-                    draggableObj.iconEl.css('left', event.pageX - state.baseImageEl.offset().left - draggableObj.iconWidth * 0.5);
-                    draggableObj.iconEl.css('top', event.pageY - state.baseImageEl.offset().top - draggableObj.iconHeight * 0.5);
+                    // Because we have also attached a 'mousemove' event to the
+                    // 'document' (that will do the same thing), let's tell the
+                    // browser not to bubble up this event. The attached event
+                    // on the 'document' will only be triggered when the mouse
+                    // pointer leaves the draggable while it is in the middle
+                    // of a drag operation (user moves the mouse very quickly).
+                    event.stopPropagation();
+
+                    draggableObj.iconEl.css(
+                        'left',
+                        event.pageX -
+                            state.baseImageEl.offset().left -
+                            draggableObj.iconWidth * 0.5
+                    );
+                    draggableObj.iconEl.css(
+                        'top',
+                        event.pageY -
+                            state.baseImageEl.offset().top -
+                            draggableObj.iconHeight * 0.5
+                    );
+
+                    if (draggableObj.labelEl !== null) {
+                        draggableObj.labelEl.css(
+                            'left',
+                            event.pageX -
+                                state.baseImageEl.offset().left -
+                                draggableObj.labelWidth * 0.5
+                        );
+                        draggableObj.labelEl.css(
+                            'top',
+                            event.pageY -
+                                state.baseImageEl.offset().top +
+                                draggableObj.iconHeight * 0.5 +
+                                5
+                        );
+                    }
                 }
             }
 
@@ -280,11 +378,22 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         state.numDraggablesInSlider += 1;
                     }
                 } else {
+                    logme(
+                        'baseImageEl.width = ' + state.baseImageEl.width() + '; ' +
+                        'baseImageEl.height = ' + state.baseImageEl.height()
+                    );
+
                     if (
                         (offsetIE.left < 0) ||
-                        (offsetIE.left + draggableObj.iconWidth > state.baseImageEl.width()) ||
+                        (
+                            offsetIE.left + draggableObj.iconWidth >
+                            state.baseImageEl.width()
+                        ) ||
                         (offsetIE.top < 0) ||
-                        (offsetIE.top + draggableObj.iconHeight > state.baseImageEl.height())
+                        (
+                            offsetIE.top + draggableObj.iconHeight >
+                            state.baseImageEl.height()
+                        )
                     ) {
                         moveBackToSlider();
 
@@ -295,8 +404,10 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                     } else {
                         correctZIndexes();
 
-                        draggableObj.x = offsetIE.left + draggableObj.iconWidth * 0.5;
-                        draggableObj.y = offsetIE.top + draggableObj.iconHeight * 0.5;
+                        draggableObj.x =
+                            offsetIE.left + draggableObj.iconWidth * 0.5;
+                        draggableObj.y =
+                            offsetIE.top + draggableObj.iconHeight * 0.5;
                     }
                 }
 
@@ -331,16 +442,28 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                     for (c1 = 0; c1 < state.targets.length; c1 += 1) {
                         target = state.targets[c1];
 
-                        if (offsetIE.top + draggableObj.iconHeight * 0.5 < target.offset.top) {
+                        if (
+                            offsetIE.top + draggableObj.iconHeight * 0.5 <
+                            target.offset.top
+                        ) {
                             continue;
                         }
-                        if (offsetIE.top + draggableObj.iconHeight * 0.5 > target.offset.top + target.h) {
+                        if (
+                            offsetIE.top + draggableObj.iconHeight * 0.5 >
+                            target.offset.top + target.h
+                        ) {
                             continue;
                         }
-                        if (offsetIE.left + draggableObj.iconWidth * 0.5 < target.offset.left) {
+                        if (
+                            offsetIE.left + draggableObj.iconWidth * 0.5 <
+                            target.offset.left
+                        ) {
                             continue;
                         }
-                        if (offsetIE.left + draggableObj.iconWidth * 0.5 > target.offset.left + target.w) {
+                        if (
+                            offsetIE.left + draggableObj.iconWidth * 0.5 >
+                            target.offset.left + target.w
+                        ) {
                             continue;
                         }
 
@@ -358,7 +481,10 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         // another, then we need to remove it's ID from the
                         // previous target's draggables list, and add it to the
                         // new target's draggables list.
-                        if ((onTarget !== null) && (onTarget.id !== target.id)) {
+                        if (
+                            (onTarget !== null) &&
+                            (onTarget.id !== target.id)
+                        ) {
                             removeObjIdFromTarget();
                             onTarget = target;
                             target.draggable.push(draggableObj.id);
@@ -383,12 +509,28 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         offset = 1;
                     }
 
-                    draggableObj.iconEl.css('left', target.offset.left + 0.5 * target.w - draggableObj.iconWidth * 0.5 + offset);
-                    draggableObj.iconEl.css('top', target.offset.top + 0.5 * target.h - draggableObj.iconHeight * 0.5 + offset);
+                    draggableObj.iconEl.css(
+                        'left',
+                        target.offset.left + 0.5 * target.w -
+                            draggableObj.iconWidth * 0.5 + offset
+                    );
+                    draggableObj.iconEl.css(
+                        'top',
+                        target.offset.top + 0.5 * target.h -
+                            draggableObj.iconHeight * 0.5 + offset
+                    );
 
                     if (draggableObj.labelEl !== null) {
-                        draggableObj.labelEl.css('left', target.offset.left + 0.5 * target.w - draggableObj.labelWidth * 0.5 + offset);
-                        draggableObj.labelEl.css('top', target.offset.top + 0.5 * target.h + draggableObj.iconHeight * 0.5 + 5 + offset);
+                        draggableObj.labelEl.css(
+                            'left',
+                            target.offset.left + 0.5 * target.w -
+                                draggableObj.labelWidth * 0.5 + offset
+                        );
+                        draggableObj.labelEl.css(
+                            'top',
+                            target.offset.top + 0.5 * target.h +
+                                draggableObj.iconHeight * 0.5 + 5 + offset
+                        );
                     }
                 }
 
@@ -406,7 +548,10 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                     var c1;
 
                     for (c1 = 0; c1 < state.draggables.length; c1++) {
-                        if (draggableObj.oldZIndex < state.draggables[c1].zIndex) {
+                        if (
+                            draggableObj.oldZIndex <
+                            state.draggables[c1].zIndex
+                        ) {
                             state.draggables[c1].zIndex -= 1;
                             state.draggables[c1].iconEl.css(
                                 'z-index',
@@ -427,40 +572,50 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
                     draggableObj.iconEl.detach();
 
-                    draggableObj.iconEl.css('width', draggableObj.iconWidthSmall);
-                    draggableObj.iconEl.css('height', draggableObj.iconHeightSmall);
+                    draggableObj.iconEl.css(
+                        'width',
+                        draggableObj.iconWidthSmall
+                    );
+                    draggableObj.iconEl.css(
+                        'height',
+                        draggableObj.iconHeightSmall
+                    );
 
-                    draggableObj.iconEl.css('left', 50 - draggableObj.iconWidthSmall * 0.5);
+                    draggableObj.iconEl.css(
+                        'left',
+                        50 - draggableObj.iconWidthSmall * 0.5
+                    );
 
                     if (draggableObj.labelEl !== null) {
                         draggableObj.iconEl.css('top', 5);
                     } else {
-                        draggableObj.iconEl.css('top', 50 - draggableObj.iconHeightSmall * 0.5);
+                        draggableObj.iconEl.css(
+                            'top',
+                            50 - draggableObj.iconHeightSmall * 0.5
+                        );
                     }
 
                     draggableObj.iconEl.appendTo(draggableObj.containerEl);
 
                     if (draggableObj.labelEl !== null) {
                         draggableObj.labelEl.detach();
-                        draggableObj.labelEl.css('left', 50 - draggableObj.labelWidth * 0.5);
-                        draggableObj.labelEl.css('top', 5 + draggableObj.iconHeightSmall + 5);
-                        draggableObj.labelEl.appendTo(draggableObj.containerEl);
+                        draggableObj.labelEl.css(
+                            'left',
+                            50 - draggableObj.labelWidth * 0.5
+                        );
+                        draggableObj.labelEl.css(
+                            'top',
+                            5 + draggableObj.iconHeightSmall + 5
+                        );
+                        draggableObj.labelEl.appendTo(
+                            draggableObj.containerEl
+                        );
                     }
 
                     inContainer = true;
                 }
             }
         }
-
-        // In firefox the event does not have a proper pageX and pageY
-        // coordinates.
-        function normalizeEvent(event) {
-            if(!event.offsetX) {
-                event.offsetX = (event.pageX - $(event.target).offset().left);
-                event.offsetY = (event.pageY - $(event.target).offset().top);
-            }
-            return event;
-        }
     }
 });
 
diff --git a/common/static/js/capa/drag_and_drop/main.js b/common/static/js/capa/drag_and_drop/main.js
index 0ccfb47051..ec186066c1 100644
--- a/common/static/js/capa/drag_and_drop/main.js
+++ b/common/static/js/capa/drag_and_drop/main.js
@@ -60,13 +60,22 @@ define(
 
         Container(state);
         BaseImage(state);
-        Targets(state);
-        Scroller(state);
-        Draggables(state);
 
-        // Update the input element, checking first that it is not filled with
-        // an answer from the server.
-        updateInput(state, true);
+        (function addContent() {
+            if (state.baseImageLoaded !== true) {
+                setTimeout(addContent, 50);
+
+                return;
+            }
+
+            Targets(state);
+            Scroller(state);
+            Draggables(state);
+
+            // Update the input element, checking first that it is not filled with
+            // an answer from the server.
+            updateInput(state, true);
+        }());
     }
 });
 
diff --git a/common/static/js/capa/drag_and_drop/state.js b/common/static/js/capa/drag_and_drop/state.js
index c3a4d3c4ac..99dd7dc8e4 100644
--- a/common/static/js/capa/drag_and_drop/state.js
+++ b/common/static/js/capa/drag_and_drop/state.js
@@ -11,10 +11,7 @@ define([], function () {
         return {
             'problemId': problemId,
 
-            // Will indicate when all targetsand draggables have been loaded,
-            // processed, and postioned intially.
-            'targetsLoaded': false,
-            'draggablesLoaded': false,
+            'baseImageLoaded': false,
 
             'numDraggablesInSlider': 0
         };
diff --git a/common/static/js/capa/drag_and_drop/update_input.js b/common/static/js/capa/drag_and_drop/update_input.js
index df7c5edb2e..2c6a5ee364 100644
--- a/common/static/js/capa/drag_and_drop/update_input.js
+++ b/common/static/js/capa/drag_and_drop/update_input.js
@@ -39,7 +39,8 @@ define(['logme'], function (logme) {
             for (c1 = 0; c1 < state.targets.length; c1++) {
                 for (c2 = 0; c2 < state.targets[c1].draggable.length; c2++) {
                     tempObj = {};
-                    tempObj[state.targets[c1].draggable[c2]] = state.targets[c1].id;
+                    tempObj[state.targets[c1].draggable[c2]] =
+                        state.targets[c1].id;
 
                     draggables.push(tempObj);
                 }
@@ -80,20 +81,37 @@ define(['logme'], function (logme) {
             }
 
             if (
-                ((typeof answer.use_targets === 'boolean') && (answer.use_targets === true)) ||
-                ((typeof answer.use_targets === 'string') && (answer.use_targets === 'true'))
+                (
+                    (typeof answer.use_targets === 'boolean') &&
+                    (answer.use_targets === true)
+                ) ||
+                (
+                    (typeof answer.use_targets === 'string') &&
+                    (answer.use_targets === 'true')
+                )
             ) {
                 for (c1 = 0; c1 < answer.draggables.length; c1++) {
                     for (draggableId in answer.draggables[c1]) {
-                        if ((draggable = getDraggableById(draggableId)) === null) {
-                            logme('ERROR: In answer there exists a draggable ID "' + draggableId + '". No draggable with this ID could be found.');
+                        if (
+                            (draggable = getDraggableById(draggableId)) ===
+                            null
+                        ) {
+                            logme(
+                                'ERROR: In answer there exists a ' +
+                                'draggable ID "' + draggableId + '". No ' +
+                                'draggable with this ID could be found.'
+                            );
 
                             continue;
                         }
 
                         targetId = answer.draggables[c1][draggableId];
                         if ((target = getTargetById(targetId)) === null) {
-                            logme('ERROR: In answer there exists a target ID "' + targetId + '". No target with this ID could be found.');
+                            logme(
+                                'ERROR: In answer there exists a target ' +
+                                'ID "' + targetId + '". No target with this ' +
+                                'ID could be found.'
+                            );
 
                             continue;
                         }
@@ -112,27 +130,44 @@ define(['logme'], function (logme) {
                                 draggable.containerEl.hide();
 
                                 draggable.iconEl.detach();
-
-                                draggable.iconEl.css('width', draggable.iconWidth);
-                                draggable.iconEl.css('height', draggable.iconHeight);
+                                draggable.iconEl.css(
+                                    'width',
+                                    draggable.iconWidth
+                                );
+                                draggable.iconEl.css(
+                                    'height',
+                                    draggable.iconHeight
+                                );
                                 draggable.iconEl.css(
                                     'left',
-                                    target.offset.left + 0.5 * target.w - draggable.iconWidth * 0.5 + offset
+                                    target.offset.left + 0.5 * target.w -
+                                        draggable.iconWidth * 0.5 + offset
                                 );
                                 draggable.iconEl.css(
                                     'top',
-                                    target.offset.top + 0.5 * target.h - draggable.iconHeight * 0.5 + offset
+                                    target.offset.top + 0.5 * target.h -
+                                        draggable.iconHeight * 0.5 + offset
+                                );
+                                draggable.iconEl.appendTo(
+                                    state.baseImageEl.parent()
                                 );
-
-                                draggable.iconEl.appendTo(state.baseImageEl.parent());
 
                                 if (draggable.labelEl !== null) {
                                     draggable.labelEl.detach();
-
-                                    draggable.labelEl.css('left', target.offset.left + 0.5 * target.w - draggable.labelWidth * 0.5 + offset);
-                                    draggable.labelEl.css('top', target.offset.top + 0.5 * target.h + draggable.iconHeight * 0.5 + 5 + offset);
-
-                                    draggable.labelEl.appendTo(state.baseImageEl.parent());
+                                    draggable.labelEl.css(
+                                        'left',
+                                        target.offset.left + 0.5 * target.w -
+                                            draggable.labelWidth * 0.5 + offset
+                                    );
+                                    draggable.labelEl.css(
+                                        'top',
+                                        target.offset.top + 0.5 * target.h +
+                                            draggable.iconHeight * 0.5 + 5 +
+                                            offset
+                                    );
+                                    draggable.labelEl.appendTo(
+                                        state.baseImageEl.parent()
+                                    );
                                 }
 
                                 draggable.setOnTarget(target);
@@ -145,13 +180,26 @@ define(['logme'], function (logme) {
                     }
                 }
             } else if (
-                ((typeof answer.use_targets === 'boolean') && (answer.use_targets === false)) ||
-                ((typeof answer.use_targets === 'string') && (answer.use_targets === 'false'))
+                (
+                    (typeof answer.use_targets === 'boolean') &&
+                    (answer.use_targets === false)
+                ) ||
+                (
+                    (typeof answer.use_targets === 'string') &&
+                    (answer.use_targets === 'false')
+                )
             ) {
                 for (c1 = 0; c1 < answer.draggables.length; c1++) {
                     for (draggableId in answer.draggables[c1]) {
-                        if ((draggable = getDraggableById(draggableId)) === null) {
-                            logme('ERROR: In answer there exists a draggable ID "' + draggableId + '". No draggable with this ID could be found.');
+                        if (
+                            (draggable = getDraggableById(draggableId)) ===
+                            null
+                           ) {
+                            logme(
+                                'ERROR: In answer there exists a ' +
+                                'draggable ID "' + draggableId + '". No ' +
+                                'draggable with this ID could be found.'
+                            );
 
                             continue;
                         }
@@ -170,31 +218,50 @@ define(['logme'], function (logme) {
                                 draggable.containerEl.hide();
 
                                 draggable.iconEl.detach();
-
-                                draggable.iconEl.css('width', draggable.iconWidth);
-                                draggable.iconEl.css('height', draggable.iconHeight);
+                                draggable.iconEl.css(
+                                    'width',
+                                    draggable.iconWidth
+                                );
+                                draggable.iconEl.css(
+                                    'height',
+                                    draggable.iconHeight
+                                );
                                 draggable.iconEl.css(
                                     'left',
-                                    answer.draggables[c1][draggableId][0] - draggable.iconWidth * 0.5 + offset
+                                    answer.draggables[c1][draggableId][0] -
+                                        draggable.iconWidth * 0.5 + offset
                                 );
                                 draggable.iconEl.css(
                                     'top',
-                                    answer.draggables[c1][draggableId][1] - draggable.iconHeight * 0.5 + offset
+                                    answer.draggables[c1][draggableId][1] -
+                                        draggable.iconHeight * 0.5 + offset
+                                );
+                                draggable.iconEl.appendTo(
+                                    state.baseImageEl.parent()
                                 );
-
-                                draggable.iconEl.appendTo(state.baseImageEl.parent());
 
                                 if (draggable.labelEl !== null) {
                                     draggable.labelEl.detach();
-
-                                    draggable.labelEl.css('left', answer.draggables[c1][draggableId][0] - draggable.iconWidth * 0.5 - draggable.labelWidth * 0.5 + offset);
-                                    draggable.labelEl.css('top', answer.draggables[c1][draggableId][1] - draggable.iconHeight * 0.5 + draggable.iconHeight + 5 + offset);
-
-                                    draggable.labelEl.appendTo(state.baseImageEl.parent());
+                                    draggable.labelEl.css(
+                                        'left',
+                                        answer.draggables[c1][draggableId][0] -
+                                            draggable.labelWidth * 0.5 + offset
+                                    );
+                                    draggable.labelEl.css(
+                                        'top',
+                                        answer.draggables[c1][draggableId][1] -
+                                            draggable.iconHeight * 0.5 +
+                                            draggable.iconHeight + 5 + offset
+                                    );
+                                    draggable.labelEl.appendTo(
+                                        state.baseImageEl.parent()
+                                    );
                                 }
 
-                                draggable.x = answer.draggables[c1][draggableId][0];
-                                draggable.y = answer.draggables[c1][draggableId][1];
+                                draggable.x =
+                                    answer.draggables[c1][draggableId][0];
+                                draggable.y =
+                                    answer.draggables[c1][draggableId][1];
 
                                 state.numDraggablesInSlider -= 1;
                                 state.updateArrowOpacity();
@@ -203,7 +270,10 @@ define(['logme'], function (logme) {
                     }
                 }
             } else {
-                logme('ERROR: The type of answer.targets is not supported. answer.targets = ', answer.targets);
+                logme(
+                    'ERROR: The type of answer.targets is not supported. ' +
+                    'answer.targets = ', answer.targets
+                );
 
                 return;
             }

From a9e7890d6b76527a908e4d867dfd674ac728d4ef Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Fri, 4 Jan 2013 11:35:22 +0200
Subject: [PATCH 481/541] Added correct handling of invalid (missing) base
 images. Now error is reported, and the damage is reduced to a minimum.

---
 common/static/js/capa/drag_and_drop/base_image.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/common/static/js/capa/drag_and_drop/base_image.js b/common/static/js/capa/drag_and_drop/base_image.js
index 9c7c217214..85f6006918 100644
--- a/common/static/js/capa/drag_and_drop/base_image.js
+++ b/common/static/js/capa/drag_and_drop/base_image.js
@@ -23,6 +23,7 @@ define(['logme'], function (logme) {
         );
 
         state.baseImageEl = $('<img />');
+
         state.baseImageEl.attr(
             'src',
             state.config.imageDir + '/' + state.config.base_image
@@ -36,6 +37,19 @@ define(['logme'], function (logme) {
 
             state.baseImageLoaded = true;
         });
+        state.baseImageEl.error(function () {
+            logme(
+                'ERROR: Image "' + state.config.imageDir + '/' +
+                state.config.base_image + '" was not found!'
+            );
+            baseImageElContainer.html(
+                '<span style="color: red;">' +
+                    'ERROR: Image "' + state.config.imageDir + '/' +
+                    state.config.base_image + '" was not found!' +
+                '</span>'
+            );
+            baseImageElContainer.appendTo(state.containerEl);
+        });
     }
 });
 

From 533a1693b3951e38b10a3ab1ca1c4a6fbc9ec2f7 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Fri, 4 Jan 2013 11:57:07 +0200
Subject: [PATCH 482/541] Updated XML example in docs for Drag and Drop.

---
 docs/source/drag-n-drop-demo.xml | 363 ++++++++++++++++++++++++++++++-
 1 file changed, 355 insertions(+), 8 deletions(-)

diff --git a/docs/source/drag-n-drop-demo.xml b/docs/source/drag-n-drop-demo.xml
index 574a188c33..6f82db24a2 100644
--- a/docs/source/drag-n-drop-demo.xml
+++ b/docs/source/drag-n-drop-demo.xml
@@ -1,5 +1,260 @@
 <problem display_name="Drag and drop demo" >
 
+<customresponse>
+    <text>
+        <h3>Please set hydrogen atoms to LEFT carbon atom</h3>
+        <br />
+    </text>
+
+    <drag_and_drop_input img="images_list/ethglycol.jpg" target_outline="true"
+        one_per_target="true" no_labels="true">
+        <draggable id="1" label="Hydrogen" />
+        <draggable id="2" label="Hydrogen" />
+
+        <target id="t1_o" x="10" y="67" w="100" h="100"/>
+        <target id="t2" x="133" y="3" w="70" h="70"/>
+        <target id="t3" x="2" y="384" w="70" h="70"/>
+        <target id="t4" x="95" y="386" w="70" h="70"/>
+        <target id="t5_c" x="94" y="293" w="91" h="91"/>
+        <target id="t6_c" x="328" y="294" w="91" h="91"/>
+        <target id="t7" x="393" y="463" w="70" h="70"/>
+        <target id="t8" x="344" y="214" w="70" h="70"/>
+        <target id="t9_o" x="445" y="162" w="100" h="100"/>
+        <target id="t10" x="591" y="132" w="70" h="70"/>
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = [
+{'draggables': ['1', '2'],
+'targets': ['t2', 't3', 't4' ],
+'rule':'anyof'
+}]
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h3>Describe carbon molecule in LCAO-MO</h3>
+        <br />
+    </text>
+
+    <drag_and_drop_input img="images_list/lcao-mo/lcao-mo.jpg" target_outline="true" >
+
+        <!-- filled bond -->
+        <draggable id="1" icon="images_list/lcao-mo/u_d.png" />
+        <draggable id="2" icon="images_list/lcao-mo/u_d.png" />
+        <draggable id="3" icon="images_list/lcao-mo/u_d.png" />
+        <draggable id="4" icon="images_list/lcao-mo/u_d.png" />
+        <draggable id="5" icon="images_list/lcao-mo/u_d.png" />
+        <draggable id="6" icon="images_list/lcao-mo/u_d.png" />
+
+        <!-- up bond -->
+        <draggable id="7"  icon="images_list/lcao-mo/up.png"/>
+        <draggable id="8"  icon="images_list/lcao-mo/up.png"/>
+        <draggable id="9"  icon="images_list/lcao-mo/up.png"/>
+        <draggable id="10" icon="images_list/lcao-mo/up.png"/>
+
+        <!-- sigma -->
+        <draggable id="11" icon="images_list/lcao-mo/sigma.png"/>
+        <draggable id="12" icon="images_list/lcao-mo/sigma.png"/>
+
+        <!-- sigma* -->
+        <draggable id="13" icon="images_list/lcao-mo/sigma_s.png"/>
+        <draggable id="14" icon="images_list/lcao-mo/sigma_s.png"/>
+
+        <!-- pi -->
+        <draggable id="15" icon="images_list/lcao-mo/pi.png" />
+
+        <!-- pi* -->
+        <draggable id="16" icon="images_list/lcao-mo/pi_s.png" />
+
+        <!-- images that should not be dragged -->
+        <draggable id="17" icon="images_list/lcao-mo/d.png" />
+        <draggable id="18" icon="images_list/lcao-mo/d.png" />
+
+        <!-- positions of electrons and electron pairs -->
+        <target id="s_left"       x="130" y="360"    w="32" h="32"/>
+        <target id="s_right"      x="505" y="360"    w="32" h="32"/>
+        <target id="s_sigma"      x="320" y="425"    w="32" h="32"/>
+        <target id="s_sigma_star" x="320" y="290"    w="32" h="32"/>
+        <target id="p_left_1"     x="80"  y="100"    w="32" h="32"/>
+        <target id="p_left_2"     x="125" y="100"    w="32" h="32"/>
+        <target id="p_left_3"     x="175" y="100"    w="32" h="32"/>
+        <target id="p_right_1"    x="465" y="100"    w="32" h="32"/>
+        <target id="p_right_2"    x="515" y="100"    w="32" h="32"/>
+        <target id="p_right_3"    x="560" y="100"    w="32" h="32"/>
+        <target id="p_pi_1"       x="290" y="220"    w="32" h="32"/>
+        <target id="p_pi_2"       x="335" y="220"    w="32" h="32"/>
+        <target id="p_sigma"      x="315" y="170"    w="32" h="32"/>
+        <target id="p_pi_star_1"  x="290" y="40"     w="32" h="32"/>
+        <target id="p_pi_star_2"  x="340" y="40"     w="32" h="32"/>
+        <target id="p_sigma_star" x="315" y="0"      w="32" h="32"/>
+
+        <!-- positions of names of energy levels -->
+        <target id="s_sigma_name"      x="400" y="425"  w="32" h="32"/>
+        <target id="s_sigma_star_name" x="400" y="290"  w="32" h="32"/>
+        <target id="p_pi_name"         x="400" y="220"  w="32" h="32"/>
+        <target id="p_sigma_name"      x="400" y="170"  w="32" h="32"/>
+        <target id="p_pi_star_name"    x="400" y="40"   w="32" h="32"/>
+        <target id="p_sigma_star_name" x="400" y="0"    w="32" h="32"/>
+
+  </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = [
+{
+  'draggables': ['1', '2', '3', '4', '5', '6'],
+  'targets': [
+    's_left', 's_right', 's_sigma', 's_sigma_star', 'p_pi_1', 'p_pi_2'
+  ],
+  'rule': 'anyof'
+}, {
+  'draggables': ['7','8', '9', '10'],
+  'targets': ['p_left_1', 'p_left_2', 'p_right_1','p_right_2'],
+  'rule': 'anyof'
+}, {
+  'draggables': ['11', '12'],
+  'targets': ['s_sigma_name', 'p_sigma_name'],
+  'rule': 'anyof'
+}, {
+  'draggables': ['13', '14'],
+  'targets': ['s_sigma_star_name', 'p_sigma_star_name'],
+  'rule': 'anyof'
+}, {
+  'draggables': ['15'],
+  'targets': ['p_pi_name'],
+  'rule': 'anyof'
+}, {
+  'draggables': ['16'],
+  'targets': ['p_pi_star_name'],
+  'rule': 'anyof'
+}]
+
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h3>Describe oxygen molecule in LCAO-MO</h3>
+        <br />
+    </text>
+
+    <drag_and_drop_input img="images_list/lcao-mo/lcao-mo.jpg" target_outline="true" one_per_target="true">
+        <!-- filled bond -->
+        <draggable id="1" icon="images_list/lcao-mo/u_d.png" />
+        <draggable id="2" icon="images_list/lcao-mo/u_d.png" />
+        <draggable id="3" icon="images_list/lcao-mo/u_d.png" />
+        <draggable id="4" icon="images_list/lcao-mo/u_d.png" />
+        <draggable id="5" icon="images_list/lcao-mo/u_d.png" />
+        <draggable id="6" icon="images_list/lcao-mo/u_d.png" />
+        <draggable id="v_fb_1" icon="images_list/lcao-mo/u_d.png" />
+        <draggable id="v_fb_2" icon="images_list/lcao-mo/u_d.png" />
+        <draggable id="v_fb_3" icon="images_list/lcao-mo/u_d.png" />
+
+        <!-- up bond -->
+        <draggable id="7"  icon="images_list/lcao-mo/up.png"/>
+        <draggable id="8"  icon="images_list/lcao-mo/up.png"/>
+        <draggable id="9"  icon="images_list/lcao-mo/up.png"/>
+        <draggable id="10" icon="images_list/lcao-mo/up.png"/>
+        <draggable id="v_ub_1" icon="images_list/lcao-mo/up.png"/>
+        <draggable id="v_ub_2" icon="images_list/lcao-mo/up.png"/>
+
+        <!-- sigma -->
+        <draggable id="11" icon="images_list/lcao-mo/sigma.png"/>
+        <draggable id="12" icon="images_list/lcao-mo/sigma.png"/>
+
+        <!-- sigma* -->
+        <draggable id="13" icon="images_list/lcao-mo/sigma_s.png"/>
+        <draggable id="14" icon="images_list/lcao-mo/sigma_s.png"/>
+
+        <!-- pi -->
+        <draggable id="15" icon="images_list/lcao-mo/pi.png" />
+
+        <!-- pi* -->
+        <draggable id="16" icon="images_list/lcao-mo/pi_s.png" />
+
+        <!-- images that should not be dragged -->
+        <draggable id="17" icon="images_list/lcao-mo/d.png" />
+        <draggable id="18" icon="images_list/lcao-mo/d.png" />
+
+        <!-- positions of electrons and electron pairs -->
+        <target id="s_left"       x="130" y="360"    w="32" h="32"/>
+        <target id="s_right"      x="505" y="360"    w="32" h="32"/>
+        <target id="s_sigma"      x="320" y="425"    w="32" h="32"/>
+        <target id="s_sigma_star" x="320" y="290"   w="32" h="32"/>
+        <target id="p_left_1"     x="80"  y="100"   w="32" h="32"/>
+        <target id="p_left_2"     x="125" y="100"   w="32" h="32"/>
+        <target id="p_left_3"     x="175" y="100"   w="32" h="32"/>
+        <target id="p_right_1"    x="465" y="100"   w="32" h="32"/>
+        <target id="p_right_2"    x="515" y="100"   w="32" h="32"/>
+        <target id="p_right_3"    x="560" y="100"   w="32" h="32"/>
+        <target id="p_pi_1"       x="290" y="220"  w="32" h="32"/>
+        <target id="p_pi_2"       x="335" y="220"  w="32" h="32"/>
+        <target id="p_sigma"      x="315" y="170"  w="32" h="32"/>
+        <target id="p_pi_star_1"  x="290" y="40"  w="32" h="32"/>
+        <target id="p_pi_star_2"  x="340" y="40"  w="32" h="32"/>
+        <target id="p_sigma_star" x="315" y="0"  w="32" h="32"/>
+
+        <!-- positions of names of energy levels -->
+        <target id="s_sigma_name" x="400" y="425"  w="32" h="32"/>
+        <target id="s_sigma_star_name" x="400" y="290"  w="32" h="32"/>
+        <target id="p_pi_name" x="400" y="220"  w="32" h="32"/>
+        <target id="p_pi_star_name" x="400" y="40"  w="32" h="32"/>
+        <target id="p_sigma_name" x="400" y="170"  w="32" h="32"/>
+        <target id="p_sigma_star_name" x="400" y="0"  w="32" h="32"/>
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = [{
+  'draggables': ['1', '2', '3', '4', '5', '6', 'v_fb_1', 'v_fb_2', 'v_fb_3'],
+  'targets': [
+    's_left', 's_right', 's_sigma', 's_sigma_star', 'p_pi_1', 'p_pi_2',
+    'p_sigma', 'p_left_1', 'p_right_3'
+  ],
+  'rule': 'anyof'
+}, {
+  'draggables': ['7', '8', '9', '10', 'v_ub_1', 'v_ub_2'],
+  'targets': [
+    'p_left_2', 'p_left_3', 'p_right_1', 'p_right_2', 'p_pi_star_1',
+    'p_pi_star_2'
+  ],
+  'rule': 'anyof'
+}, {
+  'draggables': ['11', '12'],
+  'targets': ['s_sigma_name', 'p_sigma_name'],
+  'rule': 'anyof'
+}, {
+  'draggables': ['13', '14'],
+  'targets': ['s_sigma_star_name', 'p_sigma_star_name'],
+  'rule': 'anyof'
+}, {
+  'draggables': ['15'],
+  'targets': ['p_pi_name'],
+  'rule': 'anyof'
+}, {
+  'draggables': ['16'],
+  'targets': ['p_pi_star_name'],
+  'rule': 'anyof'
+}]
+
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+
+]]></answer>
+</customresponse>
+
 <text>
     <p>
       Drag and drop pictures to proper positions.
@@ -44,14 +299,14 @@ else:
 <customresponse>
     <text>
         <h3>
-            Individual targets WITHOUT outlines. Move Star to the
+            SMALL IMAGE. Individual targets WITHOUT outlines. Move Star to the
             volcano opening, and Label3 on to the right ear of the cow.
             One draggable per target.
         </h3>
         <br />
     </text>
 
-    <drag_and_drop_input img="cow.png" target_outline="false">
+    <drag_and_drop_input img="cow3.png" target_outline="false">
         <draggable id="1" label="Label 1"/>
         <draggable id="name_with_icon" label="Ant" icon="images_list/ant.jpg"/>
         <draggable id="with_icon" label="Cloud" icon="images_list/cloud.jpg" />
@@ -61,8 +316,8 @@ else:
         <draggable id="name4" label="Star" icon="images_list/star.png" />
         <draggable id="7" label="Label3" />
 
-        <target id="t1" x="210" y="90" w="90" h="90"/>
-        <target id="t2" x="400" y="190" w="90" h="90"/>
+        <target id="t1" x="111" y="58" w="90" h="90"/>
+        <target id="t2" x="212" y="90" w="90" h="90"/>
 
     </drag_and_drop_input>
 
@@ -173,11 +428,103 @@ else:
     </drag_and_drop_input>
 
     <answer type="loncapa/python"><![CDATA[
-correct_answer = {'l3_o': 't1_o',
-                  'l10_o': 't9_o',
+correct_answer = [
+{
+    'draggables':  ['l3_o', 'l10_o'],
+    'targets':  ['t1_o', 't9_o'],
+    'rule': 'anyof'
+},
+{
+    'draggables': ['l1_c','l8_c'],
+    'targets': ['t5_c','t6_c'],
+    'rule': 'anyof'
+}
+]
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
 
-                  'l1_c': 't5_c',
-                  'l8_c': 't6_c'}
+<customresponse>
+    <text>
+        <h3>If the element appears in this molecule,
+         drag the label onto it</h3>
+        <br />
+    </text>
+
+    <drag_and_drop_input img="images_list/ethglycol.jpg" target_outline="true"
+        one_per_target="true" no_labels="true">
+        <draggable id="1" label="Hydrogen" />
+        <draggable id="2" label="Hydrogen" />
+        <draggable id="3" label="Nytrogen" />
+        <draggable id="4" label="Nytrogen" />
+        <draggable id="5" label="Boron" />
+        <draggable id="6" label="Boron" />
+        <draggable id="7" label="Carbon" />
+        <draggable id="8" label="Carbon" />
+
+        <target id="t1_o" x="10" y="67" w="100" h="100"/>
+        <target id="t2_h" x="133" y="3" w="70" h="70"/>
+        <target id="t3_h" x="2" y="384" w="70" h="70"/>
+        <target id="t4_h" x="95" y="386" w="70" h="70"/>
+        <target id="t5_c" x="94" y="293" w="91" h="91"/>
+        <target id="t6_c" x="328" y="294" w="91" h="91"/>
+        <target id="t7_h" x="393" y="463" w="70" h="70"/>
+        <target id="t8_h" x="344" y="214" w="70" h="70"/>
+        <target id="t9_o" x="445" y="162" w="100" h="100"/>
+        <target id="t10_h" x="591" y="132" w="70" h="70"/>
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = [
+{
+    'draggables':   ['7', '8'],
+    'targets':  ['t5_c', 't6_c'],
+    'rule': 'anyof'
+},
+{
+    'draggables': ['1', '2'],
+    'targets': ['t2_h', 't3_h', 't4_h', 't7_h', 't8_h', 't10_h'],
+    'rule': 'anyof'
+}]
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h3>
+            SMALL IMAGE. Individual targets WITHOUT outlines. Move Star to the
+            volcano opening, and Label3 on to the right ear of the cow.
+            One draggable per target.
+        </h3>
+        <br />
+    </text>
+
+    <drag_and_drop_input img="cow3_bad.png" target_outline="false">
+        <draggable id="1" label="Label 1"/>
+        <draggable id="name_with_icon" label="Ant" icon="images_list/ant.jpg"/>
+        <draggable id="with_icon" label="Cloud" icon="images_list/cloud.jpg" />
+        <draggable id="5" label="Label2" />
+        <draggable id="2" label="Drop" icon="images_list/drop.jpg" />
+        <draggable id="name_label_icon3" label="Grass" icon="images_list/grass.jpg" />
+        <draggable id="name4" label="Star" icon="images_list/star.png" />
+        <draggable id="7" label="Label3" />
+
+        <target id="t1" x="111" y="58" w="90" h="90"/>
+        <target id="t2" x="212" y="90" w="90" h="90"/>
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = {'name4': 't1',
+                '7': 't2'}
 if draganddrop.grade(submission[0], correct_answer):
     correct = ['correct']
 else:

From d5317462363f1a03681a2777f6d41d51dc817c30 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Fri, 4 Jan 2013 13:05:28 +0200
Subject: [PATCH 483/541] Removed reliance on imageDir config setting. Now we
 expect the correct path to tbe set in XML.

---
 .../js/capa/drag_and_drop/base_image.js       |  8 +-
 .../js/capa/drag_and_drop/config_parser.js    |  3 +-
 .../js/capa/drag_and_drop/draggables.js       | 94 +++++++++++--------
 common/static/js/capa/drag_and_drop/main.js   | 11 +--
 4 files changed, 59 insertions(+), 57 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/base_image.js b/common/static/js/capa/drag_and_drop/base_image.js
index 85f6006918..0c9c15fd2e 100644
--- a/common/static/js/capa/drag_and_drop/base_image.js
+++ b/common/static/js/capa/drag_and_drop/base_image.js
@@ -26,7 +26,7 @@ define(['logme'], function (logme) {
 
         state.baseImageEl.attr(
             'src',
-            state.config.imageDir + '/' + state.config.base_image
+            state.config.base_image
         );
         state.baseImageEl.load(function () {
             baseImageElContainer.css('width', this.width);
@@ -39,13 +39,11 @@ define(['logme'], function (logme) {
         });
         state.baseImageEl.error(function () {
             logme(
-                'ERROR: Image "' + state.config.imageDir + '/' +
-                state.config.base_image + '" was not found!'
+                'ERROR: Image "' + state.config.base_image + '" was not found!'
             );
             baseImageElContainer.html(
                 '<span style="color: red;">' +
-                    'ERROR: Image "' + state.config.imageDir + '/' +
-                    state.config.base_image + '" was not found!' +
+                    'ERROR: Image "' + state.config.base_image + '" was not found!' +
                 '</span>'
             );
             baseImageElContainer.appendTo(state.containerEl);
diff --git a/common/static/js/capa/drag_and_drop/config_parser.js b/common/static/js/capa/drag_and_drop/config_parser.js
index 664324e0b9..2b58bc42f8 100644
--- a/common/static/js/capa/drag_and_drop/config_parser.js
+++ b/common/static/js/capa/drag_and_drop/config_parser.js
@@ -7,13 +7,12 @@
 define(['logme'], function (logme) {
     return configParser;
 
-    function configParser(config, imageDir, state) {
+    function configParser(config, state) {
         var returnStatus;
 
         returnStatus = true;
 
         state.config = {
-            'imageDir': '/static/' + imageDir + '/images',
             'draggables': [],
             'targets': [],
             'base_image': ''
diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index 78fc47bf75..36ff7238d9 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -89,7 +89,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                 draggableObj.iconEl = $('<img />');
                 draggableObj.iconEl.attr(
                     'src',
-                    state.config.imageDir + '/' + obj.icon
+                    obj.icon
                 );
                 draggableObj.iconEl.load(function () {
                     draggableObj.iconWidth = this.width;
@@ -358,11 +358,10 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             // the input with the user's answer (X-Y position of the draggable,
             // or the ID of the target where it landed.
             function checkLandingElement() {
-                var offsetIE, targetFound;
+                var positionIE, targetFound;
 
                 mousePressed = false;
-
-                offsetIE = draggableObj.iconEl.position();
+                positionIE = draggableObj.iconEl.position();
 
                 if (state.individualTargets === true) {
                     targetFound = false;
@@ -378,20 +377,15 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         state.numDraggablesInSlider += 1;
                     }
                 } else {
-                    logme(
-                        'baseImageEl.width = ' + state.baseImageEl.width() + '; ' +
-                        'baseImageEl.height = ' + state.baseImageEl.height()
-                    );
-
                     if (
-                        (offsetIE.left < 0) ||
+                        (positionIE.left < 0) ||
                         (
-                            offsetIE.left + draggableObj.iconWidth >
+                            positionIE.left + draggableObj.iconWidth >
                             state.baseImageEl.width()
                         ) ||
-                        (offsetIE.top < 0) ||
+                        (positionIE.top < 0) ||
                         (
-                            offsetIE.top + draggableObj.iconHeight >
+                            positionIE.top + draggableObj.iconHeight >
                             state.baseImageEl.height()
                         )
                     ) {
@@ -405,9 +399,9 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         correctZIndexes();
 
                         draggableObj.x =
-                            offsetIE.left + draggableObj.iconWidth * 0.5;
+                            positionIE.left + draggableObj.iconWidth * 0.5;
                         draggableObj.y =
-                            offsetIE.top + draggableObj.iconHeight * 0.5;
+                            positionIE.top + draggableObj.iconHeight * 0.5;
                     }
                 }
 
@@ -432,41 +426,26 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                     }
                 }
 
+                //
                 // Determine if a draggable, after it was relased, ends up on a
                 // target. We do this by iterating over all of the targets, and
                 // for each one we check whether the draggable's center is
                 // within the target's dimensions.
+                //
+                // positionIE is the object as returned by
+                //
+                //     draggableObj.iconEl.position()
+                //
                 function checkIfOnTarget() {
                     var c1, target;
 
                     for (c1 = 0; c1 < state.targets.length; c1 += 1) {
                         target = state.targets[c1];
 
-                        if (
-                            offsetIE.top + draggableObj.iconHeight * 0.5 <
-                            target.offset.top
-                        ) {
-                            continue;
-                        }
-                        if (
-                            offsetIE.top + draggableObj.iconHeight * 0.5 >
-                            target.offset.top + target.h
-                        ) {
-                            continue;
-                        }
-                        if (
-                            offsetIE.left + draggableObj.iconWidth * 0.5 <
-                            target.offset.left
-                        ) {
-                            continue;
-                        }
-                        if (
-                            offsetIE.left + draggableObj.iconWidth * 0.5 >
-                            target.offset.left + target.w
-                        ) {
-                            continue;
-                        }
-
+                        // If only one draggable per target is allowed, and
+                        // the current target already has a draggable on it
+                        // (with an ID different from the one we are checking
+                        // against), then go to next target.
                         if (
                             (state.config.one_per_target === true) &&
                             (target.draggable.length === 1) &&
@@ -475,6 +454,35 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                             continue;
                         }
 
+                        // Check if the draggable's center coordinate is within
+                        // the target's dimensions. If not, go to next target.
+                        if (
+                            positionIE.top + draggableObj.iconHeight * 0.5 <
+                            target.offset.top
+                        ) {
+                            continue;
+                        }
+                        if (
+                            positionIE.top + draggableObj.iconHeight * 0.5 >
+                            target.offset.top + target.h
+                        ) {
+                            continue;
+                        }
+                        if (
+                            positionIE.left + draggableObj.iconWidth * 0.5 <
+                            target.offset.left
+                        ) {
+                            continue;
+                        }
+                        if (
+                            positionIE.left + draggableObj.iconWidth * 0.5 >
+                            target.offset.left + target.w
+                        ) {
+                            continue;
+                        }
+
+                        // If we got here, then our draggable is on top of a
+                        // target.
                         targetFound = true;
 
                         // If the draggable was moved from one target to
@@ -488,7 +496,11 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                             removeObjIdFromTarget();
                             onTarget = target;
                             target.draggable.push(draggableObj.id);
-                        } else if (onTarget === null) {
+                        }
+                        // If the draggable was moved from the slider to a
+                        // target, remember the target, and add ID to the
+                        // target's draggables list.
+                        else if (onTarget === null) {
                             onTarget = target;
                             target.draggable.push(draggableObj.id);
                         }
diff --git a/common/static/js/capa/drag_and_drop/main.js b/common/static/js/capa/drag_and_drop/main.js
index ec186066c1..24cc8cbdcb 100644
--- a/common/static/js/capa/drag_and_drop/main.js
+++ b/common/static/js/capa/drag_and_drop/main.js
@@ -17,7 +17,7 @@ define(
 
     // $(value) - get the element of the entire problem
     function processProblem(index, value) {
-        var problemId, imageDir, config, state;
+        var problemId, config, state;
 
         if ($(value).attr('data-problem-processed') === 'true') {
             // This problem was already processed by us before, so we will
@@ -43,16 +43,9 @@ define(
             return;
         }
 
-        imageDir = $(value).attr('data-course-folder');
-        if (typeof imageDir !== 'string') {
-            logme('ERROR: Could not find the name of the image directory.');
-
-            return;
-        }
-
         state = State(problemId);
 
-        if (configParser(config, imageDir, state) !== true) {
+        if (configParser(config, state) !== true) {
             logme('ERROR: Could not make sense of the JSON configuration options.');
 
             return;

From f02621876d86ac6696d460f79cad5105f4bbedca Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 4 Jan 2013 13:13:05 +0200
Subject: [PATCH 484/541] removed course id

---
 common/lib/capa/capa/inputtypes.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index 48ee45e8ac..e0c90bd8ee 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -871,12 +871,6 @@ class DragAndDropInput(InputTypeBase):
 
         self.loaded_attributes['drag_and_drop_json'] = json.dumps(to_js)
         self.to_render.add('drag_and_drop_json')
-        try:  # for tests and mock up, work normally not in tets
-            self.loaded_attributes['course_folder'] = \
-                self.system.filestore.root_path.split('/')[-1]
-        except:
-            self.loaded_attributes['course_folder'] = 'mock'
-        self.to_render.add('course_folder')
 
 registry.register(DragAndDropInput)
 

From 4c23860e0f9311b81f1013daf9b62d0b7ba8f1e7 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 4 Jan 2013 13:15:26 +0200
Subject: [PATCH 485/541] updated inputtype test without course_id ransferring

---
 common/lib/capa/capa/tests/test_inputtypes.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/common/lib/capa/capa/tests/test_inputtypes.py b/common/lib/capa/capa/tests/test_inputtypes.py
index 0b3eeea0c6..a61d47a243 100644
--- a/common/lib/capa/capa/tests/test_inputtypes.py
+++ b/common/lib/capa/capa/tests/test_inputtypes.py
@@ -539,7 +539,6 @@ class DragAndDropTest(unittest.TestCase):
         expected = {'id': 'prob_1_2',
                     'value': value,
                     'status': 'unsubmitted',
-                    'course_folder': 'mock',
                     'msg': '',
                     'drag_and_drop_json': '{"use_targets": "True", \
 "target_outline": "false", "one_per_target": "True", \

From 933f94a51430faa0da26ee6e287c2370381877fa Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 4 Jan 2013 13:17:23 +0200
Subject: [PATCH 486/541] comment fix

---
 common/lib/capa/capa/graders/draganddrop.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/capa/capa/graders/draganddrop.py b/common/lib/capa/capa/graders/draganddrop.py
index af28435bb6..ff37ef2b3e 100644
--- a/common/lib/capa/capa/graders/draganddrop.py
+++ b/common/lib/capa/capa/graders/draganddrop.py
@@ -132,7 +132,7 @@ class DragAndDrop(object):
                 return False
 
         # Check that in every group, for rule of that group, user positions of
-        #every element are equal with correct positions
+        # every element are equal with correct positions
         for groupname in self.correct_groups:
             rules_executed = 0
             for rule in ('exact', 'anyof'):   # every group has only one rule

From 87c58be7421cd35f112d229847df68a88bf2b0d3 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 4 Jan 2013 13:31:54 +0200
Subject: [PATCH 487/541] removed course folder var from mako template

---
 common/lib/capa/capa/templates/drag_and_drop_input.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/capa/capa/templates/drag_and_drop_input.html b/common/lib/capa/capa/templates/drag_and_drop_input.html
index 161ecd1af1..c186281796 100644
--- a/common/lib/capa/capa/templates/drag_and_drop_input.html
+++ b/common/lib/capa/capa/templates/drag_and_drop_input.html
@@ -1,6 +1,6 @@
 <section id="inputtype_${id}" class="capa_inputtype" >
     <div class="drag_and_drop_problem_div" id="drag_and_drop_div_${id}"
-     data-plain-id="${id}" data-course-folder="${course_folder}">
+     data-plain-id="${id}">
     </div>
 
     <div class="drag_and_drop_problem_json" id="drag_and_drop_json_${id}"

From e66e4040b13183fd057a0dcf629b91ceb70ad27c Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 4 Jan 2013 14:10:50 +0200
Subject: [PATCH 488/541] replaced ordereddict with dict

---
 common/lib/capa/capa/graders/draganddrop.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/common/lib/capa/capa/graders/draganddrop.py b/common/lib/capa/capa/graders/draganddrop.py
index ff37ef2b3e..4fef58bf7b 100644
--- a/common/lib/capa/capa/graders/draganddrop.py
+++ b/common/lib/capa/capa/graders/draganddrop.py
@@ -27,7 +27,6 @@ values are (x,y) coordinates of centers of dragged images.
 """
 
 import json
-from collections import OrderedDict
 
 
 class PositionsCompare(list):
@@ -105,10 +104,10 @@ class DragAndDrop(object):
     """ Grader class for drag and drop inputtype.
     """
     def __init__(self):
-        self.correct_groups = OrderedDict()  # correct groups from xml
-        self.correct_positions = OrderedDict()  # correct positions for comparing
-        self.user_groups = OrderedDict()  # will be populated from user answer
-        self.user_positions = OrderedDict()  # will be populated from user answer
+        self.correct_groups = dict()  # correct groups from xml
+        self.correct_positions = dict()  # correct positions for comparing
+        self.user_groups = dict()  # will be populated from user answer
+        self.user_positions = dict()  # will be populated from user answer
 
     def grade(self):
         ''' Grader user answer.

From 01e4bdb831f91046bc318b2df5df69685e28c21a Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 4 Jan 2013 14:11:04 +0200
Subject: [PATCH 489/541] added test for populate

---
 common/lib/capa/capa/graders/tests.py | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/common/lib/capa/capa/graders/tests.py b/common/lib/capa/capa/graders/tests.py
index a38fbce3a4..bd71c673ee 100644
--- a/common/lib/capa/capa/graders/tests.py
+++ b/common/lib/capa/capa/graders/tests.py
@@ -5,6 +5,7 @@ from draganddrop import PositionsCompare
 
 
 class Test_PositionsCompare(unittest.TestCase):
+    """ describe"""
 
     def test_nested_list_and_list1(self):
         self.assertEqual(PositionsCompare([[1, 2], 40]), PositionsCompare([1, 3]))
@@ -137,7 +138,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
             'rule': 'anyof'
         }, {
             'draggables': ['7', '8', '9', '10'],
-            'targets': ['p_left_1', 'p_left_2', 'p_right_1','p_right_2'],
+            'targets': ['p_left_1', 'p_left_2', 'p_right_1', 'p_right_2'],
             'rule': 'anyof'
         }, {
             'draggables': ['11', '12'],
@@ -200,10 +201,23 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
 
 
 class Test_DragAndDrop_Populate(unittest.TestCase):
-        #test for every function in DND
 
-    def test1(self):
-            self.assertTrue(1)
+    def test_1(self):
+        dnd = draganddrop.DragAndDrop()
+        correct_answer = {'1': [[40, 10], 29], 'name_with_icon': [20, 20]}
+        user_input = '{"use_targets": false, "draggables": \
+        [{"1": [10, 10]}, {"name_with_icon": [20, 20]}]}'
+        dnd.populate(correct_answer, user_input)
+
+        correct_groups = {'1': ['name_with_icon'], '0': ['1']}
+        correct_positions = {'1': {'exact': [[20, 20]]}, '0': {'exact': [[[40, 10], 29]]}}
+        user_groups = {'1': [u'name_with_icon'], '0': [u'1']}
+        user_positions = {'1': {'user': [[20, 20]]}, '0': {'user': [[10, 10]]}}
+
+        self.assertEqual(correct_groups, dnd.correct_groups)
+        self.assertEqual(correct_positions, dnd.correct_positions)
+        self.assertEqual(user_groups, dnd.user_groups)
+        self.assertEqual(user_positions, dnd.user_positions)
 
 
 class Test_DraAndDrop_Compare_Positions(unittest.TestCase):

From 5c58881222ea4a226dce2165da74cf8e6719be2a Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 4 Jan 2013 14:48:55 +0200
Subject: [PATCH 490/541] tests for drag and drop

---
 common/lib/capa/capa/graders/tests.py | 51 ++++++++++++++++++++++-----
 1 file changed, 42 insertions(+), 9 deletions(-)

diff --git a/common/lib/capa/capa/graders/tests.py b/common/lib/capa/capa/graders/tests.py
index bd71c673ee..90a8a9a98a 100644
--- a/common/lib/capa/capa/graders/tests.py
+++ b/common/lib/capa/capa/graders/tests.py
@@ -222,20 +222,53 @@ class Test_DragAndDrop_Populate(unittest.TestCase):
 
 class Test_DraAndDrop_Compare_Positions(unittest.TestCase):
 
-    def test_exact_1(self):
-        self.assertTrue(1)
+    def test_1(self):
+        dnd = draganddrop.DragAndDrop()
+        self.assertTrue(dnd.compare_positions(correct=[[1, 1], [2, 3]],
+                                              user=[[2, 3], [1, 1]],
+                                              flag='anyof'))
 
-    def test_exact_2(self):
-        self.assertTrue(1)
+    def test_2a(self):
+        dnd = draganddrop.DragAndDrop()
+        self.assertTrue(dnd.compare_positions(correct=[[1, 1], [2, 3]],
+                                               user=[[2, 3], [1, 1]],
+                                               flag='exact'))
 
-    def test_anyof_1(self):
-        self.assertTrue(1)
+    def test_2b(self):
+        dnd = draganddrop.DragAndDrop()
+        self.assertFalse(dnd.compare_positions(correct=[[1, 1], [2, 3]],
+                                               user=[[2, 13], [1, 1]],
+                                               flag='exact'))
 
-    def test_anyof_2(self):
-        self.assertTrue(1)
+    def test_3(self):
+        dnd = draganddrop.DragAndDrop()
+        self.assertFalse(dnd.compare_positions(correct=["a", "b"],
+                                               user=["a", "b", "c"],
+                                               flag='anyof'))
+
+    def test_4(self):
+        dnd = draganddrop.DragAndDrop()
+        self.assertTrue(dnd.compare_positions(correct=["a", "b", "c"],
+                                              user=["a", "b"],
+                                              flag='anyof'))
 
     def test_5(self):
-        self.assertTrue(1)
+        dnd = draganddrop.DragAndDrop()
+        self.assertFalse(dnd.compare_positions(correct=["a", "b", "c"],
+                                               user=["a", "c", "b"],
+                                               flag='exact'))
+
+    def test_6(self):
+        dnd = draganddrop.DragAndDrop()
+        self.assertTrue(dnd.compare_positions(correct=["a", "b", "c"],
+                                               user=["a", "c", "b"],
+                                               flag='anyof'))
+
+    def test_7(self):
+        dnd = draganddrop.DragAndDrop()
+        self.assertFalse(dnd.compare_positions(correct=["a", "b", "b"],
+                                               user=["a", "c", "b"],
+                                               flag='anyof'))
 
 
 def suite():

From b7b25369e0df1c9c7e640efcf6133bb4e414671f Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Fri, 4 Jan 2013 15:10:26 +0200
Subject: [PATCH 491/541] Added mouse event handlers to container of draggable.
 Now it is easier to initiate a dragging operation.

---
 common/static/js/capa/drag_and_drop/draggables.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index 36ff7238d9..ea100e072f 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -208,6 +208,10 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             draggableObj.iconEl.mouseup(mouseUp);
             draggableObj.iconEl.mousemove(mouseMove);
 
+            draggableObj.containerEl.mousedown(mouseDown);
+            draggableObj.containerEl.mouseup(mouseUp);
+            draggableObj.containerEl.mousemove(mouseMove);
+
             inContainer = true;
             mousePressed = false;
 

From b540ca492aeea2dbee233a3950d1df5ffadea805 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 4 Jan 2013 15:13:51 +0200
Subject: [PATCH 492/541] removed old flag use_targets

---
 common/lib/capa/capa/inputtypes.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index e0c90bd8ee..4d2e2ed142 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -852,10 +852,6 @@ class DragAndDropInput(InputTypeBase):
         # image drag and drop onto
         to_js['base_image'] = Attribute('img').parse_from_xml(self.xml)
 
-        # problem subtype: targets or positions
-        to_js['use_targets'] = Attribute('targets',
-                                        default="True").parse_from_xml(self.xml)
-
         # outline places on image where to drag adn drop
         to_js['target_outline'] = Attribute('target_outline',
                                         default="False").parse_from_xml(self.xml)

From cd6e220eada8a0ef4952a4fe4de8dd473fd0ef16 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Fri, 4 Jan 2013 15:20:41 +0200
Subject: [PATCH 493/541] Fixed annoying bug whre if you dragged any part of
 the base image or other parts of the Drag and Drop problem, then the browser
 would start highlighting the elements.

---
 common/static/js/capa/drag_and_drop/base_image.js | 4 ++++
 common/static/js/capa/drag_and_drop/scroller.js   | 4 ++++
 common/static/js/capa/drag_and_drop/targets.js    | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/common/static/js/capa/drag_and_drop/base_image.js b/common/static/js/capa/drag_and_drop/base_image.js
index 0c9c15fd2e..0b64a7fd65 100644
--- a/common/static/js/capa/drag_and_drop/base_image.js
+++ b/common/static/js/capa/drag_and_drop/base_image.js
@@ -35,6 +35,10 @@ define(['logme'], function (logme) {
             state.baseImageEl.appendTo(baseImageElContainer);
             baseImageElContainer.appendTo(state.containerEl);
 
+            state.baseImageEl.mousedown(function (event) {
+                event.preventDefault();
+            });
+
             state.baseImageLoaded = true;
         });
         state.baseImageEl.error(function () {
diff --git a/common/static/js/capa/drag_and_drop/scroller.js b/common/static/js/capa/drag_and_drop/scroller.js
index 505785086d..c1fe867006 100644
--- a/common/static/js/capa/drag_and_drop/scroller.js
+++ b/common/static/js/capa/drag_and_drop/scroller.js
@@ -113,6 +113,10 @@ define(['logme'], function (logme) {
         );
         state.sliderEl.appendTo(showEl);
 
+        state.sliderEl.mousedown(function (event) {
+            event.preventDefault();
+        });
+
         moveRightEl = $(
             '<div ' +
                 'style=" ' +
diff --git a/common/static/js/capa/drag_and_drop/targets.js b/common/static/js/capa/drag_and_drop/targets.js
index e00bfdb4b5..fdd6678269 100644
--- a/common/static/js/capa/drag_and_drop/targets.js
+++ b/common/static/js/capa/drag_and_drop/targets.js
@@ -43,6 +43,10 @@ define(['logme'], function (logme) {
 
             targetEl.appendTo(state.baseImageEl.parent());
 
+            targetEl.mousedown(function (event) {
+                event.preventDefault();
+            });
+
             state.targets.push({
                 'id': obj.id,
 

From 65fd71d06ba7dbf664cab39f0a1f77bb1e8afd8a Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 4 Jan 2013 15:43:26 +0200
Subject: [PATCH 494/541] added documentation for rules

---
 common/lib/capa/capa/graders/draganddrop.py | 36 +++++++++++++++++++++
 docs/source/drag_and_drop_input.rst         |  7 +++-
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/common/lib/capa/capa/graders/draganddrop.py b/common/lib/capa/capa/graders/draganddrop.py
index 4fef58bf7b..431b5d249c 100644
--- a/common/lib/capa/capa/graders/draganddrop.py
+++ b/common/lib/capa/capa/graders/draganddrop.py
@@ -151,6 +151,42 @@ class DragAndDrop(object):
         """ Compares two lists of positions with flag rules. Order of
         correct/user arguments is matter only in 'anyof' flag.
 
+        Rules description:
+
+            'exact' means 1-1 ordered relationship::
+
+                [el1, el2, el3] is 'exact' equal to [el5, el6, el7] when
+                el1 == el5, el2 == el6, el3 == el7.
+                Equality function is custom, see below.
+
+
+            'anyof' means subset relationship::
+
+                user = [el1, el2] is 'anyof' equal to correct = [el1, el2, el3]
+                when
+                        set(user) <= set(correct).
+
+                'anyof' is ordered relationship. It always checks if user
+                is subset of correct
+
+                Equality function is custom, see below.
+
+                Examples:
+
+                     - many draggables per position:
+                    user ['1','2','2','2'] is 'anyof' equal to ['1', '2', '3']
+
+                     - draggables can be placed in any order:
+                    user ['1','2','3','4'] is 'anyof' equal to ['4', '2', '1', 3']
+
+        Equality functions:
+
+        Equality functon depends on type of element. They declared in
+        PositionsCompare class. For position like targets
+        ids ("t1", "t2", etc..) it is string equality function. For coordinate
+        positions ([1,2] or [[1,2], 15]) it is coordinate_positions_compare
+        function (see docstrings in PositionsCompare class)
+
         Args:
             correst, user: lists of positions
 
diff --git a/docs/source/drag_and_drop_input.rst b/docs/source/drag_and_drop_input.rst
index 75e77b97e2..3675de9c96 100644
--- a/docs/source/drag_and_drop_input.rst
+++ b/docs/source/drag_and_drop_input.rst
@@ -29,6 +29,9 @@ be specified for this tag::
     one_per_target - Specify whether to allow more than one draggable to be
           placed onto a single target. It can be either 'true' or 'false'. If
           not specified, the default value is 'true'.
+    no_labels - default is false, in default behaviour if label is not set, label
+          is obtained from id. If no_labels is true, labels are not automatically
+          populated from id, and one can not set labels and obtain only icons.
 
 draggable tag
 -------------
@@ -49,7 +52,8 @@ In order for the grader to work, it is essential that a unique ID
 is provided. Otherwise, there will be no way to tell which draggable is at what
 coordinate, or over what target. Label and icon attributes are optional. If
 they are provided they will be used, otherwise, you can have an empty
-draggable. The path is relative to 'course_folder/static/images/' folder.
+draggable. The path is relative to 'course_folder' folder, for example,
+/static/images/img1.png.
 
 target tag
 ----------
@@ -77,6 +81,7 @@ the slider.
 If no targets are provided, then a draggable can be dragged and placed anywhere
 on the base image.
 
+
 Example
 =======
 

From f92c0bdcebfe4bd2d237867c9422726368966ead Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Wed, 9 Jan 2013 11:34:03 +0200
Subject: [PATCH 495/541] New feature: when the draggable is out of the slider
 container, if it has a label, the label will get a background. This way it is
 much easier to discern the label against the base image.

---
 .../js/capa/drag_and_drop/draggables.js       | 53 +++++++++++++++++--
 .../js/capa/drag_and_drop/update_input.js     | 52 ++++++++++++++++++
 2 files changed, 101 insertions(+), 4 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index ea100e072f..1aafa0591c 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -27,6 +27,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                     event.pageX -
                         state.baseImageEl.offset().left -
                         state.currentMovingDraggable.iconWidth * 0.5
+                        - state.currentMovingDraggable.iconElLeftOffset
                 );
                 state.currentMovingDraggable.iconEl.css(
                     'top',
@@ -41,6 +42,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         event.pageX -
                             state.baseImageEl.offset().left -
                             state.currentMovingDraggable.labelWidth * 0.5
+                            - 9 // Account for padding, border.
                     );
                     state.currentMovingDraggable.labelEl.css(
                         'top',
@@ -84,7 +86,10 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             draggableObj.containerEl.appendTo(state.sliderEl);
 
             if (obj.icon.length > 0) {
-                draggableObj.hasIcon = true;
+                draggableObj.iconElBGColor = 'transparent';
+                draggableObj.iconElPadding = 0;
+                draggableObj.iconElBorder = 'none';
+                draggableObj.iconElLeftOffset = 0;
 
                 draggableObj.iconEl = $('<img />');
                 draggableObj.iconEl.attr(
@@ -173,6 +178,11 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                 // icon. All the existing code will work, and the user will
                 // see a label instead of an icon.
                 if (obj.label.length > 0) {
+                    draggableObj.iconElBGColor = 'yellow';
+                    draggableObj.iconElPadding = 8;
+                    draggableObj.iconElBorder = '1px solid black';
+                    draggableObj.iconElLeftOffset = 9;
+
                     draggableObj.iconEl = $(
                         '<div ' +
                             'style=" ' +
@@ -251,6 +261,18 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         draggableObj.containerEl.hide();
 
                         draggableObj.iconEl.detach();
+                            draggableObj.iconEl.css(
+                                'background-color', draggableObj.iconElBGColor
+                            );
+                            draggableObj.iconEl.css(
+                                'padding-left', draggableObj.iconElPadding
+                            );
+                            draggableObj.iconEl.css(
+                                'padding-right', draggableObj.iconElPadding
+                            );
+                            draggableObj.iconEl.css(
+                                'border', draggableObj.iconElBorder
+                            );
                         draggableObj.iconEl.css(
                             'width',
                             draggableObj.iconWidth
@@ -264,6 +286,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                             event.pageX -
                                 state.baseImageEl.offset().left -
                                 draggableObj.iconWidth * 0.5
+                                - draggableObj.iconElLeftOffset
                         );
                         draggableObj.iconEl.css(
                             'top',
@@ -277,11 +300,24 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
                         if (draggableObj.labelEl !== null) {
                             draggableObj.labelEl.detach();
+                            draggableObj.labelEl.css(
+                                'background-color', 'yellow'
+                            );
+                            draggableObj.labelEl.css(
+                                'padding-left', 8
+                            );
+                            draggableObj.labelEl.css(
+                                'padding-right', 8
+                            );
+                            draggableObj.labelEl.css(
+                                'border', '1px solid black'
+                            );
                             draggableObj.labelEl.css(
                                 'left',
                                 event.pageX -
                                     state.baseImageEl.offset().left -
                                     draggableObj.labelWidth * 0.5
+                                    - 9 // Account for padding, border.
                             );
                             draggableObj.labelEl.css(
                                 'top',
@@ -330,6 +366,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         event.pageX -
                             state.baseImageEl.offset().left -
                             draggableObj.iconWidth * 0.5
+                            - draggableObj.iconElLeftOffset
                     );
                     draggableObj.iconEl.css(
                         'top',
@@ -344,6 +381,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                             event.pageX -
                                 state.baseImageEl.offset().left -
                                 draggableObj.labelWidth * 0.5
+                                - 9 // Acoount for padding, border.
                         );
                         draggableObj.labelEl.css(
                             'top',
@@ -529,6 +567,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         'left',
                         target.offset.left + 0.5 * target.w -
                             draggableObj.iconWidth * 0.5 + offset
+                            - draggableObj.iconElLeftOffset
                     );
                     draggableObj.iconEl.css(
                         'top',
@@ -541,6 +580,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                             'left',
                             target.offset.left + 0.5 * target.w -
                                 draggableObj.labelWidth * 0.5 + offset
+                                - 9 // Acoount for padding, border.
                         );
                         draggableObj.labelEl.css(
                             'top',
@@ -587,7 +627,10 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                     draggableObj.containerEl.show();
 
                     draggableObj.iconEl.detach();
-
+                    draggableObj.iconEl.css('border', 'none');
+                    draggableObj.iconEl.css('background-color', 'transparent');
+                    draggableObj.iconEl.css('padding-left', 0);
+                    draggableObj.iconEl.css('padding-right', 0);
                     draggableObj.iconEl.css(
                         'width',
                         draggableObj.iconWidthSmall
@@ -596,12 +639,10 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         'height',
                         draggableObj.iconHeightSmall
                     );
-
                     draggableObj.iconEl.css(
                         'left',
                         50 - draggableObj.iconWidthSmall * 0.5
                     );
-
                     if (draggableObj.labelEl !== null) {
                         draggableObj.iconEl.css('top', 5);
                     } else {
@@ -615,6 +656,10 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
                     if (draggableObj.labelEl !== null) {
                         draggableObj.labelEl.detach();
+                        draggableObj.labelEl.css('border', 'none');
+                        draggableObj.labelEl.css('background-color', 'transparent');
+                        draggableObj.labelEl.css('padding-left', 0);
+                        draggableObj.labelEl.css('padding-right', 0);
                         draggableObj.labelEl.css(
                             'left',
                             50 - draggableObj.labelWidth * 0.5
diff --git a/common/static/js/capa/drag_and_drop/update_input.js b/common/static/js/capa/drag_and_drop/update_input.js
index 2c6a5ee364..eb965a3871 100644
--- a/common/static/js/capa/drag_and_drop/update_input.js
+++ b/common/static/js/capa/drag_and_drop/update_input.js
@@ -130,6 +130,18 @@ define(['logme'], function (logme) {
                                 draggable.containerEl.hide();
 
                                 draggable.iconEl.detach();
+                                draggable.iconEl.css(
+                                    'background-color', draggable.iconElBGColor
+                                );
+                                draggable.iconEl.css(
+                                    'padding-left', draggable.iconElPadding
+                                );
+                                draggable.iconEl.css(
+                                    'padding-right', draggable.iconElPadding
+                                );
+                                draggable.iconEl.css(
+                                    'border', draggable.iconElBorder
+                                );
                                 draggable.iconEl.css(
                                     'width',
                                     draggable.iconWidth
@@ -142,6 +154,7 @@ define(['logme'], function (logme) {
                                     'left',
                                     target.offset.left + 0.5 * target.w -
                                         draggable.iconWidth * 0.5 + offset
+                                        - draggable.iconElLeftOffset
                                 );
                                 draggable.iconEl.css(
                                     'top',
@@ -154,10 +167,23 @@ define(['logme'], function (logme) {
 
                                 if (draggable.labelEl !== null) {
                                     draggable.labelEl.detach();
+                                    draggable.labelEl.css(
+                                        'background-color', 'yellow'
+                                    );
+                                    draggable.labelEl.css(
+                                        'padding-left', 8
+                                    );
+                                    draggable.labelEl.css(
+                                        'padding-right', 8
+                                    );
+                                    draggable.labelEl.css(
+                                        'border', '1px solid black'
+                                    );
                                     draggable.labelEl.css(
                                         'left',
                                         target.offset.left + 0.5 * target.w -
                                             draggable.labelWidth * 0.5 + offset
+                                            - 9 // Account for padding, border.
                                     );
                                     draggable.labelEl.css(
                                         'top',
@@ -218,6 +244,18 @@ define(['logme'], function (logme) {
                                 draggable.containerEl.hide();
 
                                 draggable.iconEl.detach();
+                                draggable.iconEl.css(
+                                    'background-color', draggable.iconElBGColor
+                                );
+                                draggable.iconEl.css(
+                                    'padding-left', draggable.iconElPadding
+                                );
+                                draggable.iconEl.css(
+                                    'padding-right', draggable.iconElPadding
+                                );
+                                draggable.iconEl.css(
+                                    'border', draggable.iconElBorder
+                                );
                                 draggable.iconEl.css(
                                     'width',
                                     draggable.iconWidth
@@ -230,6 +268,7 @@ define(['logme'], function (logme) {
                                     'left',
                                     answer.draggables[c1][draggableId][0] -
                                         draggable.iconWidth * 0.5 + offset
+                                        - draggable.iconElLeftOffset
                                 );
                                 draggable.iconEl.css(
                                     'top',
@@ -242,10 +281,23 @@ define(['logme'], function (logme) {
 
                                 if (draggable.labelEl !== null) {
                                     draggable.labelEl.detach();
+                                    draggable.labelEl.css(
+                                        'background-color', 'yellow'
+                                    );
+                                    draggable.labelEl.css(
+                                        'padding-left', 8
+                                    );
+                                    draggable.labelEl.css(
+                                        'padding-right', 8
+                                    );
+                                    draggable.labelEl.css(
+                                        'border', '1px solid black'
+                                    );
                                     draggable.labelEl.css(
                                         'left',
                                         answer.draggables[c1][draggableId][0] -
                                             draggable.labelWidth * 0.5 + offset
+                                            - 9 // Account for padding, border.
                                     );
                                     draggable.labelEl.css(
                                         'top',

From 15ffc1f64fc0c13babe40b239dbc06b4101b3a6b Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Wed, 9 Jan 2013 12:04:09 +0200
Subject: [PATCH 496/541] New feature: added ability to define custom label
 background color. Upated demo to use this feature. Needs to be turned on
 Python side.

---
 common/static/js/capa/drag_and_drop/config_parser.js | 8 ++++++++
 common/static/js/capa/drag_and_drop/draggables.js    | 4 ++--
 common/static/js/capa/drag_and_drop/update_input.js  | 4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/config_parser.js b/common/static/js/capa/drag_and_drop/config_parser.js
index 2b58bc42f8..34346eb6f0 100644
--- a/common/static/js/capa/drag_and_drop/config_parser.js
+++ b/common/static/js/capa/drag_and_drop/config_parser.js
@@ -89,6 +89,14 @@ define(['logme'], function (logme) {
             returnStatus = false;
         }
 
+        state.config.labelBgColor = 'yellow';
+        if (typeof config.label_bg_color === 'string') {
+            state.config.labelBgColor = config.label_bg_color;
+        } else if (typeof config.label_bg_color !== 'undefined') {
+            logme('ERROR: Property config.label_bg_color is not of a supported type.');
+            returnStatus = false;
+        }
+
         if (state.config.targets.length === 0) {
             state.individualTargets = false;
         } else {
diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index 1aafa0591c..980afa2cf6 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -178,7 +178,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                 // icon. All the existing code will work, and the user will
                 // see a label instead of an icon.
                 if (obj.label.length > 0) {
-                    draggableObj.iconElBGColor = 'yellow';
+                    draggableObj.iconElBGColor = state.config.labelBgColor;
                     draggableObj.iconElPadding = 8;
                     draggableObj.iconElBorder = '1px solid black';
                     draggableObj.iconElLeftOffset = 9;
@@ -301,7 +301,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         if (draggableObj.labelEl !== null) {
                             draggableObj.labelEl.detach();
                             draggableObj.labelEl.css(
-                                'background-color', 'yellow'
+                                'background-color', state.config.labelBgColor
                             );
                             draggableObj.labelEl.css(
                                 'padding-left', 8
diff --git a/common/static/js/capa/drag_and_drop/update_input.js b/common/static/js/capa/drag_and_drop/update_input.js
index eb965a3871..486181c07c 100644
--- a/common/static/js/capa/drag_and_drop/update_input.js
+++ b/common/static/js/capa/drag_and_drop/update_input.js
@@ -168,7 +168,7 @@ define(['logme'], function (logme) {
                                 if (draggable.labelEl !== null) {
                                     draggable.labelEl.detach();
                                     draggable.labelEl.css(
-                                        'background-color', 'yellow'
+                                        'background-color', state.config.labelBgColor
                                     );
                                     draggable.labelEl.css(
                                         'padding-left', 8
@@ -282,7 +282,7 @@ define(['logme'], function (logme) {
                                 if (draggable.labelEl !== null) {
                                     draggable.labelEl.detach();
                                     draggable.labelEl.css(
-                                        'background-color', 'yellow'
+                                        'background-color', state.config.labelBgColor
                                     );
                                     draggable.labelEl.css(
                                         'padding-left', 8

From 6d7cfe08df426f165a1a3d5555d9ecec908d10e6 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Wed, 9 Jan 2013 13:57:00 +0200
Subject: [PATCH 497/541] Slight UI modification.

---
 .../js/capa/drag_and_drop/config_parser.js    |  2 +-
 .../js/capa/drag_and_drop/draggables.js       | 28 +++++++++++--------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/config_parser.js b/common/static/js/capa/drag_and_drop/config_parser.js
index 34346eb6f0..b87f618bf4 100644
--- a/common/static/js/capa/drag_and_drop/config_parser.js
+++ b/common/static/js/capa/drag_and_drop/config_parser.js
@@ -89,7 +89,7 @@ define(['logme'], function (logme) {
             returnStatus = false;
         }
 
-        state.config.labelBgColor = 'yellow';
+        state.config.labelBgColor = '#d6d6d6';
         if (typeof config.label_bg_color === 'string') {
             state.config.labelBgColor = config.label_bg_color;
         } else if (typeof config.label_bg_color !== 'undefined') {
diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index 980afa2cf6..7d12e0b4fa 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -144,6 +144,8 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                             '<div ' +
                                 'style=" ' +
                                     'position: absolute; ' +
+                                    'color: black; ' +
+                                    'font-size: 0.95em; ' +
                                 '" ' +
                             '>' +
                                 obj.label +
@@ -187,6 +189,8 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         '<div ' +
                             'style=" ' +
                                 'position: absolute; ' +
+                                'color: black; ' +
+                                'font-size: 0.95em; ' +
                             '" ' +
                         '>' +
                             obj.label +
@@ -261,18 +265,18 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         draggableObj.containerEl.hide();
 
                         draggableObj.iconEl.detach();
-                            draggableObj.iconEl.css(
-                                'background-color', draggableObj.iconElBGColor
-                            );
-                            draggableObj.iconEl.css(
-                                'padding-left', draggableObj.iconElPadding
-                            );
-                            draggableObj.iconEl.css(
-                                'padding-right', draggableObj.iconElPadding
-                            );
-                            draggableObj.iconEl.css(
-                                'border', draggableObj.iconElBorder
-                            );
+                        draggableObj.iconEl.css(
+                            'background-color', draggableObj.iconElBGColor
+                        );
+                        draggableObj.iconEl.css(
+                            'padding-left', draggableObj.iconElPadding
+                        );
+                        draggableObj.iconEl.css(
+                            'padding-right', draggableObj.iconElPadding
+                        );
+                        draggableObj.iconEl.css(
+                            'border', draggableObj.iconElBorder
+                        );
                         draggableObj.iconEl.css(
                             'width',
                             draggableObj.iconWidth

From c2dec3fb9d8d10c7e6db3b73ef2d31adca26a6fe Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 9 Jan 2013 14:03:03 +0200
Subject: [PATCH 498/541] label bg color

---
 common/lib/capa/capa/inputtypes.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index 4d2e2ed142..5a69f6de66 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -865,6 +865,11 @@ class DragAndDropInput(InputTypeBase):
         to_js['targets'] = [parse(target, 'target') for target in
                                                 self.xml.iterchildren('target')]
 
+        # custom background color for labels:
+        label_bg_color = Attribute('label_bg_color').parse_from_xml(self.xml)
+        if label_bg_color:
+            to_js['label_bg_color'] = label_bg_color
+
         self.loaded_attributes['drag_and_drop_json'] = json.dumps(to_js)
         self.to_render.add('drag_and_drop_json')
 

From f157702548ed3eeb1b10b463ccccbb6db9e91624 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 9 Jan 2013 14:06:23 +0200
Subject: [PATCH 499/541] fix

---
 common/lib/capa/capa/inputtypes.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index 5a69f6de66..cf5bee3b0b 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -866,7 +866,8 @@ class DragAndDropInput(InputTypeBase):
                                                 self.xml.iterchildren('target')]
 
         # custom background color for labels:
-        label_bg_color = Attribute('label_bg_color').parse_from_xml(self.xml)
+        label_bg_color = Attribute('label_bg_color',
+                                   default=None).parse_from_xml(self.xml)
         if label_bg_color:
             to_js['label_bg_color'] = label_bg_color
 

From 22014f7f58ca44d33efe143ecaded10c5732f1bb Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Wed, 9 Jan 2013 18:07:44 +0200
Subject: [PATCH 500/541] New feature: Clicking on number for multiple icons on
 target will cycle all icons on target. Fixed bug with z-order ordering.

---
 .../js/capa/drag_and_drop/draggables.js       | 136 ++++++++++++++++--
 .../static/js/capa/drag_and_drop/targets.js   | 110 +++++++++++++-
 .../js/capa/drag_and_drop/update_input.js     |   4 +
 3 files changed, 232 insertions(+), 18 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index 7d12e0b4fa..d95b0e706f 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -62,6 +62,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
             draggableObj = {
                 'zIndex': objIndex,
+                'oldZIndex': objIndex,
                 'labelEl': null,
                 'hasLoaded': false
             };
@@ -146,6 +147,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                                     'position: absolute; ' +
                                     'color: black; ' +
                                     'font-size: 0.95em; ' +
+                                    'z-index: ' + objIndex + '; ' +
                                 '" ' +
                             '>' +
                                 obj.label +
@@ -191,6 +193,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                                 'position: absolute; ' +
                                 'color: black; ' +
                                 'font-size: 0.95em; ' +
+                                'z-index: ' + objIndex + '; ' +
                             '" ' +
                         '>' +
                             obj.label +
@@ -341,6 +344,9 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                     draggableObj.oldZIndex = draggableObj.zIndex;
                     draggableObj.zIndex = 1000;
                     draggableObj.iconEl.css('z-index', '1000');
+                    if (draggableObj.labelEl !== null) {
+                        draggableObj.labelEl.css('z-index', '1000');
+                    }
 
                     mousePressed = true;
                     state.currentMovingDraggable = draggableObj;
@@ -468,6 +474,10 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                             }
                         }
 
+                        if (onTarget.numTextEl !== null) {
+                            onTarget.updateNumTextEl();
+                        }
+
                         onTarget = null;
                     }
                 }
@@ -551,6 +561,10 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                             target.draggable.push(draggableObj.id);
                         }
 
+                        if (target.numTextEl !== null) {
+                            target.updateNumTextEl();
+                        }
+
                         // Reposition the draggable so that it's center
                         // coincides with the center of the target.
                         snapToTarget(target);
@@ -605,23 +619,117 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                 // ordering of the visibility (z-index) of the other draggables
                 // will not change.
                 function correctZIndexes() {
-                    var c1;
+                    var draggablesInMe, c1, c2, highestZIndex;
 
-                    for (c1 = 0; c1 < state.draggables.length; c1++) {
-                        if (
-                            draggableObj.oldZIndex <
-                            state.draggables[c1].zIndex
-                        ) {
-                            state.draggables[c1].zIndex -= 1;
-                            state.draggables[c1].iconEl.css(
+                    if (state.individualTargets === true) {
+
+                        logme('In correctZIndexes.');
+
+                        if (onTarget.draggable.length > 0) {
+                            logme('onTarget.draggable.length > 0');
+
+                            draggablesInMe = [];
+
+                            for (c1 = 0; c1 < onTarget.draggable.length; c1 += 1) {
+                                for (c2 = 0; c2 < state.draggables.length; c2 += 1) {
+                                    if (
+                                        onTarget.draggable[c1] ===
+                                            state.draggables[c2].id
+                                    ) {
+                                        draggablesInMe.push(state.draggables[c2]);
+                                    }
+                                }
+                            }
+
+                            highestZIndex = -10000;
+
+                            for (c1 = 0; c1 < draggablesInMe.length; c1 += 1) {
+                                if (
+                                    (draggablesInMe[c1].zIndex > highestZIndex) &&
+                                        (draggablesInMe[c1].zIndex !== 1000)
+                                ) {
+                                    highestZIndex = draggablesInMe[c1].zIndex;
+                                }
+                            }
+
+                            if (highestZIndex === -10000) {
+                                highestZIndex = onTarget.draggable.length;
+                            } else if (highestZIndex < draggableObj.oldZIndex) {
+                                highestZIndex = draggableObj.oldZIndex;
+                            } else {
+                                for (c1 = 0; c1 < draggablesInMe.length; c1 += 1) {
+                                    logme('draggablesInMe[' + c1 + '].id = ' + draggablesInMe[c1].id);
+                                    logme('draggablesInMe[' + c1 + '].zIndex = ' + draggablesInMe[c1].zIndex);
+                                    logme('draggablesInMe[' + c1 + '].oldZIndex = ' + draggablesInMe[c1].oldZIndex);
+                                }
+
+                                logme('----------------');
+                                logme('highestZIndex = ' + highestZIndex);
+
+                                for (c1 = 0; c1 < draggablesInMe.length; c1 += 1) {
+                                    draggablesInMe[c1].zIndex -= 1;
+                                    draggablesInMe[c1].oldZIndex -= 1;
+
+                                    draggablesInMe[c1].iconEl.css(
+                                        'z-index',
+                                        draggablesInMe[c1].zIndex
+                                    );
+                                    if (draggablesInMe[c1].labelEl !== null) {
+                                        draggablesInMe[c1].labelEl.css(
+                                            'z-index',
+                                            draggablesInMe[c1].zIndex
+                                        );
+                                    }
+                                }
+                            }
+                        } else {
+                            logme('highestZIndex = onTarget.draggable.length');
+                            highestZIndex = onTarget.draggable.length;
+                        }
+
+                        draggableObj.zIndex = highestZIndex;
+                        draggableObj.oldZIndex = highestZIndex;
+
+                        draggableObj.iconEl.css(
+                            'z-index',
+                            draggableObj.zIndex
+                        );
+                        if (draggableObj.labelEl !== null) {
+                            draggableObj.labelEl.css(
                                 'z-index',
-                                state.draggables[c1].zIndex
+                                draggableObj.zIndex
                             );
                         }
-                    }
+                    } else {
+                        for (c1 = 0; c1 < state.draggables.length; c1++) {
+                            if (
+                                draggableObj.oldZIndex <
+                                    state.draggables[c1].zIndex
+                            ) {
+                                state.draggables[c1].zIndex -= 1;
+                                state.draggables[c1].oldZIndex = state.draggables[c1].zIndex;
+                                state.draggables[c1].iconEl.css(
+                                    'z-index',
+                                    state.draggables[c1].zIndex
+                                );
 
-                    draggableObj.zIndex = c1;
-                    draggableObj.iconEl.css('z-index', c1);
+                                if (state.draggables[c1].labelEl !== null) {
+                                    state.draggables[c1].labelEl.css(
+                                        'z-index',
+                                        state.draggables[c1].zIndex
+                                    );
+                                }
+                            }
+                        }
+
+                        draggableObj.zIndex = c1;
+                        draggableObj.oldZIndex = c1;
+                        draggableObj.iconEl.css('z-index', c1);
+
+                        if (draggableObj.labelEl !== null) {
+                            draggableObj.labelEl.css('z-index', c1);
+                        }
+                    }
                 }
 
                 // If a draggable was released in a wrong positione, we will
@@ -630,11 +738,14 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                 function moveBackToSlider() {
                     draggableObj.containerEl.show();
 
+                    draggableObj.zIndex = draggableObj.oldZIndex;
+
                     draggableObj.iconEl.detach();
                     draggableObj.iconEl.css('border', 'none');
                     draggableObj.iconEl.css('background-color', 'transparent');
                     draggableObj.iconEl.css('padding-left', 0);
                     draggableObj.iconEl.css('padding-right', 0);
+                    draggableObj.iconEl.css('z-index', draggableObj.zIndex);
                     draggableObj.iconEl.css(
                         'width',
                         draggableObj.iconWidthSmall
@@ -664,6 +775,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         draggableObj.labelEl.css('background-color', 'transparent');
                         draggableObj.labelEl.css('padding-left', 0);
                         draggableObj.labelEl.css('padding-right', 0);
+                        draggableObj.labelEl.css('z-index', draggableObj.zIndex);
                         draggableObj.labelEl.css(
                             'left',
                             50 - draggableObj.labelWidth * 0.5
diff --git a/common/static/js/capa/drag_and_drop/targets.js b/common/static/js/capa/drag_and_drop/targets.js
index fdd6678269..0bc246e49f 100644
--- a/common/static/js/capa/drag_and_drop/targets.js
+++ b/common/static/js/capa/drag_and_drop/targets.js
@@ -19,7 +19,7 @@ define(['logme'], function (logme) {
         return;
 
         function processTarget(obj) {
-            var targetEl, borderCss;
+            var targetEl, borderCss, numTextEl, targetObj;
 
             borderCss = '';
             if (state.config.targetOutline === true) {
@@ -40,14 +40,36 @@ define(['logme'], function (logme) {
                     'data-target-id="' + obj.id + '" ' +
                 '></div>'
             );
-
             targetEl.appendTo(state.baseImageEl.parent());
-
             targetEl.mousedown(function (event) {
                 event.preventDefault();
             });
 
-            state.targets.push({
+            if (state.config.one_per_target === false) {
+                numTextEl = $(
+                    '<div ' +
+                        'style=" ' +
+                            'display: block; ' +
+                            'position: absolute; ' +
+                            'width: 24px; ' +
+                            'height: 24px; ' +
+                            'top: ' + obj.y + 'px; ' +
+                            'left: ' + (obj.x + obj.w - 24) + 'px; ' +
+                            'border: 1px solid black; ' +
+                            'text-align: center; ' +
+                            'z-index: 500; ' +
+                            'background-color: white; ' +
+                            'font-size: 0.95em; ' +
+                            'color: #009fe2; ' +
+                            'cursor: pointer; ' +
+                        '" ' +
+                    '>0</div>'
+                );
+            } else {
+                numTextEl = null;
+            }
+
+            targetObj = {
                 'id': obj.id,
 
                 'w': obj.w,
@@ -56,9 +78,85 @@ define(['logme'], function (logme) {
                 'el': targetEl,
                 'offset': targetEl.position(),
 
-                'draggable': []
-            });
+                'draggable': [],
+
+                'targetEl': targetEl,
+
+                'numTextEl': numTextEl,
+                'updateNumTextEl': updateNumTextEl
+            };
+
+            if (state.config.one_per_target === false) {
+                numTextEl.appendTo(state.baseImageEl.parent());
+                numTextEl.mousedown(function (event) {
+                    event.preventDefault();
+                });
+                numTextEl.mouseup(function () {
+                    cycleDraggableOrder.call(targetObj)
+                });
+            }
+
+            state.targets.push(targetObj);
         }
+
+        function cycleDraggableOrder() {
+            var draggablesInMe, c1, c2, lowestZIndex, highestZIndex;
+
+            if (this.draggable.length === 0) {
+                return 0;
+            }
+
+            draggablesInMe = [];
+
+            for (c1 = 0; c1 < this.draggable.length; c1 += 1) {
+                for (c2 = 0; c2 < state.draggables.length; c2 += 1) {
+                    if (this.draggable[c1] === state.draggables[c2].id) {
+                        draggablesInMe.push(state.draggables[c2]);
+                    }
+                }
+            }
+
+            highestZIndex = -10000;
+            lowestZIndex = 10000;
+
+            for (c1 = 0; c1 < draggablesInMe.length; c1 += 1) {
+                logme(
+                    'draggablesInMe[' + c1 + '].id = ' + draggablesInMe[c1].id,
+                    'draggablesInMe[' + c1 + '].zIndex = ' + draggablesInMe[c1].zIndex,
+                    'draggablesInMe[' + c1 + '].oldZIndex = ' + draggablesInMe[c1].oldZIndex
+                );
+            }
+            logme('------------------');
+
+            for (c1 = 0; c1 < draggablesInMe.length; c1 += 1) {
+                if (draggablesInMe[c1].zIndex < lowestZIndex) {
+                    lowestZIndex = draggablesInMe[c1].zIndex;
+                }
+
+                if (draggablesInMe[c1].zIndex > highestZIndex) {
+                    highestZIndex = draggablesInMe[c1].zIndex;
+                }
+            }
+
+            for (c1 = 0; c1 < draggablesInMe.length; c1 += 1) {
+                if (draggablesInMe[c1].zIndex === lowestZIndex) {
+                    draggablesInMe[c1].zIndex = highestZIndex;
+                    draggablesInMe[c1].oldZIndex = highestZIndex;
+                } else {
+                    draggablesInMe[c1].zIndex -= 1;
+                    draggablesInMe[c1].oldZIndex -= 1;
+                }
+
+                draggablesInMe[c1].iconEl.css('z-index', draggablesInMe[c1].zIndex);
+                if (draggablesInMe[c1].labelEl !== null) {
+                    draggablesInMe[c1].labelEl.css('z-index', draggablesInMe[c1].zIndex);
+                }
+            }
+        }
+    } // function Targets(state) {
+
+    function updateNumTextEl() {
+        this.numTextEl.html(this.draggable.length);
     }
 });
 
diff --git a/common/static/js/capa/drag_and_drop/update_input.js b/common/static/js/capa/drag_and_drop/update_input.js
index 486181c07c..3b5053d5d2 100644
--- a/common/static/js/capa/drag_and_drop/update_input.js
+++ b/common/static/js/capa/drag_and_drop/update_input.js
@@ -199,6 +199,10 @@ define(['logme'], function (logme) {
                                 draggable.setOnTarget(target);
                                 target.draggable.push(draggableId);
 
+                                if (target.numTextEl !== null) {
+                                    target.updateNumTextEl();
+                                }
+
                                 state.numDraggablesInSlider -= 1;
                                 state.updateArrowOpacity();
                             }

From 63b79f76d7b55cb00c5b71f4c1053ef6108d1b54 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Tue, 15 Jan 2013 13:31:16 +0200
Subject: [PATCH 501/541] added can_reuse

---
 common/lib/capa/capa/inputtypes.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index cf5bee3b0b..919c4a3eec 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -810,9 +810,8 @@ class DragAndDropInput(InputTypeBase):
 
                     tag_type: 'draggable' or 'target'.
 
-                    If tag_type is 'draggable' : all attributes (name or label or
-                    icon) are optional, but at least one attribute must be
-                    presented.
+                    If tag_type is 'draggable' : all attributes except id
+                    (name or label or icon or can_reuse) are optional
 
                     If tag_type is 'target' all attributes (name, x, y, w, h)
                     are required. (x, y) - coordinates of center of target,
@@ -820,11 +819,13 @@ class DragAndDropInput(InputTypeBase):
 
                 Returns:
                     Dictionary of vaues of attributes:
-                    dict{'name': smth, 'label': smth, 'icon': smth}.
+                    dict{'name': smth, 'label': smth, 'icon': smth,
+                    'can_reuse': smth}.
             """
             tag_attrs = dict()
             tag_attrs['draggable'] = {'id': Attribute._sentinel,
-                                      'label': "", 'icon': ""}
+                                      'label': "", 'icon': "",
+                                      'can_reuse': ""}
 
             tag_attrs['target'] = {'id': Attribute._sentinel,
                                     'x': Attribute._sentinel,

From 0349e157b5e552cd8b4babc17846daee68c2ff99 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Tue, 15 Jan 2013 15:52:14 +0200
Subject: [PATCH 502/541] renamed graders to verifiers

---
 common/lib/capa/capa/capa_problem.py                       | 6 +++---
 common/lib/capa/capa/{graders => verifiers}/__init__.py    | 0
 common/lib/capa/capa/{graders => verifiers}/draganddrop.py | 0
 common/lib/capa/capa/{graders => verifiers}/tests.py       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename common/lib/capa/capa/{graders => verifiers}/__init__.py (100%)
 rename common/lib/capa/capa/{graders => verifiers}/draganddrop.py (100%)
 rename common/lib/capa/capa/{graders => verifiers}/tests.py (99%)

diff --git a/common/lib/capa/capa/capa_problem.py b/common/lib/capa/capa/capa_problem.py
index 96a334ef97..4b0faa91a1 100644
--- a/common/lib/capa/capa/capa_problem.py
+++ b/common/lib/capa/capa/capa_problem.py
@@ -34,8 +34,8 @@ import chem
 import chem.chemcalc
 import chem.chemtools
 import chem.miller
-import graders
-import graders.draganddrop
+import verifiers
+import verifiers.draganddrop
 
 import calc
 from correctmap import CorrectMap
@@ -72,7 +72,7 @@ global_context = {'random': random,
                   'chemcalc': chem.chemcalc,
                   'chemtools': chem.chemtools,
                   'miller': chem.miller,
-                  'draganddrop': graders.draganddrop}
+                  'draganddrop': verifiers.draganddrop}
 
 # These should be removed from HTML output, including all subelements
 html_problem_semantics = ["codeparam", "responseparam", "answer", "script", "hintgroup", "openendedparam","openendedrubric"]
diff --git a/common/lib/capa/capa/graders/__init__.py b/common/lib/capa/capa/verifiers/__init__.py
similarity index 100%
rename from common/lib/capa/capa/graders/__init__.py
rename to common/lib/capa/capa/verifiers/__init__.py
diff --git a/common/lib/capa/capa/graders/draganddrop.py b/common/lib/capa/capa/verifiers/draganddrop.py
similarity index 100%
rename from common/lib/capa/capa/graders/draganddrop.py
rename to common/lib/capa/capa/verifiers/draganddrop.py
diff --git a/common/lib/capa/capa/graders/tests.py b/common/lib/capa/capa/verifiers/tests.py
similarity index 99%
rename from common/lib/capa/capa/graders/tests.py
rename to common/lib/capa/capa/verifiers/tests.py
index 90a8a9a98a..ddcaad511d 100644
--- a/common/lib/capa/capa/graders/tests.py
+++ b/common/lib/capa/capa/verifiers/tests.py
@@ -68,7 +68,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
         user_input = '{"use_targets": true, "draggables": [{"1": [10,10]}, \
          {"name_with_icon": [[10,10],4]}]}'
         correct_answer = {'1':  [10, 10], 'name_with_icon': [[10, 10], 4]}
-        self.assertTrue(draganddrop.grade(user_input, correct_answer))
+        self.assertFalse(draganddrop.grade(user_input, correct_answer))
 
     def test_position_and_targets(self):
         user_input = '{"use_targets": false, \

From e2bbaf08b9346abab205f0c0eb0b5106d48c1fc9 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Tue, 15 Jan 2013 16:31:45 +0200
Subject: [PATCH 503/541] removed use_targets flag

---
 common/lib/capa/capa/verifiers/draganddrop.py | 20 ++++-------
 common/lib/capa/capa/verifiers/tests.py       | 35 +++++++++----------
 2 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/common/lib/capa/capa/verifiers/draganddrop.py b/common/lib/capa/capa/verifiers/draganddrop.py
index 431b5d249c..44e50828f5 100644
--- a/common/lib/capa/capa/verifiers/draganddrop.py
+++ b/common/lib/capa/capa/verifiers/draganddrop.py
@@ -1,11 +1,10 @@
 """ Grader of drag and drop input.
 
 Client side behavior: user can drag and drop images from list on base image.
-Parameter 'use_targets' in xml can control two use cases.
 
-if use_targets is true (defaut), then json returned from client is:
+
+ Then json returned from client is:
  {
-    "use_targets": true,
     "draggable": [
         { "image1": "t1"  },
         { "ant": "t2"  },
@@ -14,9 +13,8 @@ if use_targets is true (defaut), then json returned from client is:
 }
 values are target names.
 
-If use_targets is false:
+or:
  {
-    "use_targets": false,
     "draggable": [
         { "image1": "[10, 20]"  },
         { "ant": "[30, 40]"  },
@@ -112,11 +110,8 @@ class DragAndDrop(object):
     def grade(self):
         ''' Grader user answer.
 
-        If use_targets is True - checks if every draggable isplaced on proper
-         target.
-
-        If use_targets is False - checks if every draggable is placed on proper
-         coordinates within radius of forgiveness (default is 10).
+        Checks if every draggable isplaced on proper target or  on proper
+        coordinates within radius of forgiveness (default is 10).
 
         Returns: bool.
         '''
@@ -260,7 +255,6 @@ class DragAndDrop(object):
             correct_answer = tmp
 
         user_answer = json.loads(user_answer)
-        self.use_targets = user_answer.get('use_targets')
 
         # check if we have draggables that are not in correct answer:
         self.excess_draggables = {}
@@ -295,12 +289,12 @@ def grade(user_input, correct_answer):
         Args:
             user_input: json. Format::
 
-                {"use_targets": false, "draggables":
+                { "draggables":
                 [{"1": [10, 10]}, {"name_with_icon": [20, 20]}]}'
 
                 or
 
-                {"use_targets": true, "draggables": [{"1": "t1"}, \
+                {"draggables": [{"1": "t1"}, \
                 {"name_with_icon": "t2"}]}
 
             correct_answer: dict or list.
diff --git a/common/lib/capa/capa/verifiers/tests.py b/common/lib/capa/capa/verifiers/tests.py
index ddcaad511d..c744734995 100644
--- a/common/lib/capa/capa/verifiers/tests.py
+++ b/common/lib/capa/capa/verifiers/tests.py
@@ -41,73 +41,72 @@ class Test_PositionsCompare(unittest.TestCase):
 class Test_DragAndDrop_Grade(unittest.TestCase):
 
     def test_targets_true(self):
-        user_input = '{"use_targets": true, "draggables": [{"1": "t1"}, \
+        user_input = '{"draggables": [{"1": "t1"}, \
          {"name_with_icon": "t2"}]}'
         correct_answer = {'1':              't1', 'name_with_icon': 't2'}
         self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
     def test_targets_false(self):
-        user_input = '{"use_targets": true, "draggables": [{"1": "t1"}, \
+        user_input = '{"draggables": [{"1": "t1"}, \
         {"name_with_icon": "t2"}]}'
         correct_answer = {'1':              't3', 'name_with_icon': 't2'}
         self.assertFalse(draganddrop.grade(user_input, correct_answer))
 
     def test_multiple_images_per_target_true(self):
-        user_input = '{"use_targets": true, \
+        user_input = '{\
         "draggables": [{"1": "t1"}, {"name_with_icon": "t1"}]}'
         correct_answer = {'1':              't1', 'name_with_icon': 't1'}
         self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
     def test_multiple_images_per_target_false(self):
-        user_input = '{"use_targets": true, \
+        user_input = '{\
         "draggables": [{"1": "t1"}, {"name_with_icon": "t1"}]}'
         correct_answer = {'1':              't2', 'name_with_icon': 't1'}
         self.assertFalse(draganddrop.grade(user_input, correct_answer))
 
     def test_targets_and_positions(self):
-        user_input = '{"use_targets": true, "draggables": [{"1": [10,10]}, \
+        user_input = '{"draggables": [{"1": [10,10]}, \
          {"name_with_icon": [[10,10],4]}]}'
         correct_answer = {'1':  [10, 10], 'name_with_icon': [[10, 10], 4]}
         self.assertFalse(draganddrop.grade(user_input, correct_answer))
 
     def test_position_and_targets(self):
-        user_input = '{"use_targets": false, \
-        "draggables": [{"1": "t1"}, {"name_with_icon": "t2"}]}'
+        user_input = '{"draggables": [{"1": "t1"}, {"name_with_icon": "t2"}]}'
         correct_answer = {'1':    't1', 'name_with_icon': 't2'}
         self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
     def test_positions_exact(self):
-        user_input = '{"use_targets": false, "draggables": \
+        user_input = '{"draggables": \
         [{"1": [10, 10]}, {"name_with_icon": [20, 20]}]}'
         correct_answer = {'1':   [10, 10], 'name_with_icon': [20, 20]}
         self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
     def test_positions_false(self):
-        user_input = '{"use_targets": false, "draggables": \
+        user_input = '{"draggables": \
         [{"1": [10, 10]}, {"name_with_icon": [20, 20]}]}'
         correct_answer = {'1':   [25, 25], 'name_with_icon': [20, 20]}
         self.assertFalse(draganddrop.grade(user_input, correct_answer))
 
     def test_positions_true_in_radius(self):
-        user_input = '{"use_targets": false, "draggables": \
+        user_input = '{"draggables": \
         [{"1": [10, 10]}, {"name_with_icon": [20, 20]}]}'
         correct_answer = {'1':   [14, 14], 'name_with_icon': [20, 20]}
         self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
     def test_positions_true_in_manual_radius(self):
-        user_input = '{"use_targets": false, "draggables": \
+        user_input = '{"draggables": \
         [{"1": [10, 10]}, {"name_with_icon": [20, 20]}]}'
         correct_answer = {'1':   [[40, 10], 30], 'name_with_icon': [20, 20]}
         self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
     def test_positions_false_in_manual_radius(self):
-        user_input = '{"use_targets": false, "draggables": \
+        user_input = '{"draggables": \
         [{"1": [10, 10]}, {"name_with_icon": [20, 20]}]}'
         correct_answer = {'1': [[40, 10], 29], 'name_with_icon': [20, 20]}
         self.assertFalse(draganddrop.grade(user_input, correct_answer))
 
     def test_correct_answer_not_has_key_from_user_answer(self):
-        user_input = '{"use_targets": true, "draggables": [{"1": "t1"}, \
+        user_input = '{"draggables": [{"1": "t1"}, \
         {"name_with_icon": "t2"}]}'
         correct_answer = {'3':   't3', 'name_with_icon': 't2'}
         self.assertFalse(draganddrop.grade(user_input, correct_answer))
@@ -116,14 +115,14 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
         """Draggables can be places anywhere on base image.
             Place grass in the middle of the image and ant in the
             right upper corner."""
-        user_input = '{"use_targets": false, "draggables": \
+        user_input = '{"draggables": \
         [{"ant":[610.5,57.449951171875]},{"grass":[322.5,199.449951171875]}]}'
         correct_answer = {'grass':     [[300, 200], 200], 'ant': [[500, 0], 200]}
         self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
     def test_lcao_correct(self):
         """Describe carbon molecule in LCAO-MO"""
-        user_input = '{"use_targets":true,"draggables":[{"1":"s_left"}, \
+        user_input = '{"draggables":[{"1":"s_left"}, \
         {"5":"s_right"},{"4":"s_sigma"},{"6":"s_sigma_star"},{"7":"p_left_1"}, \
         {"8":"p_left_2"},{"10":"p_right_1"},{"9":"p_right_2"}, \
         {"2":"p_pi_1"},{"3":"p_pi_2"},{"11":"s_sigma_name"}, \
@@ -162,7 +161,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
 
     def test_lcao_extra_element_incorrect(self):
         """Describe carbon molecule in LCAO-MO"""
-        user_input = '{"use_targets":true,"draggables":[{"1":"s_left"}, \
+        user_input = '{"draggables":[{"1":"s_left"}, \
         {"5":"s_right"},{"4":"s_sigma"},{"6":"s_sigma_star"},{"7":"p_left_1"}, \
         {"8":"p_left_2"},{"17":"p_left_3"},{"10":"p_right_1"},{"9":"p_right_2"}, \
         {"2":"p_pi_1"},{"3":"p_pi_2"},{"11":"s_sigma_name"}, \
@@ -177,7 +176,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
             'rule': 'anyof'
         }, {
             'draggables': ['7', '8', '9', '10'],
-            'targets': ['p_left_1', 'p_left_2', 'p_right_1','p_right_2'],
+            'targets': ['p_left_1', 'p_left_2', 'p_right_1', 'p_right_2'],
             'rule': 'anyof'
         }, {
             'draggables': ['11', '12'],
@@ -205,7 +204,7 @@ class Test_DragAndDrop_Populate(unittest.TestCase):
     def test_1(self):
         dnd = draganddrop.DragAndDrop()
         correct_answer = {'1': [[40, 10], 29], 'name_with_icon': [20, 20]}
-        user_input = '{"use_targets": false, "draggables": \
+        user_input = '{"draggables": \
         [{"1": [10, 10]}, {"name_with_icon": [20, 20]}]}'
         dnd.populate(correct_answer, user_input)
 

From ead346ee5ff2fed0fdce639784ec77bc6bbacb78 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Tue, 15 Jan 2013 17:55:43 +0200
Subject: [PATCH 504/541] Refactoring. New feature: adding multiple draggables
 from one.

---
 .../js/capa/drag_and_drop/draggables.js       | 1491 +++++++++--------
 common/static/js/capa/drag_and_drop/main.js   |    4 +-
 .../static/js/capa/drag_and_drop/targets.js   |    9 -
 .../js/capa/drag_and_drop/update_input.js     |    8 +-
 4 files changed, 760 insertions(+), 752 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index d95b0e706f..5065e7193b 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -5,189 +5,170 @@
 (function (requirejs, require, define) {
 
 define(['logme', 'update_input'], function (logme, updateInput) {
-    return Draggables;
+    return {
+        'init': init
+    };
 
-    function Draggables(state) {
-        var c1;
+    function init(state) {
+        logme('Draggables.init; state = ', state);
 
         state.draggables = [];
         state.numDraggablesInSlider = 0;
-
-        for (c1 = 0; c1 < state.config.draggables.length; c1 += 1) {
-            processDraggable(state.config.draggables[c1], c1 + 1);
-        }
-
-        state.updateArrowOpacity();
         state.currentMovingDraggable = null;
 
+        (function (c1) {
+            while (c1 < state.config.draggables.length) {
+                processDraggable(state, state.config.draggables[c1], c1 + 1);
+                c1 += 1
+            }
+        }(0));
+
+        state.updateArrowOpacity();
+
         $(document).mousemove(function (event) {
-            if (state.currentMovingDraggable !== null) {
-                state.currentMovingDraggable.iconEl.css(
+            documentMouseMove(state, event);
+        });
+    }
+
+    function documentMouseMove(state, event) {
+        if (state.currentMovingDraggable !== null) {
+            state.currentMovingDraggable.iconEl.css(
+                'left',
+                event.pageX -
+                    state.baseImageEl.offset().left -
+                    state.currentMovingDraggable.iconWidth * 0.5
+                    - state.currentMovingDraggable.iconElLeftOffset
+            );
+            state.currentMovingDraggable.iconEl.css(
+                'top',
+                event.pageY -
+                    state.baseImageEl.offset().top -
+                    state.currentMovingDraggable.iconHeight * 0.5
+            );
+
+            if (state.currentMovingDraggable.labelEl !== null) {
+                state.currentMovingDraggable.labelEl.css(
                     'left',
                     event.pageX -
                         state.baseImageEl.offset().left -
-                        state.currentMovingDraggable.iconWidth * 0.5
-                        - state.currentMovingDraggable.iconElLeftOffset
+                        state.currentMovingDraggable.labelWidth * 0.5
+                        - 9 // Account for padding, border.
                 );
-                state.currentMovingDraggable.iconEl.css(
+                state.currentMovingDraggable.labelEl.css(
                     'top',
                     event.pageY -
-                        state.baseImageEl.offset().top -
-                        state.currentMovingDraggable.iconHeight * 0.5
+                        state.baseImageEl.offset().top +
+                        state.currentMovingDraggable.iconHeight * 0.5 +
+                        5
+                );
+            }
+        }
+    }
+
+    function processDraggable(state, obj, objIndex) {
+        var draggableObj;
+
+        logme('processDraggable; state = ', state);
+
+        logme('Processing draggable #' + objIndex);
+
+        draggableObj = {
+            'zIndex': objIndex,
+            'oldZIndex': objIndex,
+            'labelEl': null,
+            'hasLoaded': false,
+            'inContainer': true,
+            'mousePressed': false,
+            'onTarget': null,
+
+            'state': state,
+
+            'mouseDown': mouseDown,
+            'mouseUp': mouseUp,
+            'mouseMove': mouseMove,
+            'checkLandingElement': checkLandingElement,
+            'removeObjIdFromTarget': removeObjIdFromTarget,
+            'checkIfOnTarget': checkIfOnTarget,
+            'snapToTarget': snapToTarget,
+            'correctZIndexes': correctZIndexes,
+            'moveBackToSlider': moveBackToSlider
+        };
+
+        draggableObj.containerEl = $(
+            '<div ' +
+                'style=" ' +
+                    'width: 100px; ' +
+                    'height: 100px; ' +
+                    'display: inline; ' +
+                    'float: left; ' +
+                    'overflow: hidden; ' +
+                    'z-index: ' + objIndex + '; ' +
+                    'border-left: 1px solid #CCC; ' +
+                    'border-right: 1px solid #CCC; ' +
+                    'text-align: center; ' +
+                    'position: relative; ' +
+                '" ' +
+                '></div>'
+        );
+
+        draggableObj.containerEl.appendTo(state.sliderEl);
+
+        if (obj.icon.length > 0) {
+            draggableObj.iconElBGColor = 'transparent';
+            draggableObj.iconElPadding = 0;
+            draggableObj.iconElBorder = 'none';
+            draggableObj.iconElLeftOffset = 0;
+
+            draggableObj.iconEl = $('<img />');
+            draggableObj.iconEl.attr(
+                'src',
+                obj.icon
+            );
+            draggableObj.iconEl.load(function () {
+                draggableObj.iconWidth = this.width;
+                draggableObj.iconHeight = this.height;
+
+                if (draggableObj.iconWidth >= draggableObj.iconHeight) {
+                    draggableObj.iconWidthSmall = 60;
+                    draggableObj.iconHeightSmall =
+                        draggableObj.iconWidthSmall *
+                        (draggableObj.iconHeight / draggableObj.iconWidth);
+                } else {
+                    draggableObj.iconHeightSmall = 60;
+                    draggableObj.iconWidthSmall =
+                        draggableObj.iconHeightSmall *
+                        (draggableObj.iconWidth / draggableObj.iconHeight);
+                }
+
+                draggableObj.iconEl.css('position', 'absolute');
+
+                draggableObj.iconEl.css(
+                    'width',
+                    draggableObj.iconWidthSmall
+                );
+                draggableObj.iconEl.css(
+                    'height',
+                    draggableObj.iconHeightSmall
                 );
 
-                if (state.currentMovingDraggable.labelEl !== null) {
-                    state.currentMovingDraggable.labelEl.css(
-                        'left',
-                        event.pageX -
-                            state.baseImageEl.offset().left -
-                            state.currentMovingDraggable.labelWidth * 0.5
-                            - 9 // Account for padding, border.
-                    );
-                    state.currentMovingDraggable.labelEl.css(
+                draggableObj.iconEl.css(
+                    'left',
+                    50 - draggableObj.iconWidthSmall * 0.5
+                );
+
+                if (obj.label.length > 0) {
+                    draggableObj.iconEl.css('top', 5);
+                } else {
+                    draggableObj.iconEl.css(
                         'top',
-                        event.pageY -
-                            state.baseImageEl.offset().top +
-                            state.currentMovingDraggable.iconHeight * 0.5 +
-                            5
+                        50 - draggableObj.iconHeightSmall * 0.5
                     );
                 }
-            }
-        });
 
-        return;
+                draggableObj.iconEl.appendTo(draggableObj.containerEl);
 
-        function processDraggable(obj, objIndex) {
-            var inContainer, mousePressed, onTarget, draggableObj;
-
-            draggableObj = {
-                'zIndex': objIndex,
-                'oldZIndex': objIndex,
-                'labelEl': null,
-                'hasLoaded': false
-            };
-
-            draggableObj.containerEl = $(
-                '<div ' +
-                    'style=" ' +
-                        'width: 100px; ' +
-                        'height: 100px; ' +
-                        'display: inline; ' +
-                        'float: left; ' +
-                        'overflow: hidden; ' +
-                        'z-index: ' + objIndex + '; ' +
-                        'border-left: 1px solid #CCC; ' +
-                        'border-right: 1px solid #CCC; ' +
-                        'text-align: center; ' +
-                        'position: relative; ' +
-                    '" ' +
-                    '></div>'
-            );
-
-            draggableObj.containerEl.appendTo(state.sliderEl);
-
-            if (obj.icon.length > 0) {
-                draggableObj.iconElBGColor = 'transparent';
-                draggableObj.iconElPadding = 0;
-                draggableObj.iconElBorder = 'none';
-                draggableObj.iconElLeftOffset = 0;
-
-                draggableObj.iconEl = $('<img />');
-                draggableObj.iconEl.attr(
-                    'src',
-                    obj.icon
-                );
-                draggableObj.iconEl.load(function () {
-                    draggableObj.iconWidth = this.width;
-                    draggableObj.iconHeight = this.height;
-
-                    if (draggableObj.iconWidth >= draggableObj.iconHeight) {
-                        draggableObj.iconWidthSmall = 60;
-                        draggableObj.iconHeightSmall =
-                            draggableObj.iconWidthSmall *
-                            (draggableObj.iconHeight / draggableObj.iconWidth);
-                    } else {
-                        draggableObj.iconHeightSmall = 60;
-                        draggableObj.iconWidthSmall =
-                            draggableObj.iconHeightSmall *
-                            (draggableObj.iconWidth / draggableObj.iconHeight);
-                    }
-
-                    draggableObj.iconEl.css('position', 'absolute');
-
-                    draggableObj.iconEl.css(
-                        'width',
-                        draggableObj.iconWidthSmall
-                    );
-                    draggableObj.iconEl.css(
-                        'height',
-                        draggableObj.iconHeightSmall
-                    );
-
-                    draggableObj.iconEl.css(
-                        'left',
-                        50 - draggableObj.iconWidthSmall * 0.5
-                    );
-
-                    if (obj.label.length > 0) {
-                        draggableObj.iconEl.css('top', 5);
-                    } else {
-                        draggableObj.iconEl.css(
-                            'top',
-                            50 - draggableObj.iconHeightSmall * 0.5
-                        );
-                    }
-
-                    draggableObj.iconEl.appendTo(draggableObj.containerEl);
-
-                    if (obj.label.length > 0) {
-                        draggableObj.labelEl = $(
-                            '<div ' +
-                                'style=" ' +
-                                    'position: absolute; ' +
-                                    'color: black; ' +
-                                    'font-size: 0.95em; ' +
-                                    'z-index: ' + objIndex + '; ' +
-                                '" ' +
-                            '>' +
-                                obj.label +
-                            '</div>'
-                        );
-
-                        draggableObj.labelEl.appendTo(
-                            draggableObj.containerEl
-                        );
-
-                        draggableObj.labelWidth = draggableObj.labelEl.width();
-
-                        draggableObj.labelEl.css(
-                            'left',
-                            50 - draggableObj.labelWidth * 0.5
-                        );
-                        draggableObj.labelEl.css(
-                            'top',
-                            5 + draggableObj.iconHeightSmall + 5
-                        );
-
-                        draggableObj.labelEl.mousedown(mouseDown);
-                        draggableObj.labelEl.mouseup(mouseUp);
-                        draggableObj.labelEl.mousemove(mouseMove);
-                    }
-
-                    draggableObj.hasLoaded = true;
-                });
-            } else {
-                // To make life easier, if there is no icon, but there is a
-                // label, we will create a label and store it as if it was an
-                // icon. All the existing code will work, and the user will
-                // see a label instead of an icon.
                 if (obj.label.length > 0) {
-                    draggableObj.iconElBGColor = state.config.labelBgColor;
-                    draggableObj.iconElPadding = 8;
-                    draggableObj.iconElBorder = '1px solid black';
-                    draggableObj.iconElLeftOffset = 9;
-
-                    draggableObj.iconEl = $(
+                    draggableObj.labelEl = $(
                         '<div ' +
                             'style=" ' +
                                 'position: absolute; ' +
@@ -200,599 +181,631 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         '</div>'
                     );
 
-                    draggableObj.iconEl.appendTo(draggableObj.containerEl);
+                    draggableObj.labelEl.appendTo(
+                        draggableObj.containerEl
+                    );
 
-                    draggableObj.iconWidth = draggableObj.iconEl.width();
-                    draggableObj.iconHeight = draggableObj.iconEl.height();
-                    draggableObj.iconWidthSmall = draggableObj.iconWidth;
-                    draggableObj.iconHeightSmall = draggableObj.iconHeight;
+                    draggableObj.labelWidth = draggableObj.labelEl.width();
 
-                    draggableObj.iconEl.css(
+                    draggableObj.labelEl.css(
                         'left',
-                        50 - draggableObj.iconWidthSmall * 0.5
+                        50 - draggableObj.labelWidth * 0.5
                     );
-                    draggableObj.iconEl.css(
+                    draggableObj.labelEl.css(
                         'top',
-                        50 - draggableObj.iconHeightSmall * 0.5
+                        5 + draggableObj.iconHeightSmall + 5
                     );
-                } else {
-                    // If no icon and no label, don't create a draggable.
-                    return;
+
+                    draggableObj.labelEl.mousedown(function (event) {
+                        draggableObj.mouseDown.call(draggableObj, event);
+                    });
+                    draggableObj.labelEl.mouseup(function (event) {
+                        draggableObj.mouseUp.call(draggableObj, event);
+                    });
+                    draggableObj.labelEl.mousemove(function (event) {
+                        draggableObj.mouseMove.call(draggableObj, event);
+                    });
                 }
-            }
 
-            draggableObj.iconEl.mousedown(mouseDown);
-            draggableObj.iconEl.mouseup(mouseUp);
-            draggableObj.iconEl.mousemove(mouseMove);
-
-            draggableObj.containerEl.mousedown(mouseDown);
-            draggableObj.containerEl.mouseup(mouseUp);
-            draggableObj.containerEl.mousemove(mouseMove);
-
-            inContainer = true;
-            mousePressed = false;
-
-            onTarget = null;
-
-            draggableObj.id = obj.id;
-            draggableObj.x = -1;
-            draggableObj.y = -1;
-
-            draggableObj.setInContainer = function (val) {
-                inContainer = val;
-            };
-            draggableObj.setOnTarget = function (val) {
-                onTarget = val;
-            };
-
-            state.draggables.push(draggableObj);
-
-            state.numDraggablesInSlider += 1;
-
-            if (obj.icon.length === 0) {
                 draggableObj.hasLoaded = true;
-            }
+            });
+        } else {
+            // To make life easier, if there is no icon, but there is a
+            // label, we will create a label and store it as if it was an
+            // icon. All the existing code will work, and the user will
+            // see a label instead of an icon.
+            if (obj.label.length > 0) {
+                draggableObj.iconElBGColor = state.config.labelBgColor;
+                draggableObj.iconElPadding = 8;
+                draggableObj.iconElBorder = '1px solid black';
+                draggableObj.iconElLeftOffset = 9;
 
-            return;
+                draggableObj.iconEl = $(
+                    '<div ' +
+                        'style=" ' +
+                            'position: absolute; ' +
+                            'color: black; ' +
+                            'font-size: 0.95em; ' +
+                            'z-index: ' + objIndex + '; ' +
+                        '" ' +
+                    '>' +
+                        obj.label +
+                    '</div>'
+                );
 
-            function mouseDown(event) {
-                if (mousePressed === false) {
-                    // So that the browser does not perform a default drag.
-                    // If we don't do this, each drag operation will
-                    // potentially cause the highlghting of the dragged element.
-                    event.preventDefault();
+                draggableObj.iconEl.appendTo(draggableObj.containerEl);
 
-                    // If this draggable is just being dragged out of the
-                    // container, we must perform some additional tasks.
-                    if (inContainer === true) {
-                        draggableObj.containerEl.hide();
-
-                        draggableObj.iconEl.detach();
-                        draggableObj.iconEl.css(
-                            'background-color', draggableObj.iconElBGColor
-                        );
-                        draggableObj.iconEl.css(
-                            'padding-left', draggableObj.iconElPadding
-                        );
-                        draggableObj.iconEl.css(
-                            'padding-right', draggableObj.iconElPadding
-                        );
-                        draggableObj.iconEl.css(
-                            'border', draggableObj.iconElBorder
-                        );
-                        draggableObj.iconEl.css(
-                            'width',
-                            draggableObj.iconWidth
-                        );
-                        draggableObj.iconEl.css(
-                            'height',
-                            draggableObj.iconHeight
-                        );
-                        draggableObj.iconEl.css(
-                            'left',
-                            event.pageX -
-                                state.baseImageEl.offset().left -
-                                draggableObj.iconWidth * 0.5
-                                - draggableObj.iconElLeftOffset
-                        );
-                        draggableObj.iconEl.css(
-                            'top',
-                            event.pageY -
-                                state.baseImageEl.offset().top -
-                                draggableObj.iconHeight * 0.5
-                        );
-                        draggableObj.iconEl.appendTo(
-                            state.baseImageEl.parent()
-                        );
-
-                        if (draggableObj.labelEl !== null) {
-                            draggableObj.labelEl.detach();
-                            draggableObj.labelEl.css(
-                                'background-color', state.config.labelBgColor
-                            );
-                            draggableObj.labelEl.css(
-                                'padding-left', 8
-                            );
-                            draggableObj.labelEl.css(
-                                'padding-right', 8
-                            );
-                            draggableObj.labelEl.css(
-                                'border', '1px solid black'
-                            );
-                            draggableObj.labelEl.css(
-                                'left',
-                                event.pageX -
-                                    state.baseImageEl.offset().left -
-                                    draggableObj.labelWidth * 0.5
-                                    - 9 // Account for padding, border.
-                            );
-                            draggableObj.labelEl.css(
-                                'top',
-                                event.pageY -
-                                    state.baseImageEl.offset().top +
-                                    draggableObj.iconHeight * 0.5 + 5
-                            );
-                            draggableObj.labelEl.appendTo(
-                                state.baseImageEl.parent()
-                            );
-                        }
-
-                        inContainer = false;
-                        state.numDraggablesInSlider -= 1;
-                    }
-
-                    draggableObj.oldZIndex = draggableObj.zIndex;
-                    draggableObj.zIndex = 1000;
-                    draggableObj.iconEl.css('z-index', '1000');
-                    if (draggableObj.labelEl !== null) {
-                        draggableObj.labelEl.css('z-index', '1000');
-                    }
-
-                    mousePressed = true;
-                    state.currentMovingDraggable = draggableObj;
-                }
-            }
-
-            function mouseUp() {
-                if (mousePressed === true) {
-                    state.currentMovingDraggable = null;
-
-                    checkLandingElement();
-                }
-            }
-
-            function mouseMove() {
-                if (mousePressed === true) {
-                    // Because we have also attached a 'mousemove' event to the
-                    // 'document' (that will do the same thing), let's tell the
-                    // browser not to bubble up this event. The attached event
-                    // on the 'document' will only be triggered when the mouse
-                    // pointer leaves the draggable while it is in the middle
-                    // of a drag operation (user moves the mouse very quickly).
-                    event.stopPropagation();
-
-                    draggableObj.iconEl.css(
-                        'left',
-                        event.pageX -
-                            state.baseImageEl.offset().left -
-                            draggableObj.iconWidth * 0.5
-                            - draggableObj.iconElLeftOffset
-                    );
-                    draggableObj.iconEl.css(
-                        'top',
-                        event.pageY -
-                            state.baseImageEl.offset().top -
-                            draggableObj.iconHeight * 0.5
-                    );
-
-                    if (draggableObj.labelEl !== null) {
-                        draggableObj.labelEl.css(
-                            'left',
-                            event.pageX -
-                                state.baseImageEl.offset().left -
-                                draggableObj.labelWidth * 0.5
-                                - 9 // Acoount for padding, border.
-                        );
-                        draggableObj.labelEl.css(
-                            'top',
-                            event.pageY -
-                                state.baseImageEl.offset().top +
-                                draggableObj.iconHeight * 0.5 +
-                                5
-                        );
-                    }
-                }
-            }
-
-            // At this point the mouse was realeased, and we need to check
-            // where the draggable eneded up. Based on several things, we
-            // will either move the draggable back to the slider, or update
-            // the input with the user's answer (X-Y position of the draggable,
-            // or the ID of the target where it landed.
-            function checkLandingElement() {
-                var positionIE, targetFound;
-
-                mousePressed = false;
-                positionIE = draggableObj.iconEl.position();
-
-                if (state.individualTargets === true) {
-                    targetFound = false;
-
-                    checkIfOnTarget();
-
-                    if (targetFound === true) {
-                        correctZIndexes();
-                    } else {
-                        moveBackToSlider();
-                        removeObjIdFromTarget();
-
-                        state.numDraggablesInSlider += 1;
-                    }
-                } else {
-                    if (
-                        (positionIE.left < 0) ||
-                        (
-                            positionIE.left + draggableObj.iconWidth >
-                            state.baseImageEl.width()
-                        ) ||
-                        (positionIE.top < 0) ||
-                        (
-                            positionIE.top + draggableObj.iconHeight >
-                            state.baseImageEl.height()
-                        )
-                    ) {
-                        moveBackToSlider();
-
-                        draggableObj.x = -1;
-                        draggableObj.y = -1;
-
-                        state.numDraggablesInSlider += 1;
-                    } else {
-                        correctZIndexes();
-
-                        draggableObj.x =
-                            positionIE.left + draggableObj.iconWidth * 0.5;
-                        draggableObj.y =
-                            positionIE.top + draggableObj.iconHeight * 0.5;
-                    }
-                }
-
-                state.updateArrowOpacity();
-                updateInput(state);
+                draggableObj.iconWidth = draggableObj.iconEl.width();
+                draggableObj.iconHeight = draggableObj.iconEl.height();
+                draggableObj.iconWidthSmall = draggableObj.iconWidth;
+                draggableObj.iconHeightSmall = draggableObj.iconHeight;
 
+                draggableObj.iconEl.css(
+                    'left',
+                    50 - draggableObj.iconWidthSmall * 0.5
+                );
+                draggableObj.iconEl.css(
+                    'top',
+                    50 - draggableObj.iconHeightSmall * 0.5
+                );
+            } else {
+                // If no icon and no label, don't create a draggable.
                 return;
-
-                function removeObjIdFromTarget() {
-                    var c1;
-
-                    if (onTarget !== null) {
-                        for (c1 = 0; c1 < onTarget.draggable.length; c1 += 1) {
-                            if (onTarget.draggable[c1] === draggableObj.id) {
-                                onTarget.draggable.splice(c1, 1);
-
-                                break;
-                            }
-                        }
-
-                        if (onTarget.numTextEl !== null) {
-                            onTarget.updateNumTextEl();
-                        }
-
-                        onTarget = null;
-                    }
-                }
-
-                //
-                // Determine if a draggable, after it was relased, ends up on a
-                // target. We do this by iterating over all of the targets, and
-                // for each one we check whether the draggable's center is
-                // within the target's dimensions.
-                //
-                // positionIE is the object as returned by
-                //
-                //     draggableObj.iconEl.position()
-                //
-                function checkIfOnTarget() {
-                    var c1, target;
-
-                    for (c1 = 0; c1 < state.targets.length; c1 += 1) {
-                        target = state.targets[c1];
-
-                        // If only one draggable per target is allowed, and
-                        // the current target already has a draggable on it
-                        // (with an ID different from the one we are checking
-                        // against), then go to next target.
-                        if (
-                            (state.config.one_per_target === true) &&
-                            (target.draggable.length === 1) &&
-                            (target.draggable[0] !== draggableObj.id)
-                        ) {
-                            continue;
-                        }
-
-                        // Check if the draggable's center coordinate is within
-                        // the target's dimensions. If not, go to next target.
-                        if (
-                            positionIE.top + draggableObj.iconHeight * 0.5 <
-                            target.offset.top
-                        ) {
-                            continue;
-                        }
-                        if (
-                            positionIE.top + draggableObj.iconHeight * 0.5 >
-                            target.offset.top + target.h
-                        ) {
-                            continue;
-                        }
-                        if (
-                            positionIE.left + draggableObj.iconWidth * 0.5 <
-                            target.offset.left
-                        ) {
-                            continue;
-                        }
-                        if (
-                            positionIE.left + draggableObj.iconWidth * 0.5 >
-                            target.offset.left + target.w
-                        ) {
-                            continue;
-                        }
-
-                        // If we got here, then our draggable is on top of a
-                        // target.
-                        targetFound = true;
-
-                        // If the draggable was moved from one target to
-                        // another, then we need to remove it's ID from the
-                        // previous target's draggables list, and add it to the
-                        // new target's draggables list.
-                        if (
-                            (onTarget !== null) &&
-                            (onTarget.id !== target.id)
-                        ) {
-                            removeObjIdFromTarget();
-                            onTarget = target;
-                            target.draggable.push(draggableObj.id);
-                        }
-                        // If the draggable was moved from the slider to a
-                        // target, remember the target, and add ID to the
-                        // target's draggables list.
-                        else if (onTarget === null) {
-                            onTarget = target;
-                            target.draggable.push(draggableObj.id);
-                        }
-
-                        if (target.numTextEl !== null) {
-                            target.updateNumTextEl();
-                        }
-
-                        // Reposition the draggable so that it's center
-                        // coincides with the center of the target.
-                        snapToTarget(target);
-
-                        break;
-                    }
-                }
-
-                function snapToTarget(target) {
-                    var offset;
-
-                    offset = 0;
-                    if (state.config.targetOutline === true) {
-                        offset = 1;
-                    }
-
-                    draggableObj.iconEl.css(
-                        'left',
-                        target.offset.left + 0.5 * target.w -
-                            draggableObj.iconWidth * 0.5 + offset
-                            - draggableObj.iconElLeftOffset
-                    );
-                    draggableObj.iconEl.css(
-                        'top',
-                        target.offset.top + 0.5 * target.h -
-                            draggableObj.iconHeight * 0.5 + offset
-                    );
-
-                    if (draggableObj.labelEl !== null) {
-                        draggableObj.labelEl.css(
-                            'left',
-                            target.offset.left + 0.5 * target.w -
-                                draggableObj.labelWidth * 0.5 + offset
-                                - 9 // Acoount for padding, border.
-                        );
-                        draggableObj.labelEl.css(
-                            'top',
-                            target.offset.top + 0.5 * target.h +
-                                draggableObj.iconHeight * 0.5 + 5 + offset
-                        );
-                    }
-                }
-
-                // Go through all of the draggables subtract 1 from the z-index
-                // of all whose z-index is higher than the old z-index of the
-                // current element. After, set the z-index of the current
-                // element to 1 + N (where N is the number of draggables - i.e.
-                // the highest z-index possible).
-                //
-                // This will make sure that after releasing a draggable, it
-                // will be on top of all of the other draggables. Also, the
-                // ordering of the visibility (z-index) of the other draggables
-                // will not change.
-                function correctZIndexes() {
-                    var draggablesInMe, c1, c2, highestZIndex;
-
-                    if (state.individualTargets === true) {
-
-                        logme('In correctZIndexes.');
-
-                        if (onTarget.draggable.length > 0) {
-                            logme('onTarget.draggable.length > 0');
-
-                            draggablesInMe = [];
-
-                            for (c1 = 0; c1 < onTarget.draggable.length; c1 += 1) {
-                                for (c2 = 0; c2 < state.draggables.length; c2 += 1) {
-                                    if (
-                                        onTarget.draggable[c1] ===
-                                            state.draggables[c2].id
-                                    ) {
-                                        draggablesInMe.push(state.draggables[c2]);
-                                    }
-                                }
-                            }
-
-                            highestZIndex = -10000;
-
-                            for (c1 = 0; c1 < draggablesInMe.length; c1 += 1) {
-                                if (
-                                    (draggablesInMe[c1].zIndex > highestZIndex) &&
-                                        (draggablesInMe[c1].zIndex !== 1000)
-                                ) {
-                                    highestZIndex = draggablesInMe[c1].zIndex;
-                                }
-                            }
-
-                            if (highestZIndex === -10000) {
-                                highestZIndex = onTarget.draggable.length;
-                            } else if (highestZIndex < draggableObj.oldZIndex) {
-                                highestZIndex = draggableObj.oldZIndex;
-                            } else {
-                                for (c1 = 0; c1 < draggablesInMe.length; c1 += 1) {
-                                    logme('draggablesInMe[' + c1 + '].id = ' + draggablesInMe[c1].id);
-                                    logme('draggablesInMe[' + c1 + '].zIndex = ' + draggablesInMe[c1].zIndex);
-                                    logme('draggablesInMe[' + c1 + '].oldZIndex = ' + draggablesInMe[c1].oldZIndex);
-                                }
-
-                                logme('----------------');
-                                logme('highestZIndex = ' + highestZIndex);
-
-                                for (c1 = 0; c1 < draggablesInMe.length; c1 += 1) {
-                                    draggablesInMe[c1].zIndex -= 1;
-                                    draggablesInMe[c1].oldZIndex -= 1;
-
-                                    draggablesInMe[c1].iconEl.css(
-                                        'z-index',
-                                        draggablesInMe[c1].zIndex
-                                    );
-                                    if (draggablesInMe[c1].labelEl !== null) {
-                                        draggablesInMe[c1].labelEl.css(
-                                            'z-index',
-                                            draggablesInMe[c1].zIndex
-                                        );
-                                    }
-                                }
-                            }
-                        } else {
-                            logme('highestZIndex = onTarget.draggable.length');
-                            highestZIndex = onTarget.draggable.length;
-                        }
-
-                        draggableObj.zIndex = highestZIndex;
-                        draggableObj.oldZIndex = highestZIndex;
-
-                        draggableObj.iconEl.css(
-                            'z-index',
-                            draggableObj.zIndex
-                        );
-                        if (draggableObj.labelEl !== null) {
-                            draggableObj.labelEl.css(
-                                'z-index',
-                                draggableObj.zIndex
-                            );
-                        }
-                    } else {
-                        for (c1 = 0; c1 < state.draggables.length; c1++) {
-                            if (
-                                draggableObj.oldZIndex <
-                                    state.draggables[c1].zIndex
-                            ) {
-                                state.draggables[c1].zIndex -= 1;
-                                state.draggables[c1].oldZIndex = state.draggables[c1].zIndex;
-                                state.draggables[c1].iconEl.css(
-                                    'z-index',
-                                    state.draggables[c1].zIndex
-                                );
-
-                                if (state.draggables[c1].labelEl !== null) {
-                                    state.draggables[c1].labelEl.css(
-                                        'z-index',
-                                        state.draggables[c1].zIndex
-                                    );
-                                }
-                            }
-                        }
-
-                        draggableObj.zIndex = c1;
-                        draggableObj.oldZIndex = c1;
-                        draggableObj.iconEl.css('z-index', c1);
-
-                        if (draggableObj.labelEl !== null) {
-                            draggableObj.labelEl.css('z-index', c1);
-                        }
-                    }
-                }
-
-                // If a draggable was released in a wrong positione, we will
-                // move it back to the slider, placing it in the same position
-                // that it was dragged out of.
-                function moveBackToSlider() {
-                    draggableObj.containerEl.show();
-
-                    draggableObj.zIndex = draggableObj.oldZIndex;
-
-                    draggableObj.iconEl.detach();
-                    draggableObj.iconEl.css('border', 'none');
-                    draggableObj.iconEl.css('background-color', 'transparent');
-                    draggableObj.iconEl.css('padding-left', 0);
-                    draggableObj.iconEl.css('padding-right', 0);
-                    draggableObj.iconEl.css('z-index', draggableObj.zIndex);
-                    draggableObj.iconEl.css(
-                        'width',
-                        draggableObj.iconWidthSmall
-                    );
-                    draggableObj.iconEl.css(
-                        'height',
-                        draggableObj.iconHeightSmall
-                    );
-                    draggableObj.iconEl.css(
-                        'left',
-                        50 - draggableObj.iconWidthSmall * 0.5
-                    );
-                    if (draggableObj.labelEl !== null) {
-                        draggableObj.iconEl.css('top', 5);
-                    } else {
-                        draggableObj.iconEl.css(
-                            'top',
-                            50 - draggableObj.iconHeightSmall * 0.5
-                        );
-                    }
-
-                    draggableObj.iconEl.appendTo(draggableObj.containerEl);
-
-                    if (draggableObj.labelEl !== null) {
-                        draggableObj.labelEl.detach();
-                        draggableObj.labelEl.css('border', 'none');
-                        draggableObj.labelEl.css('background-color', 'transparent');
-                        draggableObj.labelEl.css('padding-left', 0);
-                        draggableObj.labelEl.css('padding-right', 0);
-                        draggableObj.labelEl.css('z-index', draggableObj.zIndex);
-                        draggableObj.labelEl.css(
-                            'left',
-                            50 - draggableObj.labelWidth * 0.5
-                        );
-                        draggableObj.labelEl.css(
-                            'top',
-                            5 + draggableObj.iconHeightSmall + 5
-                        );
-                        draggableObj.labelEl.appendTo(
-                            draggableObj.containerEl
-                        );
-                    }
-
-                    inContainer = true;
-                }
             }
         }
+
+        draggableObj.iconEl.mousedown(function (event) {
+            draggableObj.mouseDown.call(draggableObj, event);
+        });
+        draggableObj.iconEl.mouseup(function (event) {
+            draggableObj.mouseUp.call(draggableObj, event);
+        });
+        draggableObj.iconEl.mousemove(function (event) {
+            draggableObj.mouseMove.call(draggableObj, event);
+        });
+
+        draggableObj.containerEl.mousedown(function (event) {
+            draggableObj.mouseDown.call(draggableObj, event);
+        });
+        draggableObj.containerEl.mouseup(function (event) {
+            draggableObj.mouseUp.call(draggableObj, event);
+        });
+        draggableObj.containerEl.mousemove(function (event) {
+            draggableObj.mouseMove.call(draggableObj, event);
+        });
+
+        draggableObj.id = obj.id;
+        draggableObj.x = -1;
+        draggableObj.y = -1;
+
+        state.numDraggablesInSlider += 1;
+
+        if (obj.icon.length === 0) {
+            draggableObj.hasLoaded = true;
+        }
+
+        state.draggables.push(draggableObj);
+    }
+
+    function mouseDown(event) {
+        if (this.mousePressed === false) {
+            // So that the browser does not perform a default drag.
+            // If we don't do this, each drag operation will
+            // potentially cause the highlghting of the dragged element.
+            event.preventDefault();
+
+            // If this draggable is just being dragged out of the
+            // container, we must perform some additional tasks.
+            if (this.inContainer === true) {
+                this.containerEl.hide();
+
+                this.iconEl.detach();
+                this.iconEl.css(
+                    'background-color', this.iconElBGColor
+                );
+                this.iconEl.css(
+                    'padding-left', this.iconElPadding
+                );
+                this.iconEl.css(
+                    'padding-right', this.iconElPadding
+                );
+                this.iconEl.css(
+                    'border', this.iconElBorder
+                );
+                this.iconEl.css(
+                    'width',
+                    this.iconWidth
+                );
+                this.iconEl.css(
+                    'height',
+                    this.iconHeight
+                );
+                this.iconEl.css(
+                    'left',
+                    event.pageX -
+                        this.state.baseImageEl.offset().left -
+                        this.iconWidth * 0.5
+                        - this.iconElLeftOffset
+                );
+                this.iconEl.css(
+                    'top',
+                    event.pageY -
+                        this.state.baseImageEl.offset().top -
+                        this.iconHeight * 0.5
+                );
+                this.iconEl.appendTo(
+                    state.baseImageEl.parent()
+                );
+
+                if (this.labelEl !== null) {
+                    this.labelEl.detach();
+                    this.labelEl.css(
+                        'background-color', this.state.config.labelBgColor
+                    );
+                    this.labelEl.css(
+                        'padding-left', 8
+                    );
+                    this.labelEl.css(
+                        'padding-right', 8
+                    );
+                    this.labelEl.css(
+                        'border', '1px solid black'
+                    );
+                    this.labelEl.css(
+                        'left',
+                        event.pageX -
+                            this.state.baseImageEl.offset().left -
+                            this.labelWidth * 0.5
+                            - 9 // Account for padding, border.
+                    );
+                    this.labelEl.css(
+                        'top',
+                        event.pageY -
+                            this.state.baseImageEl.offset().top +
+                            this.iconHeight * 0.5 + 5
+                    );
+                    this.labelEl.appendTo(
+                        this.state.baseImageEl.parent()
+                    );
+                }
+
+                this.inContainer = false;
+                this.state.numDraggablesInSlider -= 1;
+            }
+
+            this.oldZIndex = this.zIndex;
+            this.zIndex = 1000;
+            this.iconEl.css('z-index', '1000');
+            if (this.labelEl !== null) {
+                this.labelEl.css('z-index', '1000');
+            }
+
+            this.mousePressed = true;
+            this.state.currentMovingDraggable = this;
+        }
+    }
+
+    function mouseUp() {
+        if (this.mousePressed === true) {
+            this.state.currentMovingDraggable = null;
+
+            this.checkLandingElement();
+        }
+    }
+
+    function mouseMove() {
+        if (this.mousePressed === true) {
+            // Because we have also attached a 'mousemove' event to the
+            // 'document' (that will do the same thing), let's tell the
+            // browser not to bubble up this event. The attached event
+            // on the 'document' will only be triggered when the mouse
+            // pointer leaves the draggable while it is in the middle
+            // of a drag operation (user moves the mouse very quickly).
+            event.stopPropagation();
+
+            this.iconEl.css(
+                'left',
+                event.pageX -
+                    this.state.baseImageEl.offset().left -
+                    this.iconWidth * 0.5
+                    - this.iconElLeftOffset
+            );
+            this.iconEl.css(
+                'top',
+                event.pageY -
+                    this.state.baseImageEl.offset().top -
+                    this.iconHeight * 0.5
+            );
+
+            if (this.labelEl !== null) {
+                this.labelEl.css(
+                    'left',
+                    event.pageX -
+                        this.state.baseImageEl.offset().left -
+                        this.labelWidth * 0.5
+                        - 9 // Acoount for padding, border.
+                );
+                this.labelEl.css(
+                    'top',
+                    event.pageY -
+                        this.state.baseImageEl.offset().top +
+                        this.iconHeight * 0.5 +
+                        5
+                );
+            }
+        }
+    }
+
+    // At this point the mouse was realeased, and we need to check
+    // where the draggable eneded up. Based on several things, we
+    // will either move the draggable back to the slider, or update
+    // the input with the user's answer (X-Y position of the draggable,
+    // or the ID of the target where it landed.
+    function checkLandingElement() {
+        var positionIE;
+
+        this.mousePressed = false;
+        positionIE = this.iconEl.position();
+
+        if (this.state.individualTargets === true) {
+            if (this.checkIfOnTarget(positionIE) === true) {
+                this.correctZIndexes();
+            } else {
+                this.moveBackToSlider();
+                this.removeObjIdFromTarget();
+
+                this.state.numDraggablesInSlider += 1;
+            }
+        } else {
+            if (
+                (positionIE.left < 0) ||
+                (
+                    positionIE.left + this.iconWidth >
+                    this.state.baseImageEl.width()
+                ) ||
+                (positionIE.top < 0) ||
+                (
+                    positionIE.top + this.iconHeight >
+                    this.state.baseImageEl.height()
+                )
+            ) {
+                this.moveBackToSlider();
+
+                this.x = -1;
+                this.y = -1;
+
+                this.state.numDraggablesInSlider += 1;
+            } else {
+                this.correctZIndexes();
+
+                this.x =
+                    positionIE.left + this.iconWidth * 0.5;
+                this.y =
+                    positionIE.top + this.iconHeight * 0.5;
+            }
+        }
+
+        this.state.updateArrowOpacity();
+        updateInput(this.state);
+    }
+
+    function removeObjIdFromTarget() {
+        var c1;
+
+        if (this.onTarget !== null) {
+            for (c1 = 0; c1 < this.onTarget.draggable.length; c1 += 1) {
+                if (this.onTarget.draggable[c1] === this.id) {
+                    this.onTarget.draggable.splice(c1, 1);
+
+                    break;
+                }
+            }
+
+            if (this.onTarget.numTextEl !== null) {
+                this.onTarget.updateNumTextEl();
+            }
+
+            this.onTarget = null;
+        }
+    }
+
+    //
+    // Determine if a draggable, after it was relased, ends up on a
+    // target. We do this by iterating over all of the targets, and
+    // for each one we check whether the draggable's center is
+    // within the target's dimensions.
+    //
+    // positionIE is the object as returned by
+    //
+    //     this.iconEl.position()
+    //
+    function checkIfOnTarget(positionIE) {
+        var c1, target, targetFound;
+
+        targetFound = false;
+
+        for (c1 = 0; c1 < this.state.targets.length; c1 += 1) {
+            target = this.state.targets[c1];
+
+            // If only one draggable per target is allowed, and
+            // the current target already has a draggable on it
+            // (with an ID different from the one we are checking
+            // against), then go to next target.
+            if (
+                (this.state.config.one_per_target === true) &&
+                (target.draggable.length === 1) &&
+                (target.draggable[0] !== this.id)
+            ) {
+                continue;
+            }
+
+            // Check if the draggable's center coordinate is within
+            // the target's dimensions. If not, go to next target.
+            if (
+                positionIE.top + this.iconHeight * 0.5 <
+                target.offset.top
+            ) {
+                continue;
+            }
+            if (
+                positionIE.top + this.iconHeight * 0.5 >
+                target.offset.top + target.h
+            ) {
+                continue;
+            }
+            if (
+                positionIE.left + this.iconWidth * 0.5 <
+                target.offset.left
+            ) {
+                continue;
+            }
+            if (
+                positionIE.left + this.iconWidth * 0.5 >
+                target.offset.left + target.w
+            ) {
+                continue;
+            }
+
+            // If we got here, then our draggable is on top of a
+            // target.
+            targetFound = true;
+
+            // If the draggable was moved from one target to
+            // another, then we need to remove it's ID from the
+            // previous target's draggables list, and add it to the
+            // new target's draggables list.
+            if (
+                (this.onTarget !== null) &&
+                (this.onTarget.id !== target.id)
+            ) {
+                this.removeObjIdFromTarget();
+                this.onTarget = target;
+                target.draggable.push(this.id);
+            }
+            // If the draggable was moved from the slider to a
+            // target, remember the target, and add ID to the
+            // target's draggables list.
+            else if (this.onTarget === null) {
+                this.onTarget = target;
+                target.draggable.push(this.id);
+            }
+
+            if (target.numTextEl !== null) {
+                target.updateNumTextEl();
+            }
+
+            // Reposition the draggable so that it's center
+            // coincides with the center of the target.
+            this.snapToTarget(target);
+
+            break;
+        }
+
+        return targetFound;
+    }
+
+    function snapToTarget(target) {
+        var offset;
+
+        offset = 0;
+        if (this.state.config.targetOutline === true) {
+            offset = 1;
+        }
+
+        this.iconEl.css(
+            'left',
+            target.offset.left + 0.5 * target.w -
+                this.iconWidth * 0.5 + offset
+                - this.iconElLeftOffset
+        );
+        this.iconEl.css(
+            'top',
+            target.offset.top + 0.5 * target.h -
+                this.iconHeight * 0.5 + offset
+        );
+
+        if (this.labelEl !== null) {
+            this.labelEl.css(
+                'left',
+                target.offset.left + 0.5 * target.w -
+                    this.labelWidth * 0.5 + offset
+                    - 9 // Acoount for padding, border.
+            );
+            this.labelEl.css(
+                'top',
+                target.offset.top + 0.5 * target.h +
+                    this.iconHeight * 0.5 + 5 + offset
+            );
+        }
+    }
+
+    // Go through all of the draggables subtract 1 from the z-index
+    // of all whose z-index is higher than the old z-index of the
+    // current element. After, set the z-index of the current
+    // element to 1 + N (where N is the number of draggables - i.e.
+    // the highest z-index possible).
+    //
+    // This will make sure that after releasing a draggable, it
+    // will be on top of all of the other draggables. Also, the
+    // ordering of the visibility (z-index) of the other draggables
+    // will not change.
+    function correctZIndexes() {
+        var draggablesInMe, c1, c2, highestZIndex;
+
+        if (this.state.individualTargets === true) {
+            if (this.onTarget.draggable.length > 0) {
+                draggablesInMe = [];
+
+                for (c1 = 0; c1 < this.onTarget.draggable.length; c1 += 1) {
+                    for (c2 = 0; c2 < this.state.draggables.length; c2 += 1) {
+                        if (
+                            this.onTarget.draggable[c1] ===
+                                this.state.draggables[c2].id
+                        ) {
+                            draggablesInMe.push(this.state.draggables[c2]);
+                        }
+                    }
+                }
+
+                highestZIndex = -10000;
+
+                for (c1 = 0; c1 < draggablesInMe.length; c1 += 1) {
+                    if (
+                        (draggablesInMe[c1].zIndex > highestZIndex) &&
+                            (draggablesInMe[c1].zIndex !== 1000)
+                    ) {
+                        highestZIndex = draggablesInMe[c1].zIndex;
+                    }
+                }
+
+                if (highestZIndex === -10000) {
+                    highestZIndex = this.onTarget.draggable.length;
+                } else if (highestZIndex < this.oldZIndex) {
+                    highestZIndex = this.oldZIndex;
+                } else {
+                    for (c1 = 0; c1 < draggablesInMe.length; c1 += 1) {
+                        draggablesInMe[c1].zIndex -= 1;
+                        draggablesInMe[c1].oldZIndex -= 1;
+
+                        draggablesInMe[c1].iconEl.css(
+                            'z-index',
+                            draggablesInMe[c1].zIndex
+                        );
+                        if (draggablesInMe[c1].labelEl !== null) {
+                            draggablesInMe[c1].labelEl.css(
+                                'z-index',
+                                draggablesInMe[c1].zIndex
+                            );
+                        }
+                    }
+                }
+            } else {
+                highestZIndex = this.onTarget.draggable.length;
+            }
+
+            this.zIndex = highestZIndex;
+            this.oldZIndex = highestZIndex;
+
+            this.iconEl.css(
+                'z-index',
+                this.zIndex
+            );
+            if (this.labelEl !== null) {
+                this.labelEl.css(
+                    'z-index',
+                    this.zIndex
+                );
+            }
+        } else {
+            for (c1 = 0; c1 < this.state.draggables.length; c1++) {
+                if (
+                    this.oldZIndex <
+                        this.state.draggables[c1].zIndex
+                ) {
+                    this.state.draggables[c1].zIndex -= 1;
+                    this.state.draggables[c1].oldZIndex = this.state.draggables[c1].zIndex;
+                    this.state.draggables[c1].iconEl.css(
+                        'z-index',
+                        this.state.draggables[c1].zIndex
+                    );
+
+                    if (this.state.draggables[c1].labelEl !== null) {
+                        this.state.draggables[c1].labelEl.css(
+                            'z-index',
+                            this.state.draggables[c1].zIndex
+                        );
+                    }
+                }
+            }
+
+            this.zIndex = c1;
+            this.oldZIndex = c1;
+            this.iconEl.css('z-index', c1);
+
+            if (this.labelEl !== null) {
+                this.labelEl.css('z-index', c1);
+            }
+        }
+    }
+
+    // If a draggable was released in a wrong positione, we will
+    // move it back to the slider, placing it in the same position
+    // that it was dragged out of.
+    function moveBackToSlider() {
+        this.containerEl.show();
+
+        this.zIndex = this.oldZIndex;
+
+        this.iconEl.detach();
+        this.iconEl.css('border', 'none');
+        this.iconEl.css('background-color', 'transparent');
+        this.iconEl.css('padding-left', 0);
+        this.iconEl.css('padding-right', 0);
+        this.iconEl.css('z-index', this.zIndex);
+        this.iconEl.css(
+            'width',
+            this.iconWidthSmall
+        );
+        this.iconEl.css(
+            'height',
+            this.iconHeightSmall
+        );
+        this.iconEl.css(
+            'left',
+            50 - this.iconWidthSmall * 0.5
+        );
+        if (this.labelEl !== null) {
+            this.iconEl.css('top', 5);
+        } else {
+            this.iconEl.css(
+                'top',
+                50 - this.iconHeightSmall * 0.5
+            );
+        }
+
+        this.iconEl.appendTo(this.containerEl);
+
+        if (this.labelEl !== null) {
+            this.labelEl.detach();
+            this.labelEl.css('border', 'none');
+            this.labelEl.css('background-color', 'transparent');
+            this.labelEl.css('padding-left', 0);
+            this.labelEl.css('padding-right', 0);
+            this.labelEl.css('z-index', this.zIndex);
+            this.labelEl.css(
+                'left',
+                50 - this.labelWidth * 0.5
+            );
+            this.labelEl.css(
+                'top',
+                5 + this.iconHeightSmall + 5
+            );
+            this.labelEl.appendTo(
+                this.containerEl
+            );
+        }
+
+        this.inContainer = true;
     }
 });
 
diff --git a/common/static/js/capa/drag_and_drop/main.js b/common/static/js/capa/drag_and_drop/main.js
index 24cc8cbdcb..6b1164b6df 100644
--- a/common/static/js/capa/drag_and_drop/main.js
+++ b/common/static/js/capa/drag_and_drop/main.js
@@ -63,7 +63,9 @@ define(
 
             Targets(state);
             Scroller(state);
-            Draggables(state);
+            Draggables.init(state);
+
+            logme('After Draggables.init(state); state = ', state);
 
             // Update the input element, checking first that it is not filled with
             // an answer from the server.
diff --git a/common/static/js/capa/drag_and_drop/targets.js b/common/static/js/capa/drag_and_drop/targets.js
index 0bc246e49f..af27c186f2 100644
--- a/common/static/js/capa/drag_and_drop/targets.js
+++ b/common/static/js/capa/drag_and_drop/targets.js
@@ -119,15 +119,6 @@ define(['logme'], function (logme) {
             highestZIndex = -10000;
             lowestZIndex = 10000;
 
-            for (c1 = 0; c1 < draggablesInMe.length; c1 += 1) {
-                logme(
-                    'draggablesInMe[' + c1 + '].id = ' + draggablesInMe[c1].id,
-                    'draggablesInMe[' + c1 + '].zIndex = ' + draggablesInMe[c1].zIndex,
-                    'draggablesInMe[' + c1 + '].oldZIndex = ' + draggablesInMe[c1].oldZIndex
-                );
-            }
-            logme('------------------');
-
             for (c1 = 0; c1 < draggablesInMe.length; c1 += 1) {
                 if (draggablesInMe[c1].zIndex < lowestZIndex) {
                     lowestZIndex = draggablesInMe[c1].zIndex;
diff --git a/common/static/js/capa/drag_and_drop/update_input.js b/common/static/js/capa/drag_and_drop/update_input.js
index 3b5053d5d2..14534f1240 100644
--- a/common/static/js/capa/drag_and_drop/update_input.js
+++ b/common/static/js/capa/drag_and_drop/update_input.js
@@ -10,6 +10,8 @@ define(['logme'], function (logme) {
     function updateInput(state, checkFirst) {
         var inputEl, stateStr, targets, draggables, c1, c2, tempObj;
 
+        logme('updateInput; state = ', state);
+
         if (checkFirst === true) {
             if (checkIfHasAnswer() === true) {
                 return;
@@ -126,7 +128,7 @@ define(['logme'], function (logme) {
                                     return;
                                 }
 
-                                draggable.setInContainer(false);
+                                draggable.inContainer = false;
                                 draggable.containerEl.hide();
 
                                 draggable.iconEl.detach();
@@ -196,7 +198,7 @@ define(['logme'], function (logme) {
                                     );
                                 }
 
-                                draggable.setOnTarget(target);
+                                draggable.onTarget = target;
                                 target.draggable.push(draggableId);
 
                                 if (target.numTextEl !== null) {
@@ -244,7 +246,7 @@ define(['logme'], function (logme) {
                                     return;
                                 }
 
-                                draggable.setInContainer(false);
+                                draggable.inContainer = false;
                                 draggable.containerEl.hide();
 
                                 draggable.iconEl.detach();

From c8bbcacfef5b477b170086f1ad0c80ce640d9b8f Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Tue, 15 Jan 2013 19:07:05 +0200
Subject: [PATCH 505/541] labels reuse logic and tests

---
 common/lib/capa/capa/verifiers/draganddrop.py |  42 ++-
 .../{tests.py => tests_draganddrop.py}        | 271 +++++++++++++++++-
 2 files changed, 298 insertions(+), 15 deletions(-)
 rename common/lib/capa/capa/verifiers/{tests.py => tests_draganddrop.py} (54%)

diff --git a/common/lib/capa/capa/verifiers/draganddrop.py b/common/lib/capa/capa/verifiers/draganddrop.py
index 44e50828f5..7ad1ce35eb 100644
--- a/common/lib/capa/capa/verifiers/draganddrop.py
+++ b/common/lib/capa/capa/verifiers/draganddrop.py
@@ -119,9 +119,24 @@ class DragAndDrop(object):
             if not self.excess_draggables[draggable]:
                 return False  # user answer has more draggables than correct answer
 
-        # Number of draggables in user_groups may be smaller that in
-        # correct_groups, that is incorrect.
+        # Number of draggables in user_groups may be differ that in
+        # correct_groups, that is incorrect, except special case with 'number'
         for groupname, draggable_ids in self.correct_groups.items():
+
+            # 'number' rule special case
+            # for reusable draggables we may get in self.user_groups
+            # {'1': [u'2', u'2', u'2'], '0': [u'1', u'1'], '2': [u'3']}
+            # if +number in rule - do not remove duplicates but clean rule
+            current_rule = self.correct_positions[groupname].keys()[0]
+            if 'number' in current_rule:
+                rule_values = self.correct_positions[groupname][current_rule]
+                #clean rule, do not do clean dublicate items
+                self.correct_positions[groupname].pop(current_rule, None)
+                parsed_rule = current_rule.replace('+', '').replace('number', '')
+                self.correct_positions[groupname][parsed_rule] = rule_values
+            else:  # remove dublicates
+                self.user_groups[groupname] = list(set(self.user_groups[groupname]))
+
             if sorted(draggable_ids) != sorted(self.user_groups[groupname]):
                 return False
 
@@ -129,8 +144,9 @@ class DragAndDrop(object):
         # every element are equal with correct positions
         for groupname in self.correct_groups:
             rules_executed = 0
-            for rule in ('exact', 'anyof'):   # every group has only one rule
-                if self.correct_positions[groupname].get(rule, []):
+            for rule in ('exact', 'anyof', 'unorderly_equal'):
+                # every group has only one rule
+                if self.correct_positions[groupname].get(rule, None):
                     rules_executed += 1
                     if not self.compare_positions(
                             self.correct_positions[groupname][rule],
@@ -174,6 +190,8 @@ class DragAndDrop(object):
                      - draggables can be placed in any order:
                     user ['1','2','3','4'] is 'anyof' equal to ['4', '2', '1', 3']
 
+            'unorderly_equal' is same as 'exact' but disregards on order
+
         Equality functions:
 
         Equality functon depends on type of element. They declared in
@@ -193,14 +211,24 @@ class DragAndDrop(object):
                     return False
 
         if flag == 'anyof':
-            count = 0
             for u_el in user:
                 for c_el in correct:
                     if PositionsCompare(u_el) == PositionsCompare(c_el):
-                        count += 1
                         break
-            if count != len(user):
+                else:
+                    return False
+
+        if flag == 'unorderly_equal':
+            if len(correct) != len(user):
                 return False
+            temp = correct[:]
+            for u_el in user:
+                for c_el in temp:
+                    if PositionsCompare(u_el) == PositionsCompare(c_el):
+                        temp.remove(c_el)
+                        break
+                else:
+                    return False
 
         return True
 
diff --git a/common/lib/capa/capa/verifiers/tests.py b/common/lib/capa/capa/verifiers/tests_draganddrop.py
similarity index 54%
rename from common/lib/capa/capa/verifiers/tests.py
rename to common/lib/capa/capa/verifiers/tests_draganddrop.py
index c744734995..257d404679 100644
--- a/common/lib/capa/capa/verifiers/tests.py
+++ b/common/lib/capa/capa/verifiers/tests_draganddrop.py
@@ -54,21 +54,25 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
 
     def test_multiple_images_per_target_true(self):
         user_input = '{\
-        "draggables": [{"1": "t1"}, {"name_with_icon": "t1"}]}'
-        correct_answer = {'1':              't1', 'name_with_icon': 't1'}
+        "draggables": [{"1": "t1"}, {"name_with_icon": "t2"}, \
+        {"2": "t1"}]}'
+        correct_answer = {'1':              't1', 'name_with_icon': 't2',
+        '2': 't1'}
         self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
     def test_multiple_images_per_target_false(self):
         user_input = '{\
-        "draggables": [{"1": "t1"}, {"name_with_icon": "t1"}]}'
-        correct_answer = {'1':              't2', 'name_with_icon': 't1'}
+        "draggables": [{"1": "t1"}, {"name_with_icon": "t2"}, \
+        {"2": "t1"}]}'
+        correct_answer = {'1':              't2', 'name_with_icon': 't2',
+        '2': 't1'}
         self.assertFalse(draganddrop.grade(user_input, correct_answer))
 
     def test_targets_and_positions(self):
         user_input = '{"draggables": [{"1": [10,10]}, \
          {"name_with_icon": [[10,10],4]}]}'
         correct_answer = {'1':  [10, 10], 'name_with_icon': [[10, 10], 4]}
-        self.assertFalse(draganddrop.grade(user_input, correct_answer))
+        self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
     def test_position_and_targets(self):
         user_input = '{"draggables": [{"1": "t1"}, {"name_with_icon": "t2"}]}'
@@ -117,6 +121,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
             right upper corner."""
         user_input = '{"draggables": \
         [{"ant":[610.5,57.449951171875]},{"grass":[322.5,199.449951171875]}]}'
+
         correct_answer = {'grass':     [[300, 200], 200], 'ant': [[500, 0], 200]}
         self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
@@ -198,6 +203,255 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
 
         self.assertFalse(draganddrop.grade(user_input, correct_answer))
 
+    def test_reuse_draggable_no_mupliples(self):
+        """Test reusable draggables (no mupltiple draggables per target)"""
+        user_input = '{"draggables":[{"1":"target1"}, \
+        {"2":"target2"},{"1":"target3"},{"2":"target4"},{"2":"target5"}, \
+        {"3":"target6"}]}'
+        correct_answer = [
+        {
+            'draggables': ['1'],
+            'targets': ['target1',  'target3'],
+            'rule': 'anyof'
+        },
+        {
+            'draggables': ['2'],
+            'targets': ['target2', 'target4', 'target5'],
+            'rule': 'anyof'
+        },
+        {
+            'draggables': ['3'],
+            'targets': ['target6'],
+            'rule': 'anyof'
+        }]
+        self.assertTrue(draganddrop.grade(user_input, correct_answer))
+
+    def test_reuse_draggable_with_mupliples(self):
+        """Test reusable draggables with mupltiple draggables per target"""
+        user_input = '{"draggables":[{"1":"target1"}, \
+        {"2":"target2"},{"1":"target1"},{"2":"target4"},{"2":"target4"}, \
+        {"3":"target6"}]}'
+        correct_answer = [
+        {
+            'draggables': ['1'],
+            'targets': ['target1',  'target3'],
+            'rule': 'anyof'
+        },
+        {
+            'draggables': ['2'],
+            'targets': ['target2', 'target4'],
+            'rule': 'anyof'
+        },
+        {
+            'draggables': ['3'],
+            'targets': ['target6'],
+            'rule': 'anyof'
+        }]
+        self.assertTrue(draganddrop.grade(user_input, correct_answer))
+
+    def test_reuse_many_draggable_with_mupliples(self):
+        """Test reusable draggables with mupltiple draggables per target"""
+        user_input = '{"draggables":[{"1":"target1"}, \
+        {"2":"target2"},{"1":"target1"},{"2":"target4"},{"2":"target4"}, \
+        {"3":"target6"}, {"4": "target3"}, {"5": "target4"}, \
+        {"5": "target5"}, {"6": "target2"}]}'
+        correct_answer = [
+        {
+            'draggables': ['1', '4'],
+            'targets': ['target1',  'target3'],
+            'rule': 'anyof'
+        },
+        {
+            'draggables': ['2', '6'],
+            'targets': ['target2', 'target4'],
+            'rule': 'anyof'
+        },
+        {
+            'draggables': ['5'],
+            'targets': ['target4', 'target5'],
+            'rule': 'anyof'
+        },
+        {
+            'draggables': ['3'],
+            'targets': ['target6'],
+            'rule': 'anyof'
+        }]
+        self.assertTrue(draganddrop.grade(user_input, correct_answer))
+
+    def test_reuse_many_draggable_with_mupliples_wrong(self):
+        """Test reusable draggables with mupltiple draggables per target"""
+        user_input = '{"draggables":[{"1":"target1"}, \
+        {"2":"target2"},{"1":"target1"}, \
+        {"2":"target3"}, \
+        {"2":"target4"}, \
+        {"3":"target6"}, {"4": "target3"}, {"5": "target4"}, \
+        {"5": "target5"}, {"6": "target2"}]}'
+        correct_answer = [
+        {
+            'draggables': ['1', '4'],
+            'targets': ['target1',  'target3'],
+            'rule': 'anyof'
+        },
+        {
+            'draggables': ['2', '6'],
+            'targets': ['target2', 'target4'],
+            'rule': 'anyof'
+        },
+        {
+            'draggables': ['5'],
+            'targets': ['target4', 'target5'],
+            'rule': 'anyof'
+        },
+        {
+            'draggables': ['3'],
+            'targets': ['target6'],
+            'rule': 'anyof'
+        }]
+        self.assertFalse(draganddrop.grade(user_input, correct_answer))
+
+    def test_label_10_targets_with_a_b_c_false(self):
+        """Test reusable draggables (no mupltiple draggables per target)"""
+        user_input = '{"draggables":[{"a":"target1"}, \
+        {"b":"target2"},{"c":"target3"},{"a":"target4"},{"b":"target5"}, \
+        {"c":"target6"}, {"a":"target7"},{"b":"target8"},{"c":"target9"}, \
+         {"a":"target1"}]}'
+        correct_answer = [
+        {
+            'draggables': ['a'],
+            'targets': ['target1',  'target4', 'target7', 'target10'],
+            'rule': 'unorderly_equal'
+        },
+        {
+            'draggables': ['b'],
+            'targets': ['target2', 'target5', 'target8'],
+            'rule': 'unorderly_equal'
+        },
+        {
+            'draggables': ['c'],
+            'targets': ['target3', 'target6', 'target9'],
+            'rule': 'unorderly_equal'
+        }]
+        self.assertFalse(draganddrop.grade(user_input, correct_answer))
+
+    def test_label_10_targets_with_a_b_c_(self):
+        """Test reusable draggables (no mupltiple draggables per target)"""
+        user_input = '{"draggables":[{"a":"target1"}, \
+        {"b":"target2"},{"c":"target3"},{"a":"target4"},{"b":"target5"}, \
+        {"c":"target6"}, {"a":"target7"},{"b":"target8"},{"c":"target9"}, \
+         {"a":"target10"}]}'
+        correct_answer = [
+        {
+            'draggables': ['a'],
+            'targets': ['target1',  'target4', 'target7', 'target10'],
+            'rule': 'unorderly_equal'
+        },
+        {
+            'draggables': ['b'],
+            'targets': ['target2', 'target5', 'target8'],
+            'rule': 'unorderly_equal'
+        },
+        {
+            'draggables': ['c'],
+            'targets': ['target3', 'target6', 'target9'],
+            'rule': 'unorderly_equal'
+        }]
+        self.assertTrue(draganddrop.grade(user_input, correct_answer))
+
+    def test_label_10_targets_with_a_b_c_multiple(self):
+        """Test reusable draggables  (mupltiple draggables per target)"""
+        user_input = '{"draggables":[{"a":"target1"}, \
+        {"b":"target2"},{"c":"target3"},{"b":"target5"}, \
+        {"c":"target6"}, {"a":"target7"},{"b":"target8"},{"c":"target9"}, \
+         {"a":"target1"}]}'
+        correct_answer = [
+        {
+            'draggables': ['a', 'a', 'a'],
+            'targets': ['target1',  'target4', 'target7', 'target10'],
+            'rule': 'anyof+number'
+        },
+        {
+            'draggables': ['b', 'b', 'b'],
+            'targets': ['target2', 'target5', 'target8'],
+            'rule': 'anyof+number'
+        },
+        {
+            'draggables': ['c', 'c', 'c'],
+            'targets': ['target3', 'target6', 'target9'],
+            'rule': 'anyof+number'
+        }]
+        self.assertTrue(draganddrop.grade(user_input, correct_answer))
+
+    def test_label_10_targets_with_a_b_c_multiple_false(self):
+        """Test reusable draggables  (mupltiple draggables per target)"""
+        user_input = '{"draggables":[{"a":"target1"}, \
+        {"b":"target2"},{"c":"target3"},{"a":"target4"},{"b":"target5"}, \
+        {"c":"target6"}, {"a":"target7"},{"b":"target8"},{"c":"target9"}, \
+         {"a":"target1"}]}'
+        correct_answer = [
+        {
+            'draggables': ['a', 'a', 'a'],
+            'targets': ['target1',  'target4', 'target7', 'target10'],
+            'rule': 'anyof+number'
+        },
+        {
+            'draggables': ['b', 'b', 'b'],
+            'targets': ['target2', 'target5', 'target8'],
+            'rule': 'anyof+number'
+        },
+        {
+            'draggables': ['c', 'c', 'c'],
+            'targets': ['target3', 'target6', 'target9'],
+            'rule': 'anyof+number'
+        }]
+        self.assertFalse(draganddrop.grade(user_input, correct_answer))
+
+    def test_label_10_targets_with_a_b_c_reused(self):
+        """Test reusable draggables (no mupltiple draggables per target)"""
+        user_input = '{"draggables":[{"a":"target1"}, \
+        {"b":"target2"},{"c":"target3"},{"b":"target5"}, \
+        {"c":"target6"}, {"b":"target8"},{"c":"target9"}, \
+         {"a":"target10"}]}'
+        correct_answer = [
+        {
+            'draggables': ['a', 'a'],
+            'targets': ['target1',   'target10'],
+            'rule': 'unorderly_equal+number'
+        },
+        {
+            'draggables': ['b', 'b', 'b'],
+            'targets': ['target2', 'target5', 'target8'],
+            'rule': 'unorderly_equal+number'
+        },
+        {
+            'draggables': ['c', 'c', 'c'],
+            'targets': ['target3', 'target6', 'target9'],
+            'rule': 'unorderly_equal+number'
+        }]
+        self.assertTrue(draganddrop.grade(user_input, correct_answer))
+
+    def test_label_10_targets_with_a_b_c_reused_false(self):
+        """Test reusable draggables (no mupltiple draggables per target)"""
+        user_input = '{"draggables":[{"a":"target1"}, \
+        {"b":"target2"},{"c":"target3"},{"b":"target5"}, {"a":"target8"},\
+        {"c":"target6"}, {"b":"target8"},{"c":"target9"}, \
+         {"a":"target10"}]}'
+        correct_answer = [
+        {
+            'draggables': ['a', 'a'],
+            'targets': ['target1',   'target10'],
+            'rule': 'unorderly_equal+number'
+        },
+        {
+            'draggables': ['b', 'b', 'b'],
+            'targets': ['target2', 'target5', 'target8'],
+            'rule': 'unorderly_equal+number'
+        },
+        {
+            'draggables': ['c', 'c', 'c'],
+            'targets': ['target3', 'target6', 'target9'],
+            'rule': 'unorderly_equal+number'
+        }]
+        self.assertFalse(draganddrop.grade(user_input, correct_answer))
 
 class Test_DragAndDrop_Populate(unittest.TestCase):
 
@@ -273,9 +527,10 @@ class Test_DraAndDrop_Compare_Positions(unittest.TestCase):
 def suite():
 
     testcases = [Test_PositionsCompare,
-                 Test_DragAndDrop_Populate,
-                 Test_DragAndDrop_Grade,
-                 Test_DraAndDrop_Compare_Positions]
+                   Test_DragAndDrop_Populate,
+                   Test_DragAndDrop_Grade,
+                   Test_DraAndDrop_Compare_Positions
+                 ]
     suites = []
     for testcase in testcases:
         suites.append(unittest.TestLoader().loadTestsFromTestCase(testcase))

From e017297d3f4087faac1c0e2742c71dbd5c40ae02 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 16 Jan 2013 16:18:06 +0200
Subject: [PATCH 506/541] fix

---
 common/lib/capa/capa/verifiers/draganddrop.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/lib/capa/capa/verifiers/draganddrop.py b/common/lib/capa/capa/verifiers/draganddrop.py
index 7ad1ce35eb..91d5759390 100644
--- a/common/lib/capa/capa/verifiers/draganddrop.py
+++ b/common/lib/capa/capa/verifiers/draganddrop.py
@@ -206,6 +206,8 @@ class DragAndDrop(object):
         Returns: True if within rule lists are equal, otherwise False.
         """
         if flag == 'exact':
+            if len(correct) != len(user):
+                return False
             for el1, el2 in zip(correct, user):
                 if PositionsCompare(el1) != PositionsCompare(el2):
                     return False

From a6f87dcfdcd86fd552d80155fed592b7d6172482 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 16 Jan 2013 16:18:21 +0200
Subject: [PATCH 507/541] updated docs

---
 docs/source/drag_and_drop_input.rst | 125 ++++++++++++++++++++++++++++
 1 file changed, 125 insertions(+)

diff --git a/docs/source/drag_and_drop_input.rst b/docs/source/drag_and_drop_input.rst
index 3675de9c96..169d6883f5 100644
--- a/docs/source/drag_and_drop_input.rst
+++ b/docs/source/drag_and_drop_input.rst
@@ -42,6 +42,8 @@ attributes::
     id - Unique identifier of the draggable object.
     label - Human readable label that will be shown to the user.
     icon - Relative path to an image that will be shown to the user.
+    can_reuse - true or false, default is false. If true, same draggable can be
+    used multiple times.
 
 A draggable is what the user must drag out of the slider and place onto the
 base image. After a drag operation, if the center of the draggable ends up
@@ -81,6 +83,129 @@ the slider.
 If no targets are provided, then a draggable can be dragged and placed anywhere
 on the base image.
 
+correct answer format
+---------------------
+
+There are two correct answer formats: short and long
+If short from correct answer is mapping of 'draggable_id' to 'target_id'::
+
+    correct_answer = {'grass':     [[300, 200], 200], 'ant': [[500, 0], 200]}
+    correct_answer = {'name4': 't1', '7': 't2'}
+
+In long form correct answer is list of dicts. Every dict has 3 keys:
+draggables, targets and rule. For example::
+
+    correct_answer = [
+    {
+    'draggables':   ['7', '8'],
+    'targets':  ['t5_c', 't6_c'],
+    'rule': 'anyof'
+    },
+    {
+    'draggables': ['1', '2'],
+    'targets': ['t2_h', 't3_h', 't4_h', 't7_h', 't8_h', 't10_h'],
+    'rule': 'anyof'
+    }]
+
+Draggables is list of draggables id. Target is list of targets id, draggables
+must be dragged to with considering rule. Rule is string.
+
+Draggables in dicts inside correct_answer list must not intersect.
+Wrong (for draggable id 7)::
+
+    correct_answer = [
+    {
+    'draggables':   ['7', '8'],
+    'targets':  ['t5_c', 't6_c'],
+    'rule': 'anyof'
+    },
+    {
+    'draggables': ['7', '2'],
+    'targets': ['t2_h', 't3_h', 't4_h', 't7_h', 't8_h', 't10_h'],
+    'rule': 'anyof'
+    }]
+
+Rules are: exact, anyof, unorderly_equal, anyof+number, unorderly_equal+number
+
+- Exact rule means that targets for draggable id's in user_answer are the same
+that targets from correct answer. For example, for draggables 7 and 8 user must
+drag 7 to target1 and 8 to target2 if correct_answer is::
+
+    correct_answer = [
+    {
+    'draggables':   ['7', '8'],
+    'targets':  ['tartget1', 'target2'],
+    'rule': 'exact'
+    }]
+
+
+- Unorderly_equal rule allows draggables be dragged to targets unorderly. If one
+want to allow for student to drag 7 to target1 or target2 and 8 to target2 or
+target 1 and 7 and 8 must be in different targets, then correct answer must be::
+
+    correct_answer = [
+    {
+    'draggables':   ['7', '8'],
+    'targets':  ['tartget1', 'target2'],
+    'rule': 'unorderly_equal'
+    }]
+
+- Anyof rule allows draggables to be dragged to any of targets. If one want to
+allow for student to drag 7 and 8 to target1 or target2, which means that if 7
+is on target1 and 8 is on target1 or 7 on target2 and 8 on target2 or 7 on
+target1 and 8 on target2. Any of theese are correct which anyof rule::
+
+    correct_answer = [
+    {
+    'draggables':   ['7', '8'],
+    'targets':  ['tartget1', 'target2'],
+    'rule': 'anyof'
+    }]
+
+
+- If you have can_reuse true, then you, for example, have draggables a,b,c and 10
+targets. These will allow you to drag 4 'a' draggables to
+['target1',  'target4', 'target7', 'target10'] , you do not need to write 'a'
+four times. Also this will allow you to drag 'b' draggable to target2 or target5
+or target5 and target2 etc..::
+
+    correct_answer = [
+        {
+            'draggables': ['a'],
+            'targets': ['target1',  'target4', 'target7', 'target10'],
+            'rule': 'unorderly_equal'
+        },
+        {
+            'draggables': ['b'],
+            'targets': ['target2', 'target5', 'target8'],
+            'rule': 'anyof'
+        },
+        {
+            'draggables': ['c'],
+            'targets': ['target3', 'target6', 'target9'],
+            'rule': 'unorderly_equal'
+        }]
+
+And sometimes you want to allow drag only two 'b' draggables, in these case
+you sould use 'anyof+number' of 'unordered_equal+number' rule::
+
+    correct_answer = [
+        {
+            'draggables': ['a', 'a', 'a'],
+            'targets': ['target1',  'target4', 'target7'],
+            'rule': 'unorderly_equal+numbers'
+        },
+        {
+            'draggables': ['b', 'b'],
+            'targets': ['target2', 'target5', 'target8'],
+            'rule': 'anyof+numbers'
+        },
+        {
+            'draggables': ['c'],
+            'targets': ['target3', 'target6', 'target9'],
+            'rule': 'unorderly_equal'
+        }]
+
 
 Example
 =======

From 099c79c8813d730ff9bca58bb36a6110d72ea080 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 16 Jan 2013 16:21:40 +0200
Subject: [PATCH 508/541] update docs

---
 docs/source/drag_and_drop_input.rst | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/docs/source/drag_and_drop_input.rst b/docs/source/drag_and_drop_input.rst
index 169d6883f5..1e5e6bf468 100644
--- a/docs/source/drag_and_drop_input.rst
+++ b/docs/source/drag_and_drop_input.rst
@@ -125,7 +125,7 @@ Wrong (for draggable id 7)::
     'rule': 'anyof'
     }]
 
-Rules are: exact, anyof, unorderly_equal, anyof+number, unorderly_equal+number
+Rules are: exact, anyof, unordered_equal, anyof+number, unordered_equal+number
 
 - Exact rule means that targets for draggable id's in user_answer are the same
 that targets from correct answer. For example, for draggables 7 and 8 user must
@@ -139,7 +139,7 @@ drag 7 to target1 and 8 to target2 if correct_answer is::
     }]
 
 
-- Unorderly_equal rule allows draggables be dragged to targets unorderly. If one
+- unordered_equal rule allows draggables be dragged to targets unordered. If one
 want to allow for student to drag 7 to target1 or target2 and 8 to target2 or
 target 1 and 7 and 8 must be in different targets, then correct answer must be::
 
@@ -147,7 +147,7 @@ target 1 and 7 and 8 must be in different targets, then correct answer must be::
     {
     'draggables':   ['7', '8'],
     'targets':  ['tartget1', 'target2'],
-    'rule': 'unorderly_equal'
+    'rule': 'unordered_equal'
     }]
 
 - Anyof rule allows draggables to be dragged to any of targets. If one want to
@@ -173,7 +173,7 @@ or target5 and target2 etc..::
         {
             'draggables': ['a'],
             'targets': ['target1',  'target4', 'target7', 'target10'],
-            'rule': 'unorderly_equal'
+            'rule': 'unordered_equal'
         },
         {
             'draggables': ['b'],
@@ -183,7 +183,7 @@ or target5 and target2 etc..::
         {
             'draggables': ['c'],
             'targets': ['target3', 'target6', 'target9'],
-            'rule': 'unorderly_equal'
+            'rule': 'unordered_equal'
         }]
 
 And sometimes you want to allow drag only two 'b' draggables, in these case
@@ -193,7 +193,7 @@ you sould use 'anyof+number' of 'unordered_equal+number' rule::
         {
             'draggables': ['a', 'a', 'a'],
             'targets': ['target1',  'target4', 'target7'],
-            'rule': 'unorderly_equal+numbers'
+            'rule': 'unordered_equal+numbers'
         },
         {
             'draggables': ['b', 'b'],
@@ -203,9 +203,11 @@ you sould use 'anyof+number' of 'unordered_equal+number' rule::
         {
             'draggables': ['c'],
             'targets': ['target3', 'target6', 'target9'],
-            'rule': 'unorderly_equal'
+            'rule': 'unordered_equal'
         }]
 
+In case if we have no multiple draggables per targets (one_per_target="true"),
+for same number of draggables, anyof is equal to unordered_equal
 
 Example
 =======

From e47f0e45f2aced4e22cc7d78b96d19df27782a8d Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 16 Jan 2013 16:22:46 +0200
Subject: [PATCH 509/541] unorderly->unordered

---
 common/lib/capa/capa/verifiers/draganddrop.py       | 6 +++---
 common/lib/capa/capa/verifiers/tests_draganddrop.py | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/lib/capa/capa/verifiers/draganddrop.py b/common/lib/capa/capa/verifiers/draganddrop.py
index 91d5759390..9bfbf982ff 100644
--- a/common/lib/capa/capa/verifiers/draganddrop.py
+++ b/common/lib/capa/capa/verifiers/draganddrop.py
@@ -144,7 +144,7 @@ class DragAndDrop(object):
         # every element are equal with correct positions
         for groupname in self.correct_groups:
             rules_executed = 0
-            for rule in ('exact', 'anyof', 'unorderly_equal'):
+            for rule in ('exact', 'anyof', 'unordered_equal'):
                 # every group has only one rule
                 if self.correct_positions[groupname].get(rule, None):
                     rules_executed += 1
@@ -190,7 +190,7 @@ class DragAndDrop(object):
                      - draggables can be placed in any order:
                     user ['1','2','3','4'] is 'anyof' equal to ['4', '2', '1', 3']
 
-            'unorderly_equal' is same as 'exact' but disregards on order
+            'unordered_equal' is same as 'exact' but disregards on order
 
         Equality functions:
 
@@ -220,7 +220,7 @@ class DragAndDrop(object):
                 else:
                     return False
 
-        if flag == 'unorderly_equal':
+        if flag == 'unordered_equal':
             if len(correct) != len(user):
                 return False
             temp = correct[:]
diff --git a/common/lib/capa/capa/verifiers/tests_draganddrop.py b/common/lib/capa/capa/verifiers/tests_draganddrop.py
index 257d404679..cb9fef1865 100644
--- a/common/lib/capa/capa/verifiers/tests_draganddrop.py
+++ b/common/lib/capa/capa/verifiers/tests_draganddrop.py
@@ -343,17 +343,17 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
         {
             'draggables': ['a'],
             'targets': ['target1',  'target4', 'target7', 'target10'],
-            'rule': 'unorderly_equal'
+            'rule': 'unordered_equal'
         },
         {
             'draggables': ['b'],
             'targets': ['target2', 'target5', 'target8'],
-            'rule': 'unorderly_equal'
+            'rule': 'unordered_equal'
         },
         {
             'draggables': ['c'],
             'targets': ['target3', 'target6', 'target9'],
-            'rule': 'unorderly_equal'
+            'rule': 'unordered_equal'
         }]
         self.assertTrue(draganddrop.grade(user_input, correct_answer))
 

From 79f5e98dfca3fc3a9a06e782a5cac3e6b413215a Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Wed, 16 Jan 2013 16:39:00 +0200
Subject: [PATCH 510/541] Drag and Drop: refactoring + preparing for reuse of
 draggables.

---
 .../js/capa/drag_and_drop/base_image.js       |   6 +-
 .../js/capa/drag_and_drop/config_parser.js    | 226 +++++---
 .../js/capa/drag_and_drop/draggables.js       | 149 +++++-
 common/static/js/capa/drag_and_drop/main.js   |   6 +-
 .../static/js/capa/drag_and_drop/targets.js   |   4 +-
 .../js/capa/drag_and_drop/update_input.js     | 488 ++++++------------
 6 files changed, 457 insertions(+), 422 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/base_image.js b/common/static/js/capa/drag_and_drop/base_image.js
index 0b64a7fd65..cd74267690 100644
--- a/common/static/js/capa/drag_and_drop/base_image.js
+++ b/common/static/js/capa/drag_and_drop/base_image.js
@@ -26,7 +26,7 @@ define(['logme'], function (logme) {
 
         state.baseImageEl.attr(
             'src',
-            state.config.base_image
+            state.config.baseImage
         );
         state.baseImageEl.load(function () {
             baseImageElContainer.css('width', this.width);
@@ -43,11 +43,11 @@ define(['logme'], function (logme) {
         });
         state.baseImageEl.error(function () {
             logme(
-                'ERROR: Image "' + state.config.base_image + '" was not found!'
+                'ERROR: Image "' + state.config.baseImage + '" was not found!'
             );
             baseImageElContainer.html(
                 '<span style="color: red;">' +
-                    'ERROR: Image "' + state.config.base_image + '" was not found!' +
+                    'ERROR: Image "' + state.config.baseImage + '" was not found!' +
                 '</span>'
             );
             baseImageElContainer.appendTo(state.containerEl);
diff --git a/common/static/js/capa/drag_and_drop/config_parser.js b/common/static/js/capa/drag_and_drop/config_parser.js
index b87f618bf4..b154a81826 100644
--- a/common/static/js/capa/drag_and_drop/config_parser.js
+++ b/common/static/js/capa/drag_and_drop/config_parser.js
@@ -8,154 +8,218 @@ define(['logme'], function (logme) {
     return configParser;
 
     function configParser(config, state) {
-        var returnStatus;
-
-        returnStatus = true;
-
         state.config = {
             'draggables': [],
+            'baseImage': '',
             'targets': [],
-            'base_image': ''
+            'onePerTarget': null,
+            'targetOutline': true,
+            'labelBgColor': '#d6d6d6',
+
+            'individualTargets': null,
+
+            'errors': 0 // Number of errors found while parsing config.
         };
 
-        if ($.isArray(config.draggables) === true) {
+        getDraggables(state, config);
+        getBaseImage(state, config);
+        getTargets(state, config);
+        getOnePerTarget(state, config);
+        getTargetOutline(state, config);
+        getLabelBgColor(state, config);
+
+        setIndividualTargets(state);
+
+        if (state.config.errors !== 0) {
+            return false;
+        }
+
+        return true;
+    }
+
+    function getDraggables(state, config) {
+        if (config.hasOwnProperty('draggables') === false) {
+            logme('ERROR: "config" does not have a property "draggables".');
+            state.config.errors += 1;
+        } else if ($.isArray(config.draggables) === true) {
             (function (i) {
                 while (i < config.draggables.length) {
-                    if (processDraggable(config.draggables[i]) !== true) {
-                        returnStatus = false;
+                    if (processDraggable(state, config.draggables[i]) !== true) {
+                        state.config.errors += 1;
                     }
                     i += 1;
                 }
             }(0));
         } else if ($.isPlainObject(config.draggables) === true) {
-            if (processDraggable(config.draggables) !== true) {
-                returnStatus = false;
+            if (processDraggable(state, config.draggables) !== true) {
+                state.config.errors += 1;
             }
         } else {
             logme('ERROR: The type of config.draggables is no supported.');
-            returnStatus = false;
+            state.config.errors += 1;
         }
+    }
 
-        if (typeof config.base_image === 'string') {
-            state.config.base_image = config.base_image;
+    function getBaseImage(state, config) {
+        if (config.hasOwnProperty('base_image') === false) {
+            logme('ERROR: "config" does not have a property "base_image".');
+            state.config.errors += 1;
+        } else if (typeof config.base_image === 'string') {
+            state.config.baseImage = config.base_image;
         } else {
             logme('ERROR: Property config.base_image is not of type "string".');
-            returnStatus = false;
+            state.config.errors += 1;
         }
+    }
 
-        if ($.isArray(config.targets) === true) {
+    function getTargets(state, config) {
+        if (config.hasOwnProperty('targets') === false) {
+            // It is possible that no "targets" were specified. This is not an error.
+            // In this case the default value of "[]" (empty array) will be used.
+            // Draggables can be positioned anywhere on the image, and the server will
+            // get an answer in the form of (x, y) coordinates for each draggable.
+        } else if ($.isArray(config.targets) === true) {
             (function (i) {
                 while (i < config.targets.length) {
-                    if (processTarget(config.targets[i]) !== true) {
-                        returnStatus = false;
+                    if (processTarget(state, config.targets[i]) !== true) {
+                        state.config.errors += 1;
                     }
                     i += 1;
                 }
             }(0));
         } else if ($.isPlainObject(config.targets) === true) {
-            if (processTarget(config.targets) !== true) {
-                returnStatus = false;
+            if (processTarget(state, config.targets) !== true) {
+                state.config.errors += 1;
             }
-        } else if (typeof config.targets !== 'undefined') {
+        } else {
             logme('ERROR: Property config.targets is not of a supported type.');
-            returnStatus = false;
+            state.config.errors += 1;
         }
+    }
 
-        if (typeof config.one_per_target === 'string') {
+    function getOnePerTarget(state, config) {
+        if (config.hasOwnProperty('one_per_target') === false) {
+            logme('ERROR: "config" does not have a property "one_per_target".');
+            state.config.errors += 1;
+        } else if (typeof config.one_per_target === 'string') {
             if (config.one_per_target.toLowerCase() === 'true') {
-                state.config.one_per_target = true;
+                state.config.onePerTarget = true;
             } else if (config.one_per_target.toLowerCase() === 'false') {
-                state.config.one_per_target = false;
+                state.config.onePerTarget = false;
             } else {
                 logme('ERROR: Property config.one_per_target can either be "true", or "false".');
-                returnStatus = false;
+                state.config.errors += 1;
             }
-        } else if (typeof config.one_per_target !== 'undefined') {
+        } else {
             logme('ERROR: Property config.one_per_target is not of a supported type.');
-            returnStatus = false;
+            state.config.errors += 1;
         }
+    }
 
-        if (typeof config.target_outline === 'string') {
+    function getTargetOutline(state, config) {
+        if (config.hasOwnProperty('target_outline') === false) {
+            // It is possible that no "target_outline" was specified. This is not an error.
+            // In this case the default value of 'true' (boolean) will be used.
+        } else if (typeof config.target_outline === 'string') {
             if (config.target_outline.toLowerCase() === 'true') {
                 state.config.targetOutline = true;
             } else if (config.target_outline.toLowerCase() === 'false') {
                 state.config.targetOutline = false;
             } else {
                 logme('ERROR: Property config.target_outline can either be "true", or "false".');
-                returnStatus = false;
+                state.config.errors += 1;
             }
-        } else if (typeof config.target_outline !== 'undefined') {
+        } else {
             logme('ERROR: Property config.target_outline is not of a supported type.');
-            returnStatus = false;
+            state.config.errors += 1;
         }
+    }
 
-        state.config.labelBgColor = '#d6d6d6';
-        if (typeof config.label_bg_color === 'string') {
+    function getLabelBgColor(state, config) {
+        if (config.hasOwnProperty('label_bg_color') === false) {
+            // It is possible that no "label_bg_color" was specified. This is not an error.
+            // In this case the default value of '#d6d6d6' (string) will be used.
+        } else if (typeof config.label_bg_color === 'string') {
             state.config.labelBgColor = config.label_bg_color;
-        } else if (typeof config.label_bg_color !== 'undefined') {
+        } else {
             logme('ERROR: Property config.label_bg_color is not of a supported type.');
             returnStatus = false;
         }
+    }
 
+    function setIndividualTargets(state) {
         if (state.config.targets.length === 0) {
-            state.individualTargets = false;
+            state.config.individualTargets = false;
         } else {
-            state.individualTargets = true;
+            state.config.individualTargets = true;
+        }
+    }
+
+    function processDraggable(state, obj) {
+        if (!attrIsString(obj, 'id')) {
+            return false;
+        }
+
+        if (!attrIsString(obj, 'icon')) {
+            return false;
+        }
+        if (!attrIsString(obj, 'label')) {
+            return false;
+        }
+
+        state.config.draggables.push(obj);
+
+        return true;
+    }
+
+    function processTarget(state, obj) {
+        if (!attrIsString(obj, 'id')) {
+            return false;
+        }
+
+        if (!attrIsInteger(obj, 'w')) {
+            return false;
+        }
+        if (!attrIsInteger(obj, 'h')) {
+            return false;
+        }
+
+        if (!attrIsInteger(obj, 'x')) {
+            return false;
+        }
+        if (!attrIsInteger(obj, 'y')) {
+            return false;
+        }
+
+        state.config.targets.push(obj);
+
+        return true;
+    }
+
+    function attrIsString(obj, attr) {
+        if (typeof obj[attr] !== 'string') {
+            logme('ERROR: Attribute "obj.' + attr + '" is not a string.');
+
+            return false;
         }
 
         return true;
+    }
 
-        function processDraggable(obj) {
-            if (!attrIsString(obj, 'id')) { return false; }
+    function attrIsInteger(obj, attr) {
+        var tempInt;
 
-            if (!attrIsString(obj, 'icon')) { return false; }
-            if (!attrIsString(obj, 'label')) { return false; }
+        tempInt = parseInt(obj[attr], 10);
 
-            state.config.draggables.push(obj);
+        if (isFinite(tempInt) === false) {
+            logme('ERROR: Attribute "obj.' + attr + '" is not an integer.');
 
-            true;
+            return false;
         }
 
-        function processTarget(obj) {
-            if (!attrIsString(obj, 'id')) { return false; }
+        obj[attr] = tempInt;
 
-            if (!attrIsInteger(obj, 'w')) { return false; }
-            if (!attrIsInteger(obj, 'h')) { return false; }
-
-            if (!attrIsInteger(obj, 'x')) { return false; }
-            if (!attrIsInteger(obj, 'y')) { return false; }
-
-            state.config.targets.push(obj);
-
-            true;
-
-        }
-
-        function attrIsString(obj, attr) {
-            if (typeof obj[attr] !== 'string') {
-                logme('ERROR: Attribute "obj.' + attr + '" is not a string.');
-
-                return false;
-            }
-
-            return true;
-        }
-
-        function attrIsInteger(obj, attr) {
-            var tempInt;
-
-            tempInt = parseInt(obj[attr], 10);
-
-            if (isFinite(tempInt) === false) {
-                logme('ERROR: Attribute "obj.' + attr + '" is not an integer.');
-
-                return false;
-            }
-
-            obj[attr] = tempInt;
-
-            return true;
-        }
+        return true;
     }
 });
 
diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index 5065e7193b..4c4585d121 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -10,8 +10,6 @@ define(['logme', 'update_input'], function (logme, updateInput) {
     };
 
     function init(state) {
-        logme('Draggables.init; state = ', state);
-
         state.draggables = [];
         state.numDraggablesInSlider = 0;
         state.currentMovingDraggable = null;
@@ -65,13 +63,137 @@ define(['logme', 'update_input'], function (logme, updateInput) {
         }
     }
 
+    function moveDraggableToXY(newPosition) {
+        var self, offset;
+
+        if (this.hasLoaded === false) {
+            self = this;
+
+            setTimeout(function () {
+                self.moveDraggableToXY(newPosition);
+            }, 50);
+
+            return;
+        }
+
+        offset = 0;
+        if (this.state.config.targetOutline === true) {
+            offset = 1;
+        }
+
+        this.inContainer = false;
+        this.containerEl.hide();
+
+        this.iconEl.detach();
+        this.iconEl.css('background-color', this.iconElBGColor);
+        this.iconEl.css('padding-left', this.iconElPadding);
+        this.iconEl.css('padding-right', this.iconElPadding);
+        this.iconEl.css('border', this.iconElBorder);
+        this.iconEl.css('width', this.iconWidth);
+        this.iconEl.css('height', this.iconHeight);
+        this.iconEl.css(
+            'left',
+            newPosition.x - this.iconWidth * 0.5 + offset - this.iconElLeftOffset
+        );
+        this.iconEl.css(
+            'top',
+            newPosition.y - this.iconHeight * 0.5 + offset
+        );
+        this.iconEl.appendTo(this.state.baseImageEl.parent());
+
+        if (this.labelEl !== null) {
+            this.labelEl.detach();
+            this.labelEl.css('background-color', this.state.config.labelBgColor);
+            this.labelEl.css('padding-left', 8);
+            this.labelEl.css('padding-right', 8);
+            this.labelEl.css('border', '1px solid black');
+            this.labelEl.css(
+                'left',
+                newPosition.x - this.labelWidth * 0.5 + offset - 9 // Account for padding, border.
+            );
+            this.labelEl.css(
+                'top',
+                newPosition.y - this.iconHeight * 0.5 + this.iconHeight + 5 + offset
+            );
+            this.labelEl.appendTo(this.state.baseImageEl.parent());
+        }
+
+        this.x = newPosition.x;
+        this.y = newPosition.y;
+
+        this.state.numDraggablesInSlider -= 1;
+        this.state.updateArrowOpacity();
+    }
+
+    function moveDraggableToTarget(target) {
+        var self, offset;
+
+        if (this.hasLoaded === false) {
+            self = this;
+
+            setTimeout(function () {
+                self.moveDraggableToTarget(target);
+            }, 50);
+
+            return;
+        }
+
+        offset = 0;
+        if (this.state.config.targetOutline === true) {
+            offset = 1;
+        }
+
+        this.inContainer = false;
+        this.containerEl.hide();
+
+        this.iconEl.detach();
+        this.iconEl.css('background-color', this.iconElBGColor);
+        this.iconEl.css('padding-left', this.iconElPadding);
+        this.iconEl.css('padding-right', this.iconElPadding);
+        this.iconEl.css('border', this.iconElBorder);
+        this.iconEl.css('width', this.iconWidth);
+        this.iconEl.css('height', this.iconHeight);
+        this.iconEl.css(
+            'left',
+            target.offset.left + 0.5 * target.w - this.iconWidth * 0.5 + offset - this.iconElLeftOffset
+        );
+        this.iconEl.css(
+            'top',
+            target.offset.top + 0.5 * target.h - this.iconHeight * 0.5 + offset
+        );
+        this.iconEl.appendTo(this.state.baseImageEl.parent());
+
+        if (this.labelEl !== null) {
+            this.labelEl.detach();
+            this.labelEl.css('background-color', this.state.config.labelBgColor);
+            this.labelEl.css('padding-left', 8);
+            this.labelEl.css('padding-right', 8);
+            this.labelEl.css('border', '1px solid black');
+            this.labelEl.css(
+                'left',
+                target.offset.left + 0.5 * target.w - this.labelWidth * 0.5 + offset - 9 // Account for padding, border.
+            );
+            this.labelEl.css(
+                'top',
+                target.offset.top + 0.5 * target.h + this.iconHeight * 0.5 + 5 + offset
+            );
+            this.labelEl.appendTo(this.state.baseImageEl.parent());
+        }
+
+        this.onTarget = target;
+        target.draggable.push(this.id);
+
+        if (target.numTextEl !== null) {
+            target.updateNumTextEl();
+        }
+
+        this.state.numDraggablesInSlider -= 1;
+        this.state.updateArrowOpacity();
+    }
+
     function processDraggable(state, obj, objIndex) {
         var draggableObj;
 
-        logme('processDraggable; state = ', state);
-
-        logme('Processing draggable #' + objIndex);
-
         draggableObj = {
             'zIndex': objIndex,
             'oldZIndex': objIndex,
@@ -91,7 +213,10 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             'checkIfOnTarget': checkIfOnTarget,
             'snapToTarget': snapToTarget,
             'correctZIndexes': correctZIndexes,
-            'moveBackToSlider': moveBackToSlider
+            'moveBackToSlider': moveBackToSlider,
+
+            'moveDraggableToTarget': moveDraggableToTarget,
+            'moveDraggableToXY': moveDraggableToXY
         };
 
         draggableObj.containerEl = $(
@@ -334,7 +459,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         this.iconHeight * 0.5
                 );
                 this.iconEl.appendTo(
-                    state.baseImageEl.parent()
+                    this.state.baseImageEl.parent()
                 );
 
                 if (this.labelEl !== null) {
@@ -447,7 +572,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
         this.mousePressed = false;
         positionIE = this.iconEl.position();
 
-        if (this.state.individualTargets === true) {
+        if (this.state.config.individualTargets === true) {
             if (this.checkIfOnTarget(positionIE) === true) {
                 this.correctZIndexes();
             } else {
@@ -486,7 +611,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
         }
 
         this.state.updateArrowOpacity();
-        updateInput(this.state);
+        updateInput.update(this.state);
     }
 
     function removeObjIdFromTarget() {
@@ -532,7 +657,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             // (with an ID different from the one we are checking
             // against), then go to next target.
             if (
-                (this.state.config.one_per_target === true) &&
+                (this.state.config.onePerTarget === true) &&
                 (target.draggable.length === 1) &&
                 (target.draggable[0] !== this.id)
             ) {
@@ -652,7 +777,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
     function correctZIndexes() {
         var draggablesInMe, c1, c2, highestZIndex;
 
-        if (this.state.individualTargets === true) {
+        if (this.state.config.individualTargets === true) {
             if (this.onTarget.draggable.length > 0) {
                 draggablesInMe = [];
 
diff --git a/common/static/js/capa/drag_and_drop/main.js b/common/static/js/capa/drag_and_drop/main.js
index 6b1164b6df..900ea34e15 100644
--- a/common/static/js/capa/drag_and_drop/main.js
+++ b/common/static/js/capa/drag_and_drop/main.js
@@ -65,11 +65,11 @@ define(
             Scroller(state);
             Draggables.init(state);
 
-            logme('After Draggables.init(state); state = ', state);
-
             // Update the input element, checking first that it is not filled with
             // an answer from the server.
-            updateInput(state, true);
+            if (updateInput.check(state) === false) {
+                updateInput.update(state);
+            }
         }());
     }
 });
diff --git a/common/static/js/capa/drag_and_drop/targets.js b/common/static/js/capa/drag_and_drop/targets.js
index af27c186f2..dbec5e199d 100644
--- a/common/static/js/capa/drag_and_drop/targets.js
+++ b/common/static/js/capa/drag_and_drop/targets.js
@@ -45,7 +45,7 @@ define(['logme'], function (logme) {
                 event.preventDefault();
             });
 
-            if (state.config.one_per_target === false) {
+            if (state.config.onePerTarget === false) {
                 numTextEl = $(
                     '<div ' +
                         'style=" ' +
@@ -86,7 +86,7 @@ define(['logme'], function (logme) {
                 'updateNumTextEl': updateNumTextEl
             };
 
-            if (state.config.one_per_target === false) {
+            if (state.config.onePerTarget === false) {
                 numTextEl.appendTo(state.baseImageEl.parent());
                 numTextEl.mousedown(function (event) {
                     event.preventDefault();
diff --git a/common/static/js/capa/drag_and_drop/update_input.js b/common/static/js/capa/drag_and_drop/update_input.js
index 14534f1240..6c2b72f6c2 100644
--- a/common/static/js/capa/drag_and_drop/update_input.js
+++ b/common/static/js/capa/drag_and_drop/update_input.js
@@ -5,363 +5,209 @@
 (function (requirejs, require, define) {
 
 define(['logme'], function (logme) {
-    return updateInput;
+    return {
+        'check': check,
+        'update': update
+    };
 
-    function updateInput(state, checkFirst) {
-        var inputEl, stateStr, targets, draggables, c1, c2, tempObj;
+    function update(state) {
+        var draggables, tempObj;
 
-        logme('updateInput; state = ', state);
-
-        if (checkFirst === true) {
-            if (checkIfHasAnswer() === true) {
-                return;
-            }
-        }
+        logme('state.problemId = ' + state.problemId);
 
         draggables = [];
 
-        if (state.individualTargets === false) {
-            for (c1 = 0; c1 < state.draggables.length; c1++) {
-                if (state.draggables[c1].x !== -1) {
-                    tempObj = {};
-                    tempObj[state.draggables[c1].id] = [
-                        state.draggables[c1].x,
-                        state.draggables[c1].y
-                    ];
+        if (state.config.individualTargets === false) {
+            (function (c1) {
+                while (c1 < state.draggables.length) {
+                    if (state.draggables[c1].x !== -1) {
+                        tempObj = {};
+                        tempObj[state.draggables[c1].id] = [
+                            state.draggables[c1].x,
+                            state.draggables[c1].y
+                        ];
+                        draggables.push(tempObj);
+                        tempObj = null;
+                    }
 
-                    draggables.push(tempObj);
+                    c1 += 1;
                 }
-            }
-
-            stateStr = JSON.stringify({
-                'use_targets': false,
-                'draggables': draggables
-            });
+            }(0));
         } else {
-            for (c1 = 0; c1 < state.targets.length; c1++) {
-                for (c2 = 0; c2 < state.targets[c1].draggable.length; c2++) {
-                    tempObj = {};
-                    tempObj[state.targets[c1].draggable[c2]] =
-                        state.targets[c1].id;
+            (function (c1) {
+                while (c1 < state.targets.length) {
+                    (function (c2) {
+                        while (c2 < state.targets[c1].draggable.length) {
+                            tempObj = {};
+                            tempObj[state.targets[c1].draggable[c2]] = state.targets[c1].id;
+                            draggables.push(tempObj);
+                            tempObj = null;
 
-                    draggables.push(tempObj);
+                            c2 += 1;
+                        }
+                    }(0));
+
+                    c1 += 1;
                 }
-            }
-
-            stateStr = JSON.stringify({
-                'use_targets': true,
-                'draggables': draggables
-            });
+            }(0));
         }
 
-        inputEl = $('#input_' + state.problemId);
-        inputEl.val(stateStr);
+        $('#input_' + state.problemId).val(JSON.stringify({'draggables': draggables}));
+    }
 
-        return;
+    // Check if input has an answer from server. If yes, then position
+    // all draggables according to answer.
+    function check(state) {
+        var inputElVal;
 
-        // Check if input has an answer from server. If yes, then position
-        // all draggables according to answer.
-        function checkIfHasAnswer() {
-            var inputElVal;
-
-            inputElVal = $('#input_' + state.problemId).val();
-            if (inputElVal.length === 0) {
-                return false;
-            }
-
-            repositionDraggables(JSON.parse(inputElVal));
-
-            return true;
+        inputElVal = $('#input_' + state.problemId).val();
+        if (inputElVal.length === 0) {
+            return false;
         }
 
-        function repositionDraggables(answer) {
-            var draggableId, draggable, targetId, target, c1, offset;
+        repositionDraggables(state, JSON.parse(inputElVal));
 
-            offset = 0;
-            if (state.config.targetOutline === true) {
-                offset = 1;
+        return true;
+    }
+
+    function getUseTargets(answer) {
+        if ($.isArray(answer.draggables) === false) {
+            logme('ERROR: answer.draggables is not an array.');
+
+            return;
+        } else if (answer.draggables.length === 0) {
+            return;
+        }
+
+        if ($.isPlainObject(answer.draggables[0]) === false) {
+            logme('ERROR: answer.draggables array does not contain objects.');
+
+            return;
+        }
+
+        for (c1 in answer.draggables[0]) {
+            if (answer.draggables[0].hasOwnProperty(c1) === false) {
+                continue;
             }
 
-            if (
-                (
-                    (typeof answer.use_targets === 'boolean') &&
-                    (answer.use_targets === true)
-                ) ||
-                (
-                    (typeof answer.use_targets === 'string') &&
-                    (answer.use_targets === 'true')
-                )
-            ) {
-                for (c1 = 0; c1 < answer.draggables.length; c1++) {
-                    for (draggableId in answer.draggables[c1]) {
-                        if (
-                            (draggable = getDraggableById(draggableId)) ===
-                            null
-                        ) {
-                            logme(
-                                'ERROR: In answer there exists a ' +
-                                'draggable ID "' + draggableId + '". No ' +
-                                'draggable with this ID could be found.'
-                            );
+            if (typeof answer.draggables[0][c1] === 'string') {
+                // use_targets = true;
 
-                            continue;
-                        }
-
-                        targetId = answer.draggables[c1][draggableId];
-                        if ((target = getTargetById(targetId)) === null) {
-                            logme(
-                                'ERROR: In answer there exists a target ' +
-                                'ID "' + targetId + '". No target with this ' +
-                                'ID could be found.'
-                            );
-
-                            continue;
-                        }
-
-                        (function (draggableId, draggable, targetId, target) {
-                            moveDraggableToBaseImage();
-                            return;
-
-                            function moveDraggableToBaseImage() {
-                                if (draggable.hasLoaded === false) {
-                                    setTimeout(moveDraggableToBaseImage, 50);
-                                    return;
-                                }
-
-                                draggable.inContainer = false;
-                                draggable.containerEl.hide();
-
-                                draggable.iconEl.detach();
-                                draggable.iconEl.css(
-                                    'background-color', draggable.iconElBGColor
-                                );
-                                draggable.iconEl.css(
-                                    'padding-left', draggable.iconElPadding
-                                );
-                                draggable.iconEl.css(
-                                    'padding-right', draggable.iconElPadding
-                                );
-                                draggable.iconEl.css(
-                                    'border', draggable.iconElBorder
-                                );
-                                draggable.iconEl.css(
-                                    'width',
-                                    draggable.iconWidth
-                                );
-                                draggable.iconEl.css(
-                                    'height',
-                                    draggable.iconHeight
-                                );
-                                draggable.iconEl.css(
-                                    'left',
-                                    target.offset.left + 0.5 * target.w -
-                                        draggable.iconWidth * 0.5 + offset
-                                        - draggable.iconElLeftOffset
-                                );
-                                draggable.iconEl.css(
-                                    'top',
-                                    target.offset.top + 0.5 * target.h -
-                                        draggable.iconHeight * 0.5 + offset
-                                );
-                                draggable.iconEl.appendTo(
-                                    state.baseImageEl.parent()
-                                );
-
-                                if (draggable.labelEl !== null) {
-                                    draggable.labelEl.detach();
-                                    draggable.labelEl.css(
-                                        'background-color', state.config.labelBgColor
-                                    );
-                                    draggable.labelEl.css(
-                                        'padding-left', 8
-                                    );
-                                    draggable.labelEl.css(
-                                        'padding-right', 8
-                                    );
-                                    draggable.labelEl.css(
-                                        'border', '1px solid black'
-                                    );
-                                    draggable.labelEl.css(
-                                        'left',
-                                        target.offset.left + 0.5 * target.w -
-                                            draggable.labelWidth * 0.5 + offset
-                                            - 9 // Account for padding, border.
-                                    );
-                                    draggable.labelEl.css(
-                                        'top',
-                                        target.offset.top + 0.5 * target.h +
-                                            draggable.iconHeight * 0.5 + 5 +
-                                            offset
-                                    );
-                                    draggable.labelEl.appendTo(
-                                        state.baseImageEl.parent()
-                                    );
-                                }
-
-                                draggable.onTarget = target;
-                                target.draggable.push(draggableId);
-
-                                if (target.numTextEl !== null) {
-                                    target.updateNumTextEl();
-                                }
-
-                                state.numDraggablesInSlider -= 1;
-                                state.updateArrowOpacity();
-                            }
-                        }(draggableId, draggable, targetId, target));
-                    }
-                }
+                return true;
             } else if (
-                (
-                    (typeof answer.use_targets === 'boolean') &&
-                    (answer.use_targets === false)
-                ) ||
-                (
-                    (typeof answer.use_targets === 'string') &&
-                    (answer.use_targets === 'false')
-                )
+                ($.isArray(answer.draggables[0][c1]) === true) &&
+                (answer.draggables[0][c1].length === 2)
             ) {
-                for (c1 = 0; c1 < answer.draggables.length; c1++) {
-                    for (draggableId in answer.draggables[c1]) {
-                        if (
-                            (draggable = getDraggableById(draggableId)) ===
-                            null
-                           ) {
-                            logme(
-                                'ERROR: In answer there exists a ' +
-                                'draggable ID "' + draggableId + '". No ' +
-                                'draggable with this ID could be found.'
-                            );
+                // use_targets = false;
 
-                            continue;
-                        }
-
-                        (function (c1, draggableId, draggable) {
-                            moveDraggableToBaseImage();
-                            return;
-
-                            function moveDraggableToBaseImage() {
-                                if (draggable.hasLoaded === false) {
-                                    setTimeout(moveDraggableToBaseImage, 50);
-                                    return;
-                                }
-
-                                draggable.inContainer = false;
-                                draggable.containerEl.hide();
-
-                                draggable.iconEl.detach();
-                                draggable.iconEl.css(
-                                    'background-color', draggable.iconElBGColor
-                                );
-                                draggable.iconEl.css(
-                                    'padding-left', draggable.iconElPadding
-                                );
-                                draggable.iconEl.css(
-                                    'padding-right', draggable.iconElPadding
-                                );
-                                draggable.iconEl.css(
-                                    'border', draggable.iconElBorder
-                                );
-                                draggable.iconEl.css(
-                                    'width',
-                                    draggable.iconWidth
-                                );
-                                draggable.iconEl.css(
-                                    'height',
-                                    draggable.iconHeight
-                                );
-                                draggable.iconEl.css(
-                                    'left',
-                                    answer.draggables[c1][draggableId][0] -
-                                        draggable.iconWidth * 0.5 + offset
-                                        - draggable.iconElLeftOffset
-                                );
-                                draggable.iconEl.css(
-                                    'top',
-                                    answer.draggables[c1][draggableId][1] -
-                                        draggable.iconHeight * 0.5 + offset
-                                );
-                                draggable.iconEl.appendTo(
-                                    state.baseImageEl.parent()
-                                );
-
-                                if (draggable.labelEl !== null) {
-                                    draggable.labelEl.detach();
-                                    draggable.labelEl.css(
-                                        'background-color', state.config.labelBgColor
-                                    );
-                                    draggable.labelEl.css(
-                                        'padding-left', 8
-                                    );
-                                    draggable.labelEl.css(
-                                        'padding-right', 8
-                                    );
-                                    draggable.labelEl.css(
-                                        'border', '1px solid black'
-                                    );
-                                    draggable.labelEl.css(
-                                        'left',
-                                        answer.draggables[c1][draggableId][0] -
-                                            draggable.labelWidth * 0.5 + offset
-                                            - 9 // Account for padding, border.
-                                    );
-                                    draggable.labelEl.css(
-                                        'top',
-                                        answer.draggables[c1][draggableId][1] -
-                                            draggable.iconHeight * 0.5 +
-                                            draggable.iconHeight + 5 + offset
-                                    );
-                                    draggable.labelEl.appendTo(
-                                        state.baseImageEl.parent()
-                                    );
-                                }
-
-                                draggable.x =
-                                    answer.draggables[c1][draggableId][0];
-                                draggable.y =
-                                    answer.draggables[c1][draggableId][1];
-
-                                state.numDraggablesInSlider -= 1;
-                                state.updateArrowOpacity();
-                            }
-                        }(c1, draggableId, draggable));
-                    }
-                }
+                return false;
             } else {
-                logme(
-                    'ERROR: The type of answer.targets is not supported. ' +
-                    'answer.targets = ', answer.targets
-                );
+                logme('ERROR: answer.draggables[0] is inconsidtent.');
 
                 return;
             }
         }
 
+        logme('ERROR: answer.draggables[0] is an empty object.');
+
         return;
+    }
 
-        function getDraggableById(id) {
-            var c1;
+    function processAnswerTargets(state, answer) {
+        var draggableId, draggable, targetId, target;
 
-            for (c1 = 0; c1 < state.draggables.length; c1 += 1) {
-                if (state.draggables[c1].id === id) {
-                    return state.draggables[c1];
+        (function (c1) {
+            while (c1 < answer.draggables.length) {
+                for (draggableId in answer.draggables[c1]) {
+                    if (answer.draggables[c1].hasOwnProperty(draggableId) === false) {
+                        continue;
+                    }
+
+                    if ((draggable = getById(state, 'draggables', draggableId)) === null) {
+                        logme(
+                            'ERROR: In answer there exists a ' +
+                            'draggable ID "' + draggableId + '". No ' +
+                            'draggable with this ID could be found.'
+                        );
+
+                        continue;
+                    }
+
+                    targetId = answer.draggables[c1][draggableId];
+                    if ((target = getById(state, 'targets', targetId)) === null) {
+                        logme(
+                            'ERROR: In answer there exists a target ' +
+                            'ID "' + targetId + '". No target with this ' +
+                            'ID could be found.'
+                        );
+
+                        continue;
+                    }
+
+                    draggable.moveDraggableToTarget(target);
                 }
+
+                c1 += 1;
+            }
+        }(0));
+    }
+
+    function processAnswerPositions(state, answer) {
+        var draggableId, draggable;
+
+        (function (c1) {
+            while (c1 < answer.draggables.length) {
+                for (draggableId in answer.draggables[c1]) {
+                    if (answer.draggables[c1].hasOwnProperty(draggableId) === false) {
+                        continue;
+                    }
+
+                    if ((draggable = getById(state, 'draggables', draggableId)) === null) {
+                        logme(
+                            'ERROR: In answer there exists a ' +
+                            'draggable ID "' + draggableId + '". No ' +
+                            'draggable with this ID could be found.'
+                        );
+
+                        continue;
+                    }
+
+                    draggable.moveDraggableToXY({
+                        'x': answer.draggables[c1][draggableId][0],
+                        'y': answer.draggables[c1][draggableId][1]
+                    });
+                }
+
+                c1 += 1;
+            }
+        }(0));
+    }
+
+    function repositionDraggables(state, answer) {
+        if (state.config.individualTargets !== getUseTargets(answer)) {
+            logme('ERROR: JSON config is not consistent with server response.');
+
+            return;
+        }
+
+        if (state.config.individualTargets === true) {
+            processAnswerTargets(state, answer);
+        } else if (state.config.individualTargets === false) {
+            processAnswerPositions(state, answer);
+        }
+    }
+
+    function getById(state, type, id) {
+        return (function (c1) {
+            while (c1 < state[type].length) {
+                if (state[type][c1].id === id) {
+                    return state[type][c1];
+                }
+                c1 += 1;
             }
 
             return null;
-        }
-
-        function getTargetById(id) {
-            var c1;
-
-            for (c1 = 0; c1 < state.targets.length; c1 += 1) {
-                if (state.targets[c1].id === id) {
-                    return state.targets[c1];
-                }
-            }
-
-            return null;
-        }
+        }(0));
     }
 });
 

From de35d1e9e428f457f8a6cfe887f34af39b05aaff Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 16 Jan 2013 16:46:15 +0200
Subject: [PATCH 511/541] update docs

---
 docs/source/drag_and_drop_input.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/source/drag_and_drop_input.rst b/docs/source/drag_and_drop_input.rst
index 1e5e6bf468..f98f4c99d6 100644
--- a/docs/source/drag_and_drop_input.rst
+++ b/docs/source/drag_and_drop_input.rst
@@ -110,7 +110,8 @@ draggables, targets and rule. For example::
 Draggables is list of draggables id. Target is list of targets id, draggables
 must be dragged to with considering rule. Rule is string.
 
-Draggables in dicts inside correct_answer list must not intersect.
+Draggables in dicts inside correct_answer list must not intersect!!!
+
 Wrong (for draggable id 7)::
 
     correct_answer = [
@@ -209,6 +210,8 @@ you sould use 'anyof+number' of 'unordered_equal+number' rule::
 In case if we have no multiple draggables per targets (one_per_target="true"),
 for same number of draggables, anyof is equal to unordered_equal
 
+If we have can_reuse=true, than one must use only long form of correct answer.
+
 Example
 =======
 

From 4215f4f92307dd8a47c2be36437d12a30aafd6c1 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 16 Jan 2013 16:46:28 +0200
Subject: [PATCH 512/541] add and update tests

---
 .../capa/capa/verifiers/tests_draganddrop.py  | 75 ++++++++++++++++---
 1 file changed, 64 insertions(+), 11 deletions(-)

diff --git a/common/lib/capa/capa/verifiers/tests_draganddrop.py b/common/lib/capa/capa/verifiers/tests_draganddrop.py
index cb9fef1865..f708413c46 100644
--- a/common/lib/capa/capa/verifiers/tests_draganddrop.py
+++ b/common/lib/capa/capa/verifiers/tests_draganddrop.py
@@ -319,17 +319,17 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
         {
             'draggables': ['a'],
             'targets': ['target1',  'target4', 'target7', 'target10'],
-            'rule': 'unorderly_equal'
+            'rule': 'unordered_equal'
         },
         {
             'draggables': ['b'],
             'targets': ['target2', 'target5', 'target8'],
-            'rule': 'unorderly_equal'
+            'rule': 'unordered_equal'
         },
         {
             'draggables': ['c'],
             'targets': ['target3', 'target6', 'target9'],
-            'rule': 'unorderly_equal'
+            'rule': 'unordered_equal'
         }]
         self.assertFalse(draganddrop.grade(user_input, correct_answer))
 
@@ -406,7 +406,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
         self.assertFalse(draganddrop.grade(user_input, correct_answer))
 
     def test_label_10_targets_with_a_b_c_reused(self):
-        """Test reusable draggables (no mupltiple draggables per target)"""
+        """Test a b c in 10 labels reused"""
         user_input = '{"draggables":[{"a":"target1"}, \
         {"b":"target2"},{"c":"target3"},{"b":"target5"}, \
         {"c":"target6"}, {"b":"target8"},{"c":"target9"}, \
@@ -415,22 +415,22 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
         {
             'draggables': ['a', 'a'],
             'targets': ['target1',   'target10'],
-            'rule': 'unorderly_equal+number'
+            'rule': 'unordered_equal+number'
         },
         {
             'draggables': ['b', 'b', 'b'],
             'targets': ['target2', 'target5', 'target8'],
-            'rule': 'unorderly_equal+number'
+            'rule': 'unordered_equal+number'
         },
         {
             'draggables': ['c', 'c', 'c'],
             'targets': ['target3', 'target6', 'target9'],
-            'rule': 'unorderly_equal+number'
+            'rule': 'unordered_equal+number'
         }]
         self.assertTrue(draganddrop.grade(user_input, correct_answer))
 
     def test_label_10_targets_with_a_b_c_reused_false(self):
-        """Test reusable draggables (no mupltiple draggables per target)"""
+        """Test a b c in 10 labels reused false"""
         user_input = '{"draggables":[{"a":"target1"}, \
         {"b":"target2"},{"c":"target3"},{"b":"target5"}, {"a":"target8"},\
         {"c":"target6"}, {"b":"target8"},{"c":"target9"}, \
@@ -439,20 +439,73 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
         {
             'draggables': ['a', 'a'],
             'targets': ['target1',   'target10'],
-            'rule': 'unorderly_equal+number'
+            'rule': 'unordered_equal+number'
         },
         {
             'draggables': ['b', 'b', 'b'],
             'targets': ['target2', 'target5', 'target8'],
-            'rule': 'unorderly_equal+number'
+            'rule': 'unordered_equal+number'
         },
         {
             'draggables': ['c', 'c', 'c'],
             'targets': ['target3', 'target6', 'target9'],
-            'rule': 'unorderly_equal+number'
+            'rule': 'unordered_equal+number'
         }]
         self.assertFalse(draganddrop.grade(user_input, correct_answer))
 
+    def test_mixed_reuse_and_not_reuse(self):
+        """Test reusable draggables """
+        user_input = '{"draggables":[{"a":"target1"}, \
+        {"b":"target2"},{"c":"target3"}, {"a":"target4"},\
+         {"a":"target5"}]}'
+        correct_answer = [
+        {
+            'draggables': ['a', 'b'],
+            'targets': ['target1',   'target2', 'target4', 'target5'],
+            'rule': 'anyof'
+        },
+        {
+            'draggables': ['c'],
+            'targets': ['target3'],
+            'rule': 'exact'
+        }]
+        self.assertTrue(draganddrop.grade(user_input, correct_answer))
+
+    def test_mixed_reuse_and_not_reuse_number(self):
+        """Test reusable draggables with number """
+        user_input = '{"draggables":[{"a":"target1"}, \
+        {"b":"target2"},{"c":"target3"}, {"a":"target4"}]}'
+        correct_answer = [
+        {
+            'draggables': ['a', 'a', 'b'],
+            'targets': ['target1',   'target2', 'target4'],
+            'rule': 'anyof+number'
+        },
+        {
+            'draggables': ['c'],
+            'targets': ['target3'],
+            'rule': 'exact'
+        }]
+        self.assertTrue(draganddrop.grade(user_input, correct_answer))
+
+    def test_mixed_reuse_and_not_reuse_number_false(self):
+        """Test reusable draggables with numbers, but wrong"""
+        user_input = '{"draggables":[{"a":"target1"}, \
+        {"b":"target2"},{"c":"target3"}, {"a":"target4"}, {"a":"target10"}]}'
+        correct_answer = [
+        {
+            'draggables': ['a', 'a', 'b'],
+            'targets': ['target1',   'target2', 'target4', 'target10'],
+            'rule': 'anyof_number'
+        },
+        {
+            'draggables': ['c'],
+            'targets': ['target3'],
+            'rule': 'exact'
+        }]
+        self.assertFalse(draganddrop.grade(user_input, correct_answer))
+
+
 class Test_DragAndDrop_Populate(unittest.TestCase):
 
     def test_1(self):

From d231b9ed048c07169e69fc0467baea192440b4ab Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 16 Jan 2013 16:54:52 +0200
Subject: [PATCH 513/541] update docs

---
 docs/source/drag_and_drop_input.rst    |   6 ++++++
 docs/source/draganddrop_logic_flow.png | Bin 0 -> 305578 bytes
 2 files changed, 6 insertions(+)
 create mode 100644 docs/source/draganddrop_logic_flow.png

diff --git a/docs/source/drag_and_drop_input.rst b/docs/source/drag_and_drop_input.rst
index f98f4c99d6..5f42063740 100644
--- a/docs/source/drag_and_drop_input.rst
+++ b/docs/source/drag_and_drop_input.rst
@@ -212,6 +212,12 @@ for same number of draggables, anyof is equal to unordered_equal
 
 If we have can_reuse=true, than one must use only long form of correct answer.
 
+Logic flow
+----------
+
+.. image:: draganddrop_logic_flow.png
+
+
 Example
 =======
 
diff --git a/docs/source/draganddrop_logic_flow.png b/docs/source/draganddrop_logic_flow.png
new file mode 100644
index 0000000000000000000000000000000000000000..5708d3628477e989d11c228ad04b80e987a1591a
GIT binary patch
literal 305578
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%0D<<z0-jY{96wHx%&#YRqa
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
DvKP?)

literal 0
HcmV?d00001


From 8b3a8a30ab5b3b1cbb91f88fe70d207f1e950e72 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Wed, 16 Jan 2013 16:59:00 +0200
Subject: [PATCH 514/541] Refactoring.

---
 common/static/js/capa/drag_and_drop/draggables.js | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index 4c4585d121..a78d336879 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -739,27 +739,21 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
         this.iconEl.css(
             'left',
-            target.offset.left + 0.5 * target.w -
-                this.iconWidth * 0.5 + offset
-                - this.iconElLeftOffset
+            target.offset.left + 0.5 * target.w - this.iconWidth * 0.5 + offset - this.iconElLeftOffset
         );
         this.iconEl.css(
             'top',
-            target.offset.top + 0.5 * target.h -
-                this.iconHeight * 0.5 + offset
+            target.offset.top + 0.5 * target.h - this.iconHeight * 0.5 + offset
         );
 
         if (this.labelEl !== null) {
             this.labelEl.css(
                 'left',
-                target.offset.left + 0.5 * target.w -
-                    this.labelWidth * 0.5 + offset
-                    - 9 // Acoount for padding, border.
+                target.offset.left + 0.5 * target.w - this.labelWidth * 0.5 + offset - 9 // Acoount for padding, border.
             );
             this.labelEl.css(
                 'top',
-                target.offset.top + 0.5 * target.h +
-                    this.iconHeight * 0.5 + 5 + offset
+                target.offset.top + 0.5 * target.h + this.iconHeight * 0.5 + 5 + offset
             );
         }
     }

From 35174dd36c73e3645b2d0ba2818410f86d25626f Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 16 Jan 2013 17:29:17 +0200
Subject: [PATCH 515/541] resised picture

---
 docs/source/drag_and_drop_input.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/source/drag_and_drop_input.rst b/docs/source/drag_and_drop_input.rst
index 5f42063740..fac75368b2 100644
--- a/docs/source/drag_and_drop_input.rst
+++ b/docs/source/drag_and_drop_input.rst
@@ -216,6 +216,7 @@ Logic flow
 ----------
 
 .. image:: draganddrop_logic_flow.png
+    :scale: 36 %
 
 
 Example

From f15887383e7ef0aba612f889c10815f9e05b5a1c Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Wed, 16 Jan 2013 18:08:40 +0200
Subject: [PATCH 516/541] Refactoring.

---
 .../js/capa/drag_and_drop/config_parser.js    | 45 ++++++++++++++++++-
 .../js/capa/drag_and_drop/draggables.js       | 20 +++++----
 common/static/js/capa/drag_and_drop/main.js   |  4 ++
 3 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/config_parser.js b/common/static/js/capa/drag_and_drop/config_parser.js
index b154a81826..536430101d 100644
--- a/common/static/js/capa/drag_and_drop/config_parser.js
+++ b/common/static/js/capa/drag_and_drop/config_parser.js
@@ -163,10 +163,15 @@ define(['logme'], function (logme) {
         if (!attrIsString(obj, 'icon')) {
             return false;
         }
+
         if (!attrIsString(obj, 'label')) {
             return false;
         }
 
+        if (!attrIsBoolean(obj, 'can_reuse', false)) {
+            return false;
+        }
+
         state.config.draggables.push(obj);
 
         return true;
@@ -197,7 +202,11 @@ define(['logme'], function (logme) {
     }
 
     function attrIsString(obj, attr) {
-        if (typeof obj[attr] !== 'string') {
+        if (obj.hasOwnProperty(attr) === false) {
+            logme('ERROR: Attribute "obj.' + attr + '" is not present.');
+
+            return false;
+        } else if (typeof obj[attr] !== 'string') {
             logme('ERROR: Attribute "obj.' + attr + '" is not a string.');
 
             return false;
@@ -209,6 +218,12 @@ define(['logme'], function (logme) {
     function attrIsInteger(obj, attr) {
         var tempInt;
 
+        if (obj.hasOwnProperty(attr) === false) {
+            logme('ERROR: Attribute "obj.' + attr + '" is not present.');
+
+            return false;
+        }
+
         tempInt = parseInt(obj[attr], 10);
 
         if (isFinite(tempInt) === false) {
@@ -221,6 +236,34 @@ define(['logme'], function (logme) {
 
         return true;
     }
+
+    function attrIsBoolean(obj, attr, defaultVal) {
+        if (obj.hasOwnProperty(attr) === false) {
+            if (defaultVal === undefined) {
+                logme('ERROR: Attribute "obj.' + attr + '" is not present.');
+
+                return false;
+            } else {
+                obj[attr] = defaultVal;
+
+                return true;
+            }
+        }
+
+        if (obj[attr] === '') {
+            obj[attr] = defaultVal;
+        } else if ((obj[attr] === 'false') || (obj[attr] === false)) {
+            obj[attr] = false;
+        } else if ((obj[attr] === 'true') || (obj[attr] === true)) {
+            obj[attr] = true;
+        } else {
+            logme('ERROR: Attribute "obj.' + attr + '" is not a boolean.');
+
+            return false;
+        }
+
+        return true;
+    }
 });
 
 // End of wrapper for RequireJS. As you can see, we are passing
diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index a78d336879..add445ebb0 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -195,6 +195,13 @@ define(['logme', 'update_input'], function (logme, updateInput) {
         var draggableObj;
 
         draggableObj = {
+            'id': obj.id,
+
+            'isReusable': obj.can_reuse,
+
+            'x': -1,
+            'y': -1,
+
             'zIndex': objIndex,
             'oldZIndex': objIndex,
             'labelEl': null,
@@ -373,12 +380,15 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                     'top',
                     50 - draggableObj.iconHeightSmall * 0.5
                 );
+
+                draggableObj.hasLoaded = true;
             } else {
                 // If no icon and no label, don't create a draggable.
                 return;
             }
         }
 
+        // Attach events to "iconEl".
         draggableObj.iconEl.mousedown(function (event) {
             draggableObj.mouseDown.call(draggableObj, event);
         });
@@ -389,6 +399,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             draggableObj.mouseMove.call(draggableObj, event);
         });
 
+        // Attach events to "containerEl".
         draggableObj.containerEl.mousedown(function (event) {
             draggableObj.mouseDown.call(draggableObj, event);
         });
@@ -399,16 +410,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             draggableObj.mouseMove.call(draggableObj, event);
         });
 
-        draggableObj.id = obj.id;
-        draggableObj.x = -1;
-        draggableObj.y = -1;
-
         state.numDraggablesInSlider += 1;
-
-        if (obj.icon.length === 0) {
-            draggableObj.hasLoaded = true;
-        }
-
         state.draggables.push(draggableObj);
     }
 
diff --git a/common/static/js/capa/drag_and_drop/main.js b/common/static/js/capa/drag_and_drop/main.js
index 900ea34e15..7eb4f5101e 100644
--- a/common/static/js/capa/drag_and_drop/main.js
+++ b/common/static/js/capa/drag_and_drop/main.js
@@ -70,6 +70,10 @@ define(
             if (updateInput.check(state) === false) {
                 updateInput.update(state);
             }
+
+            setTimeout(function () {
+                logme('state.draggables', state.draggables);
+            }, 500);
         }());
     }
 });

From 98977cabdb93dacdd34fd3262495af495044f5c1 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Thu, 17 Jan 2013 16:36:15 +0200
Subject: [PATCH 517/541] Refactoring of Drag and Drop complete. Draggable
 properties isUsable, isOriginal included, but functionality connected with
 them is not complete. Found and fixed bug with z-index ordering.

---
 common/static/js/capa/drag_and_drop.js        |   2 +-
 .../js/capa/drag_and_drop/base_image.js       |   9 +-
 .../js/capa/drag_and_drop/config_parser.js    |  46 +--
 .../js/capa/drag_and_drop/draggables.js       | 331 +++++-------------
 common/static/js/capa/drag_and_drop/main.js   |  16 +-
 common/static/js/capa/drag_and_drop/state.js  |  17 +-
 .../static/js/capa/drag_and_drop/targets.js   | 256 +++++++-------
 .../js/capa/drag_and_drop/update_input.js     |   6 +-
 8 files changed, 276 insertions(+), 407 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop.js b/common/static/js/capa/drag_and_drop.js
index ce6f4c4559..2a9c2e4011 100644
--- a/common/static/js/capa/drag_and_drop.js
+++ b/common/static/js/capa/drag_and_drop.js
@@ -5,7 +5,7 @@
 (function (requirejs, require, define) {
 
 requirejs.config({
-    'baseUrl': '/static/js/capa/drag_and_drop/',
+    'baseUrl': '/static/js/capa/drag_and_drop/'
 });
 
 // The current JS file will be loaded and run each time. It will require a
diff --git a/common/static/js/capa/drag_and_drop/base_image.js b/common/static/js/capa/drag_and_drop/base_image.js
index cd74267690..d818804be2 100644
--- a/common/static/js/capa/drag_and_drop/base_image.js
+++ b/common/static/js/capa/drag_and_drop/base_image.js
@@ -24,10 +24,7 @@ define(['logme'], function (logme) {
 
         state.baseImageEl = $('<img />');
 
-        state.baseImageEl.attr(
-            'src',
-            state.config.baseImage
-        );
+        state.baseImageEl.attr('src', state.config.baseImage);
         state.baseImageEl.load(function () {
             baseImageElContainer.css('width', this.width);
             baseImageElContainer.css('height', this.height);
@@ -42,9 +39,7 @@ define(['logme'], function (logme) {
             state.baseImageLoaded = true;
         });
         state.baseImageEl.error(function () {
-            logme(
-                'ERROR: Image "' + state.config.baseImage + '" was not found!'
-            );
+            logme('ERROR: Image "' + state.config.baseImage + '" was not found!');
             baseImageElContainer.html(
                 '<span style="color: red;">' +
                     'ERROR: Image "' + state.config.baseImage + '" was not found!' +
diff --git a/common/static/js/capa/drag_and_drop/config_parser.js b/common/static/js/capa/drag_and_drop/config_parser.js
index 536430101d..e6c1e4d3c1 100644
--- a/common/static/js/capa/drag_and_drop/config_parser.js
+++ b/common/static/js/capa/drag_and_drop/config_parser.js
@@ -7,17 +7,15 @@
 define(['logme'], function (logme) {
     return configParser;
 
-    function configParser(config, state) {
+    function configParser(state, config) {
         state.config = {
             'draggables': [],
             'baseImage': '',
             'targets': [],
-            'onePerTarget': null,
+            'onePerTarget': null, // Specified by user. No default.
             'targetOutline': true,
             'labelBgColor': '#d6d6d6',
-
-            'individualTargets': null,
-
+            'individualTargets': null, // Depends on 'targets'.
             'errors': 0 // Number of errors found while parsing config.
         };
 
@@ -156,19 +154,13 @@ define(['logme'], function (logme) {
     }
 
     function processDraggable(state, obj) {
-        if (!attrIsString(obj, 'id')) {
-            return false;
-        }
+        if (
+            (attrIsString(obj, 'id') === false) ||
+            (attrIsString(obj, 'icon') === false) ||
+            (attrIsString(obj, 'label') === false) ||
 
-        if (!attrIsString(obj, 'icon')) {
-            return false;
-        }
-
-        if (!attrIsString(obj, 'label')) {
-            return false;
-        }
-
-        if (!attrIsBoolean(obj, 'can_reuse', false)) {
+            (attrIsBoolean(obj, 'can_reuse', false) === false)
+        ) {
             return false;
         }
 
@@ -178,21 +170,15 @@ define(['logme'], function (logme) {
     }
 
     function processTarget(state, obj) {
-        if (!attrIsString(obj, 'id')) {
-            return false;
-        }
+        if (
+            (attrIsString(obj, 'id') === false) ||
 
-        if (!attrIsInteger(obj, 'w')) {
-            return false;
-        }
-        if (!attrIsInteger(obj, 'h')) {
-            return false;
-        }
+            (attrIsInteger(obj, 'w') === false) ||
+            (attrIsInteger(obj, 'h') === false) ||
 
-        if (!attrIsInteger(obj, 'x')) {
-            return false;
-        }
-        if (!attrIsInteger(obj, 'y')) {
+            (attrIsInteger(obj, 'x') === false) ||
+            (attrIsInteger(obj, 'y') === false)
+        ) {
             return false;
         }
 
diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index add445ebb0..1946ed8033 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -10,13 +10,9 @@ define(['logme', 'update_input'], function (logme, updateInput) {
     };
 
     function init(state) {
-        state.draggables = [];
-        state.numDraggablesInSlider = 0;
-        state.currentMovingDraggable = null;
-
         (function (c1) {
             while (c1 < state.config.draggables.length) {
-                processDraggable(state, state.config.draggables[c1], c1 + 1);
+                processDraggable(state, state.config.draggables[c1]);
                 c1 += 1
             }
         }(0));
@@ -121,6 +117,9 @@ define(['logme', 'update_input'], function (logme, updateInput) {
         this.x = newPosition.x;
         this.y = newPosition.y;
 
+        this.zIndex = 1000;
+        this.correctZIndexes();
+
         this.state.numDraggablesInSlider -= 1;
         this.state.updateArrowOpacity();
     }
@@ -180,35 +179,49 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             this.labelEl.appendTo(this.state.baseImageEl.parent());
         }
 
-        this.onTarget = target;
-        target.draggable.push(this.id);
+        target.addDraggable(this);
 
-        if (target.numTextEl !== null) {
-            target.updateNumTextEl();
-        }
+        this.zIndex = 1000;
+        this.correctZIndexes();
 
         this.state.numDraggablesInSlider -= 1;
         this.state.updateArrowOpacity();
     }
 
-    function processDraggable(state, obj, objIndex) {
+    function processDraggable(state, obj) {
         var draggableObj;
 
         draggableObj = {
             'id': obj.id,
 
             'isReusable': obj.can_reuse,
+            'isOriginal': true,
 
             'x': -1,
             'y': -1,
 
-            'zIndex': objIndex,
-            'oldZIndex': objIndex,
+            'zIndex': 1,
+
+            'containerEl': null,
+
+            'iconEl': null,
+            'iconElBGColor': null,
+            'iconElPadding': null,
+            'iconElBorder': null,
+            'iconElLeftOffset': null,
+            'iconWidth': null,
+            'iconHeight': null,
+            'iconWidthSmall': null,
+            'iconHeightSmall': null,
+
             'labelEl': null,
+            'labelWidth': null,
+
             'hasLoaded': false,
             'inContainer': true,
             'mousePressed': false,
             'onTarget': null,
+            'onTargetIndex': null,
 
             'state': state,
 
@@ -216,7 +229,6 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             'mouseUp': mouseUp,
             'mouseMove': mouseMove,
             'checkLandingElement': checkLandingElement,
-            'removeObjIdFromTarget': removeObjIdFromTarget,
             'checkIfOnTarget': checkIfOnTarget,
             'snapToTarget': snapToTarget,
             'correctZIndexes': correctZIndexes,
@@ -234,7 +246,6 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                     'display: inline; ' +
                     'float: left; ' +
                     'overflow: hidden; ' +
-                    'z-index: ' + objIndex + '; ' +
                     'border-left: 1px solid #CCC; ' +
                     'border-right: 1px solid #CCC; ' +
                     'text-align: center; ' +
@@ -252,49 +263,28 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             draggableObj.iconElLeftOffset = 0;
 
             draggableObj.iconEl = $('<img />');
-            draggableObj.iconEl.attr(
-                'src',
-                obj.icon
-            );
+            draggableObj.iconEl.attr('src', obj.icon);
             draggableObj.iconEl.load(function () {
                 draggableObj.iconWidth = this.width;
                 draggableObj.iconHeight = this.height;
 
                 if (draggableObj.iconWidth >= draggableObj.iconHeight) {
                     draggableObj.iconWidthSmall = 60;
-                    draggableObj.iconHeightSmall =
-                        draggableObj.iconWidthSmall *
-                        (draggableObj.iconHeight / draggableObj.iconWidth);
+                    draggableObj.iconHeightSmall = draggableObj.iconWidthSmall * (draggableObj.iconHeight / draggableObj.iconWidth);
                 } else {
                     draggableObj.iconHeightSmall = 60;
-                    draggableObj.iconWidthSmall =
-                        draggableObj.iconHeightSmall *
-                        (draggableObj.iconWidth / draggableObj.iconHeight);
+                    draggableObj.iconWidthSmall = draggableObj.iconHeightSmall * (draggableObj.iconWidth / draggableObj.iconHeight);
                 }
 
                 draggableObj.iconEl.css('position', 'absolute');
-
-                draggableObj.iconEl.css(
-                    'width',
-                    draggableObj.iconWidthSmall
-                );
-                draggableObj.iconEl.css(
-                    'height',
-                    draggableObj.iconHeightSmall
-                );
-
-                draggableObj.iconEl.css(
-                    'left',
-                    50 - draggableObj.iconWidthSmall * 0.5
-                );
+                draggableObj.iconEl.css('width', draggableObj.iconWidthSmall);
+                draggableObj.iconEl.css('height', draggableObj.iconHeightSmall);
+                draggableObj.iconEl.css('left', 50 - draggableObj.iconWidthSmall * 0.5);
 
                 if (obj.label.length > 0) {
                     draggableObj.iconEl.css('top', 5);
                 } else {
-                    draggableObj.iconEl.css(
-                        'top',
-                        50 - draggableObj.iconHeightSmall * 0.5
-                    );
+                    draggableObj.iconEl.css('top', 50 - draggableObj.iconHeightSmall * 0.5);
                 }
 
                 draggableObj.iconEl.appendTo(draggableObj.containerEl);
@@ -306,27 +296,16 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                                 'position: absolute; ' +
                                 'color: black; ' +
                                 'font-size: 0.95em; ' +
-                                'z-index: ' + objIndex + '; ' +
                             '" ' +
                         '>' +
                             obj.label +
                         '</div>'
                     );
 
-                    draggableObj.labelEl.appendTo(
-                        draggableObj.containerEl
-                    );
-
+                    draggableObj.labelEl.appendTo(draggableObj.containerEl);
                     draggableObj.labelWidth = draggableObj.labelEl.width();
-
-                    draggableObj.labelEl.css(
-                        'left',
-                        50 - draggableObj.labelWidth * 0.5
-                    );
-                    draggableObj.labelEl.css(
-                        'top',
-                        5 + draggableObj.iconHeightSmall + 5
-                    );
+                    draggableObj.labelEl.css('left', 50 - draggableObj.labelWidth * 0.5);
+                    draggableObj.labelEl.css('top', 5 + draggableObj.iconHeightSmall + 5);
 
                     draggableObj.labelEl.mousedown(function (event) {
                         draggableObj.mouseDown.call(draggableObj, event);
@@ -358,7 +337,6 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                             'position: absolute; ' +
                             'color: black; ' +
                             'font-size: 0.95em; ' +
-                            'z-index: ' + objIndex + '; ' +
                         '" ' +
                     '>' +
                         obj.label +
@@ -372,14 +350,8 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                 draggableObj.iconWidthSmall = draggableObj.iconWidth;
                 draggableObj.iconHeightSmall = draggableObj.iconHeight;
 
-                draggableObj.iconEl.css(
-                    'left',
-                    50 - draggableObj.iconWidthSmall * 0.5
-                );
-                draggableObj.iconEl.css(
-                    'top',
-                    50 - draggableObj.iconHeightSmall * 0.5
-                );
+                draggableObj.iconEl.css('left', 50 - draggableObj.iconWidthSmall * 0.5);
+                draggableObj.iconEl.css('top', 50 - draggableObj.iconHeightSmall * 0.5);
 
                 draggableObj.hasLoaded = true;
             } else {
@@ -421,6 +393,11 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             // potentially cause the highlghting of the dragged element.
             event.preventDefault();
 
+            if ((this.isReusable === true) && (this.isOriginal === true)) {
+
+                return;
+            }
+
             // If this draggable is just being dragged out of the
             // container, we must perform some additional tasks.
             if (this.inContainer === true) {
@@ -500,7 +477,6 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                 this.state.numDraggablesInSlider -= 1;
             }
 
-            this.oldZIndex = this.zIndex;
             this.zIndex = 1000;
             this.iconEl.css('z-index', '1000');
             if (this.labelEl !== null) {
@@ -532,32 +508,21 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
             this.iconEl.css(
                 'left',
-                event.pageX -
-                    this.state.baseImageEl.offset().left -
-                    this.iconWidth * 0.5
-                    - this.iconElLeftOffset
+                event.pageX - this.state.baseImageEl.offset().left - this.iconWidth * 0.5 - this.iconElLeftOffset
             );
             this.iconEl.css(
                 'top',
-                event.pageY -
-                    this.state.baseImageEl.offset().top -
-                    this.iconHeight * 0.5
+                event.pageY - this.state.baseImageEl.offset().top - this.iconHeight * 0.5
             );
 
             if (this.labelEl !== null) {
                 this.labelEl.css(
                     'left',
-                    event.pageX -
-                        this.state.baseImageEl.offset().left -
-                        this.labelWidth * 0.5
-                        - 9 // Acoount for padding, border.
+                    event.pageX - this.state.baseImageEl.offset().left - this.labelWidth * 0.5 - 9 // Acoount for padding, border.
                 );
                 this.labelEl.css(
                     'top',
-                    event.pageY -
-                        this.state.baseImageEl.offset().top +
-                        this.iconHeight * 0.5 +
-                        5
+                    event.pageY - this.state.baseImageEl.offset().top + this.iconHeight * 0.5 + 5
                 );
             }
         }
@@ -578,23 +543,20 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             if (this.checkIfOnTarget(positionIE) === true) {
                 this.correctZIndexes();
             } else {
+                if (this.onTarget !== null) {
+                    this.onTarget.removeDraggable(this);
+                }
+
                 this.moveBackToSlider();
-                this.removeObjIdFromTarget();
 
                 this.state.numDraggablesInSlider += 1;
             }
         } else {
             if (
                 (positionIE.left < 0) ||
-                (
-                    positionIE.left + this.iconWidth >
-                    this.state.baseImageEl.width()
-                ) ||
+                (positionIE.left + this.iconWidth > this.state.baseImageEl.width()) ||
                 (positionIE.top < 0) ||
-                (
-                    positionIE.top + this.iconHeight >
-                    this.state.baseImageEl.height()
-                )
+                (positionIE.top + this.iconHeight > this.state.baseImageEl.height())
             ) {
                 this.moveBackToSlider();
 
@@ -605,10 +567,8 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             } else {
                 this.correctZIndexes();
 
-                this.x =
-                    positionIE.left + this.iconWidth * 0.5;
-                this.y =
-                    positionIE.top + this.iconHeight * 0.5;
+                this.x = positionIE.left + this.iconWidth * 0.5;
+                this.y = positionIE.top + this.iconHeight * 0.5;
             }
         }
 
@@ -616,26 +576,6 @@ define(['logme', 'update_input'], function (logme, updateInput) {
         updateInput.update(this.state);
     }
 
-    function removeObjIdFromTarget() {
-        var c1;
-
-        if (this.onTarget !== null) {
-            for (c1 = 0; c1 < this.onTarget.draggable.length; c1 += 1) {
-                if (this.onTarget.draggable[c1] === this.id) {
-                    this.onTarget.draggable.splice(c1, 1);
-
-                    break;
-                }
-            }
-
-            if (this.onTarget.numTextEl !== null) {
-                this.onTarget.updateNumTextEl();
-            }
-
-            this.onTarget = null;
-        }
-    }
-
     //
     // Determine if a draggable, after it was relased, ends up on a
     // target. We do this by iterating over all of the targets, and
@@ -647,9 +587,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
     //     this.iconEl.position()
     //
     function checkIfOnTarget(positionIE) {
-        var c1, target, targetFound;
-
-        targetFound = false;
+        var c1, target;
 
         for (c1 = 0; c1 < this.state.targets.length; c1 += 1) {
             target = this.state.targets[c1];
@@ -660,75 +598,52 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             // against), then go to next target.
             if (
                 (this.state.config.onePerTarget === true) &&
-                (target.draggable.length === 1) &&
-                (target.draggable[0] !== this.id)
+                (target.draggableList.length === 1) &&
+                (target.draggableList[0].id !== this.id)
             ) {
                 continue;
             }
 
             // Check if the draggable's center coordinate is within
             // the target's dimensions. If not, go to next target.
-            if (
-                positionIE.top + this.iconHeight * 0.5 <
-                target.offset.top
-            ) {
+            if (positionIE.top + this.iconHeight * 0.5 < target.offset.top) {
                 continue;
             }
-            if (
-                positionIE.top + this.iconHeight * 0.5 >
-                target.offset.top + target.h
-            ) {
+            if (positionIE.top + this.iconHeight * 0.5 > target.offset.top + target.h) {
                 continue;
             }
-            if (
-                positionIE.left + this.iconWidth * 0.5 <
-                target.offset.left
-            ) {
+            if (positionIE.left + this.iconWidth * 0.5 < target.offset.left) {
                 continue;
             }
-            if (
-                positionIE.left + this.iconWidth * 0.5 >
-                target.offset.left + target.w
-            ) {
+            if (positionIE.left + this.iconWidth * 0.5 > target.offset.left + target.w) {
                 continue;
             }
 
-            // If we got here, then our draggable is on top of a
-            // target.
-            targetFound = true;
-
             // If the draggable was moved from one target to
-            // another, then we need to remove it's ID from the
+            // another, then we need to remove it from the
             // previous target's draggables list, and add it to the
             // new target's draggables list.
-            if (
-                (this.onTarget !== null) &&
-                (this.onTarget.id !== target.id)
-            ) {
-                this.removeObjIdFromTarget();
-                this.onTarget = target;
-                target.draggable.push(this.id);
+            if ((this.onTarget !== null) && (this.onTarget.id !== target.id)) {
+                this.onTarget.removeDraggable(this);
+                target.addDraggable(this);
             }
             // If the draggable was moved from the slider to a
             // target, remember the target, and add ID to the
             // target's draggables list.
             else if (this.onTarget === null) {
-                this.onTarget = target;
-                target.draggable.push(this.id);
-            }
-
-            if (target.numTextEl !== null) {
-                target.updateNumTextEl();
+                target.addDraggable(this);
             }
 
             // Reposition the draggable so that it's center
             // coincides with the center of the target.
             this.snapToTarget(target);
 
-            break;
+            // Target was found.
+            return true;
         }
 
-        return targetFound;
+        // Target was not found.
+        return false;
     }
 
     function snapToTarget(target) {
@@ -771,101 +686,45 @@ define(['logme', 'update_input'], function (logme, updateInput) {
     // ordering of the visibility (z-index) of the other draggables
     // will not change.
     function correctZIndexes() {
-        var draggablesInMe, c1, c2, highestZIndex;
+        var c1, highestZIndex;
+
+        highestZIndex = -10000;
 
         if (this.state.config.individualTargets === true) {
-            if (this.onTarget.draggable.length > 0) {
-                draggablesInMe = [];
-
-                for (c1 = 0; c1 < this.onTarget.draggable.length; c1 += 1) {
-                    for (c2 = 0; c2 < this.state.draggables.length; c2 += 1) {
-                        if (
-                            this.onTarget.draggable[c1] ===
-                                this.state.draggables[c2].id
-                        ) {
-                            draggablesInMe.push(this.state.draggables[c2]);
-                        }
-                    }
-                }
-
-                highestZIndex = -10000;
-
-                for (c1 = 0; c1 < draggablesInMe.length; c1 += 1) {
+            if (this.onTarget.draggableList.length > 0) {
+                for (c1 = 0; c1 < this.onTarget.draggableList.length; c1 += 1) {
                     if (
-                        (draggablesInMe[c1].zIndex > highestZIndex) &&
-                            (draggablesInMe[c1].zIndex !== 1000)
+                        (this.onTarget.draggableList[c1].zIndex > highestZIndex) &&
+                        (this.onTarget.draggableList[c1].zIndex !== 1000)
                     ) {
-                        highestZIndex = draggablesInMe[c1].zIndex;
-                    }
-                }
-
-                if (highestZIndex === -10000) {
-                    highestZIndex = this.onTarget.draggable.length;
-                } else if (highestZIndex < this.oldZIndex) {
-                    highestZIndex = this.oldZIndex;
-                } else {
-                    for (c1 = 0; c1 < draggablesInMe.length; c1 += 1) {
-                        draggablesInMe[c1].zIndex -= 1;
-                        draggablesInMe[c1].oldZIndex -= 1;
-
-                        draggablesInMe[c1].iconEl.css(
-                            'z-index',
-                            draggablesInMe[c1].zIndex
-                        );
-                        if (draggablesInMe[c1].labelEl !== null) {
-                            draggablesInMe[c1].labelEl.css(
-                                'z-index',
-                                draggablesInMe[c1].zIndex
-                            );
-                        }
+                        highestZIndex = this.onTarget.draggableList[c1].zIndex;
                     }
                 }
             } else {
-                highestZIndex = this.onTarget.draggable.length;
-            }
-
-            this.zIndex = highestZIndex;
-            this.oldZIndex = highestZIndex;
-
-            this.iconEl.css(
-                'z-index',
-                this.zIndex
-            );
-            if (this.labelEl !== null) {
-                this.labelEl.css(
-                    'z-index',
-                    this.zIndex
-                );
+                highestZIndex = 0;
             }
         } else {
             for (c1 = 0; c1 < this.state.draggables.length; c1++) {
-                if (
-                    this.oldZIndex <
-                        this.state.draggables[c1].zIndex
-                ) {
-                    this.state.draggables[c1].zIndex -= 1;
-                    this.state.draggables[c1].oldZIndex = this.state.draggables[c1].zIndex;
-                    this.state.draggables[c1].iconEl.css(
-                        'z-index',
-                        this.state.draggables[c1].zIndex
-                    );
-
-                    if (this.state.draggables[c1].labelEl !== null) {
-                        this.state.draggables[c1].labelEl.css(
-                            'z-index',
-                            this.state.draggables[c1].zIndex
-                        );
+                if (this.inContainer === false) {
+                    if (
+                        (this.state.draggables[c1].zIndex > highestZIndex) &&
+                        (this.state.draggables[c1].zIndex !== 1000)
+                    ) {
+                        highestZIndex = this.state.draggables[c1].zIndex;
                     }
                 }
             }
+        }
 
-            this.zIndex = c1;
-            this.oldZIndex = c1;
-            this.iconEl.css('z-index', c1);
+        if (highestZIndex === -10000) {
+            highestZIndex = 0;
+        }
 
-            if (this.labelEl !== null) {
-                this.labelEl.css('z-index', c1);
-            }
+        this.zIndex = highestZIndex + 1;
+
+        this.iconEl.css('z-index', highestZIndex);
+        if (this.labelEl !== null) {
+            this.labelEl.css('z-index', highestZIndex);
         }
     }
 
diff --git a/common/static/js/capa/drag_and_drop/main.js b/common/static/js/capa/drag_and_drop/main.js
index 7eb4f5101e..e7b02dec47 100644
--- a/common/static/js/capa/drag_and_drop/main.js
+++ b/common/static/js/capa/drag_and_drop/main.js
@@ -5,10 +5,8 @@
 (function (requirejs, require, define) {
 
 define(
-    ['logme', 'state', 'config_parser', 'container', 'base_image', 'scroller',
-     'draggables', 'targets', 'update_input'],
-    function (logme, State, configParser, Container, BaseImage, Scroller,
-              Draggables, Targets, updateInput) {
+    ['logme', 'state', 'config_parser', 'container', 'base_image', 'scroller', 'draggables', 'targets', 'update_input'],
+    function (logme, State, configParser, Container, BaseImage, Scroller, Draggables, Targets, updateInput) {
     return Main;
 
     function Main() {
@@ -45,7 +43,7 @@ define(
 
         state = State(problemId);
 
-        if (configParser(config, state) !== true) {
+        if (configParser(state, config) !== true) {
             logme('ERROR: Could not make sense of the JSON configuration options.');
 
             return;
@@ -70,11 +68,11 @@ define(
             if (updateInput.check(state) === false) {
                 updateInput.update(state);
             }
-
-            setTimeout(function () {
-                logme('state.draggables', state.draggables);
-            }, 500);
         }());
+
+        setTimeout(function () {
+            logme('After 1000 ms:', state);
+        }, 1000);
     }
 });
 
diff --git a/common/static/js/capa/drag_and_drop/state.js b/common/static/js/capa/drag_and_drop/state.js
index 99dd7dc8e4..d99b90872f 100644
--- a/common/static/js/capa/drag_and_drop/state.js
+++ b/common/static/js/capa/drag_and_drop/state.js
@@ -9,11 +9,24 @@ define([], function () {
 
     function State(problemId) {
         return {
-            'problemId': problemId,
+            'config': null,
 
+            'baseImageEl': null,
             'baseImageLoaded': false,
 
-            'numDraggablesInSlider': 0
+            'containerEl': null,
+
+            'sliderEl': null,
+
+            'problemId': problemId,
+
+            'draggables': [],
+            'numDraggablesInSlider': 0,
+            'currentMovingDraggable': null,
+
+            'targets': [],
+
+            'updateArrowOpacity': null
         };
     }
 });
diff --git a/common/static/js/capa/drag_and_drop/targets.js b/common/static/js/capa/drag_and_drop/targets.js
index dbec5e199d..40828ffba3 100644
--- a/common/static/js/capa/drag_and_drop/targets.js
+++ b/common/static/js/capa/drag_and_drop/targets.js
@@ -8,146 +8,166 @@ define(['logme'], function (logme) {
     return Targets;
 
     function Targets(state) {
-        var c1;
+        (function (c1) {
+            while (c1 < state.config.targets.length) {
+                processTarget(state, state.config.targets[c1]);
 
-        state.targets = [];
+                c1 += 1;
+            }
+        }(0));
+    } // function Targets(state) {
 
-        for (c1 = 0; c1 < state.config.targets.length; c1++) {
-            processTarget(state.config.targets[c1]);
+    function processTarget(state, obj) {
+        var targetEl, borderCss, numTextEl, targetObj;
+
+        borderCss = '';
+        if (state.config.targetOutline === true) {
+            borderCss = 'border: 1px dashed gray; ';
         }
 
-        return;
+        targetEl = $(
+            '<div ' +
+                'style=" ' +
+                    'display: block; ' +
+                    'position: absolute; ' +
+                    'width: ' + obj.w + 'px; ' +
+                    'height: ' + obj.h + 'px; ' +
+                    'top: ' + obj.y + 'px; ' +
+                    'left: ' + obj.x + 'px; ' +
+                    borderCss +
+                '" ' +
+                'data-target-id="' + obj.id + '" ' +
+            '></div>'
+        );
+        targetEl.appendTo(state.baseImageEl.parent());
+        targetEl.mousedown(function (event) {
+            event.preventDefault();
+        });
 
-        function processTarget(obj) {
-            var targetEl, borderCss, numTextEl, targetObj;
-
-            borderCss = '';
-            if (state.config.targetOutline === true) {
-                borderCss = 'border: 1px dashed gray; ';
-            }
-
-            targetEl = $(
+        if (state.config.onePerTarget === false) {
+            numTextEl = $(
                 '<div ' +
                     'style=" ' +
                         'display: block; ' +
                         'position: absolute; ' +
-                        'width: ' + obj.w + 'px; ' +
-                        'height: ' + obj.h + 'px; ' +
+                        'width: 24px; ' +
+                        'height: 24px; ' +
                         'top: ' + obj.y + 'px; ' +
-                        'left: ' + obj.x + 'px; ' +
-                        borderCss +
+                        'left: ' + (obj.x + obj.w - 24) + 'px; ' +
+                        'border: 1px solid black; ' +
+                        'text-align: center; ' +
+                        'z-index: 500; ' +
+                        'background-color: white; ' +
+                        'font-size: 0.95em; ' +
+                        'color: #009fe2; ' +
+                        'cursor: pointer; ' +
                     '" ' +
-                    'data-target-id="' + obj.id + '" ' +
-                '></div>'
+                '>0</div>'
             );
-            targetEl.appendTo(state.baseImageEl.parent());
-            targetEl.mousedown(function (event) {
+        } else {
+            numTextEl = null;
+        }
+
+        targetObj = {
+            'id': obj.id,
+
+            'w': obj.w,
+            'h': obj.h,
+
+            'el': targetEl,
+            'offset': targetEl.position(),
+
+            'draggableList': [],
+
+            'targetEl': targetEl,
+
+            'numTextEl': numTextEl,
+            'updateNumTextEl': updateNumTextEl,
+
+            'removeDraggable': removeDraggable,
+            'addDraggable': addDraggable
+        };
+
+        if (state.config.onePerTarget === false) {
+            numTextEl.appendTo(state.baseImageEl.parent());
+            numTextEl.mousedown(function (event) {
                 event.preventDefault();
             });
+            numTextEl.mouseup(function () {
+                cycleDraggableOrder.call(targetObj)
+            });
+        }
 
-            if (state.config.onePerTarget === false) {
-                numTextEl = $(
-                    '<div ' +
-                        'style=" ' +
-                            'display: block; ' +
-                            'position: absolute; ' +
-                            'width: 24px; ' +
-                            'height: 24px; ' +
-                            'top: ' + obj.y + 'px; ' +
-                            'left: ' + (obj.x + obj.w - 24) + 'px; ' +
-                            'border: 1px solid black; ' +
-                            'text-align: center; ' +
-                            'z-index: 500; ' +
-                            'background-color: white; ' +
-                            'font-size: 0.95em; ' +
-                            'color: #009fe2; ' +
-                            'cursor: pointer; ' +
-                        '" ' +
-                    '>0</div>'
-                );
+        state.targets.push(targetObj);
+    }
+
+    function removeDraggable(draggable) {
+        this.draggableList.splice(draggable.onTargetIndex, 1);
+
+        draggable.onTarget = null;
+        draggable.onTargetIndex = null;
+
+        this.updateNumTextEl();
+    }
+
+    function addDraggable(draggable) {
+        draggable.onTarget = this;
+        draggable.onTargetIndex = this.draggableList.push(draggable) - 1;
+
+        this.updateNumTextEl();
+    }
+
+    /*
+     * function cycleDraggableOrder
+     *
+     * Parameters:
+     *     none - This function does not expect any parameters.
+     *
+     * Returns:
+     *     undefined - The return value of this function is not used.
+     *
+     * Description:
+     *     Go through all draggables that are on the current target, and decrease their
+     *     z-index by 1, making sure that the bottom-most draggable ends up on the top.
+     */
+    function cycleDraggableOrder() {
+        var c1, lowestZIndex, highestZIndex;
+
+        if (this.draggableList.length === 0) {
+            return;
+        }
+
+        highestZIndex = -10000;
+        lowestZIndex = 10000;
+
+        for (c1 = 0; c1 < this.draggableList.length; c1 += 1) {
+            if (this.draggableList[c1].zIndex < lowestZIndex) {
+                lowestZIndex = this.draggableList[c1].zIndex;
+            }
+
+            if (this.draggableList[c1].zIndex > highestZIndex) {
+                highestZIndex = this.draggableList[c1].zIndex;
+            }
+        }
+
+        for (c1 = 0; c1 < this.draggableList.length; c1 += 1) {
+            if (this.draggableList[c1].zIndex === lowestZIndex) {
+                this.draggableList[c1].zIndex = highestZIndex;
             } else {
-                numTextEl = null;
+                this.draggableList[c1].zIndex -= 1;
             }
 
-            targetObj = {
-                'id': obj.id,
-
-                'w': obj.w,
-                'h': obj.h,
-
-                'el': targetEl,
-                'offset': targetEl.position(),
-
-                'draggable': [],
-
-                'targetEl': targetEl,
-
-                'numTextEl': numTextEl,
-                'updateNumTextEl': updateNumTextEl
-            };
-
-            if (state.config.onePerTarget === false) {
-                numTextEl.appendTo(state.baseImageEl.parent());
-                numTextEl.mousedown(function (event) {
-                    event.preventDefault();
-                });
-                numTextEl.mouseup(function () {
-                    cycleDraggableOrder.call(targetObj)
-                });
-            }
-
-            state.targets.push(targetObj);
-        }
-
-        function cycleDraggableOrder() {
-            var draggablesInMe, c1, c2, lowestZIndex, highestZIndex;
-
-            if (this.draggable.length === 0) {
-                return 0;
-            }
-
-            draggablesInMe = [];
-
-            for (c1 = 0; c1 < this.draggable.length; c1 += 1) {
-                for (c2 = 0; c2 < state.draggables.length; c2 += 1) {
-                    if (this.draggable[c1] === state.draggables[c2].id) {
-                        draggablesInMe.push(state.draggables[c2]);
-                    }
-                }
-            }
-
-            highestZIndex = -10000;
-            lowestZIndex = 10000;
-
-            for (c1 = 0; c1 < draggablesInMe.length; c1 += 1) {
-                if (draggablesInMe[c1].zIndex < lowestZIndex) {
-                    lowestZIndex = draggablesInMe[c1].zIndex;
-                }
-
-                if (draggablesInMe[c1].zIndex > highestZIndex) {
-                    highestZIndex = draggablesInMe[c1].zIndex;
-                }
-            }
-
-            for (c1 = 0; c1 < draggablesInMe.length; c1 += 1) {
-                if (draggablesInMe[c1].zIndex === lowestZIndex) {
-                    draggablesInMe[c1].zIndex = highestZIndex;
-                    draggablesInMe[c1].oldZIndex = highestZIndex;
-                } else {
-                    draggablesInMe[c1].zIndex -= 1;
-                    draggablesInMe[c1].oldZIndex -= 1;
-                }
-
-                draggablesInMe[c1].iconEl.css('z-index', draggablesInMe[c1].zIndex);
-                if (draggablesInMe[c1].labelEl !== null) {
-                    draggablesInMe[c1].labelEl.css('z-index', draggablesInMe[c1].zIndex);
-                }
+            this.draggableList[c1].iconEl.css('z-index', this.draggableList[c1].zIndex);
+            if (this.draggableList[c1].labelEl !== null) {
+                this.draggableList[c1].labelEl.css('z-index', this.draggableList[c1].zIndex);
             }
         }
-    } // function Targets(state) {
+    }
 
     function updateNumTextEl() {
-        this.numTextEl.html(this.draggable.length);
+        if (this.numTextEl !== null) {
+            this.numTextEl.html(this.draggableList.length);
+        }
     }
 });
 
diff --git a/common/static/js/capa/drag_and_drop/update_input.js b/common/static/js/capa/drag_and_drop/update_input.js
index 6c2b72f6c2..e9c6222058 100644
--- a/common/static/js/capa/drag_and_drop/update_input.js
+++ b/common/static/js/capa/drag_and_drop/update_input.js
@@ -13,8 +13,6 @@ define(['logme'], function (logme) {
     function update(state) {
         var draggables, tempObj;
 
-        logme('state.problemId = ' + state.problemId);
-
         draggables = [];
 
         if (state.config.individualTargets === false) {
@@ -37,9 +35,9 @@ define(['logme'], function (logme) {
             (function (c1) {
                 while (c1 < state.targets.length) {
                     (function (c2) {
-                        while (c2 < state.targets[c1].draggable.length) {
+                        while (c2 < state.targets[c1].draggableList.length) {
                             tempObj = {};
-                            tempObj[state.targets[c1].draggable[c2]] = state.targets[c1].id;
+                            tempObj[state.targets[c1].draggableList[c2].id] = state.targets[c1].id;
                             draggables.push(tempObj);
                             tempObj = null;
 

From 5001680356b38e1caec516321ec446d9d2e183ea Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Thu, 17 Jan 2013 18:26:12 +0200
Subject: [PATCH 518/541] Implemented isReusable feature. Not fully tested.

---
 .../js/capa/drag_and_drop/draggables.js       | 329 +++++++++++++-----
 common/static/js/capa/drag_and_drop/main.js   |   4 -
 .../js/capa/drag_and_drop/update_input.js     |  11 +-
 3 files changed, 257 insertions(+), 87 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index 1946ed8033..aaa3001010 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -59,8 +59,156 @@ define(['logme', 'update_input'], function (logme, updateInput) {
         }
     }
 
+    function makeDraggableCopy() {
+        var draggableObj, obj;
+
+        draggableObj = {
+            'originalConfigObj': this.originalConfigObj,
+            'stateDraggablesIndex': /* this.stateDraggablesIndex */ null, // Will be set.
+
+            'id': this.id,
+
+            'isReusable': this.isReusable,
+            'isOriginal': false,
+
+            'x': this.x,
+            'y': this.y,
+
+            'zIndex': this.zIndex,
+
+            // Not needed, since a copy will never return to a container element.
+            'containerEl': null,
+
+            'iconEl': /* this.iconEl */ null, // Will be created.
+            'iconElBGColor': this.iconElBGColor,
+            'iconElPadding': this.iconElPadding,
+            'iconElBorder': this.iconElBorder,
+            'iconElLeftOffset': this.iconElLeftOffset,
+            'iconWidth': this.iconWidth,
+            'iconHeight': this.iconHeight,
+            'iconWidthSmall': this.iconWidthSmall,
+            'iconHeightSmall': this.iconHeightSmall,
+
+            'labelEl': /* this.labelEl */ null, // Will be created.
+            'labelWidth': this.labelWidth,
+
+            'hasLoaded': this.hasLoaded,
+            'inContainer': this.inContainer,
+            'mousePressed': this.mousePressed,
+            'onTarget': this.onTarget,
+            'onTargetIndex': this.onTargetIndex,
+
+            'state': this.state,
+
+            'mouseDown': this.mouseDown,
+            'mouseUp': this.mouseUp,
+            'mouseMove': this.mouseMove,
+            'checkLandingElement': this.checkLandingElement,
+            'checkIfOnTarget': this.checkIfOnTarget,
+            'snapToTarget': this.snapToTarget,
+            'correctZIndexes': this.correctZIndexes,
+            'moveBackToSlider': this.moveBackToSlider,
+
+            'moveDraggableToTarget': this.moveDraggableToTarget,
+            'moveDraggableToXY': this.moveDraggableToXY,
+
+            'makeDraggableCopy': this.makeDraggableCopy
+        };
+
+        obj = draggableObj.originalConfigObj;
+
+        if (obj.icon.length > 0) {
+            draggableObj.iconEl = $('<img />');
+            draggableObj.iconEl.attr('src', obj.icon);
+            draggableObj.iconEl.load(function () {
+                draggableObj.iconEl.css('position', 'absolute');
+                draggableObj.iconEl.css('width', draggableObj.iconWidthSmall);
+                draggableObj.iconEl.css('height', draggableObj.iconHeightSmall);
+                draggableObj.iconEl.css('left', 50 - draggableObj.iconWidthSmall * 0.5);
+
+                if (obj.label.length > 0) {
+                    draggableObj.iconEl.css('top', 5);
+                } else {
+                    draggableObj.iconEl.css('top', 50 - draggableObj.iconHeightSmall * 0.5);
+                }
+
+                if (obj.label.length > 0) {
+                    draggableObj.labelEl = $(
+                        '<div ' +
+                            'style=" ' +
+                                'position: absolute; ' +
+                                'color: black; ' +
+                                'font-size: 0.95em; ' +
+                            '" ' +
+                        '>' +
+                            obj.label +
+                        '</div>'
+                    );
+
+                    draggableObj.labelEl.css('left', 50 - draggableObj.labelWidth * 0.5);
+                    draggableObj.labelEl.css('top', 5 + draggableObj.iconHeightSmall + 5);
+
+                    draggableObj.labelEl.mousedown(function (event) {
+                        draggableObj.mouseDown.call(draggableObj, event);
+                    });
+                    draggableObj.labelEl.mouseup(function (event) {
+                        draggableObj.mouseUp.call(draggableObj, event);
+                    });
+                    draggableObj.labelEl.mousemove(function (event) {
+                        draggableObj.mouseMove.call(draggableObj, event);
+                    });
+                }
+            });
+        } else {
+            if (obj.label.length > 0) {
+                draggableObj.iconEl = $(
+                    '<div ' +
+                        'style=" ' +
+                            'position: absolute; ' +
+                            'color: black; ' +
+                            'font-size: 0.95em; ' +
+                        '" ' +
+                    '>' +
+                        obj.label +
+                    '</div>'
+                );
+
+                draggableObj.iconEl.css('left', 50 - draggableObj.iconWidthSmall * 0.5);
+                draggableObj.iconEl.css('top', 50 - draggableObj.iconHeightSmall * 0.5);
+            }
+        }
+
+        // Attach events to "iconEl".
+        draggableObj.iconEl.mousedown(function (event) {
+            draggableObj.mouseDown.call(draggableObj, event);
+        });
+        draggableObj.iconEl.mouseup(function (event) {
+            draggableObj.mouseUp.call(draggableObj, event);
+        });
+        draggableObj.iconEl.mousemove(function (event) {
+            draggableObj.mouseMove.call(draggableObj, event);
+        });
+
+        // Attach events to "containerEl".
+        draggableObj.containerEl.mousedown(function (event) {
+            draggableObj.mouseDown.call(draggableObj, event);
+        });
+        draggableObj.containerEl.mouseup(function (event) {
+            draggableObj.mouseUp.call(draggableObj, event);
+        });
+        draggableObj.containerEl.mousemove(function (event) {
+            draggableObj.mouseMove.call(draggableObj, event);
+        });
+
+        draggableObj.stateDraggablesIndex = draggableObj.state.draggables.push(draggableObj);
+
+        logme('Returning from draggableCopy.');
+
+        return draggableObj;
+    }
+
     function moveDraggableToXY(newPosition) {
-        var self, offset;
+        var self, offset, draggableCopy;
 
         if (this.hasLoaded === false) {
             self = this;
@@ -72,15 +220,25 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             return;
         }
 
+        logme('moveDraggableToXY: isReusable = ' + this.isReusable);
+        if ((this.isReusable === true) && (this.isOriginal === true)) {
+            draggableCopy = this.makeDraggableCopy();
+            draggableCopy.moveDraggableToXY(newPosition);
+
+            return;
+        }
+
         offset = 0;
         if (this.state.config.targetOutline === true) {
             offset = 1;
         }
 
         this.inContainer = false;
-        this.containerEl.hide();
 
-        this.iconEl.detach();
+        if (this.isOriginal === true) {
+            this.containerEl.hide();
+            this.iconEl.detach();
+        }
         this.iconEl.css('background-color', this.iconElBGColor);
         this.iconEl.css('padding-left', this.iconElPadding);
         this.iconEl.css('padding-right', this.iconElPadding);
@@ -98,7 +256,9 @@ define(['logme', 'update_input'], function (logme, updateInput) {
         this.iconEl.appendTo(this.state.baseImageEl.parent());
 
         if (this.labelEl !== null) {
-            this.labelEl.detach();
+            if (this.isOriginal === true) {
+                this.labelEl.detach();
+            }
             this.labelEl.css('background-color', this.state.config.labelBgColor);
             this.labelEl.css('padding-left', 8);
             this.labelEl.css('padding-right', 8);
@@ -120,12 +280,14 @@ define(['logme', 'update_input'], function (logme, updateInput) {
         this.zIndex = 1000;
         this.correctZIndexes();
 
-        this.state.numDraggablesInSlider -= 1;
-        this.state.updateArrowOpacity();
+        if (this.isOriginal === true) {
+            this.state.numDraggablesInSlider -= 1;
+            this.state.updateArrowOpacity();
+        }
     }
 
     function moveDraggableToTarget(target) {
-        var self, offset;
+        var self, offset, draggableCopy;
 
         if (this.hasLoaded === false) {
             self = this;
@@ -137,15 +299,25 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             return;
         }
 
+        logme('moveDraggableToTarget: isReusable = ' + this.isReusable);
+        if ((this.isReusable === true) && (this.isOriginal === true)) {
+            draggableCopy = this.makeDraggableCopy();
+            draggableCopy.moveDraggableToTarget(target);
+
+            return;
+        }
+
         offset = 0;
         if (this.state.config.targetOutline === true) {
             offset = 1;
         }
 
         this.inContainer = false;
-        this.containerEl.hide();
 
-        this.iconEl.detach();
+        if (this.isOriginal === true) {
+            this.containerEl.hide();
+            this.iconEl.detach();
+        }
         this.iconEl.css('background-color', this.iconElBGColor);
         this.iconEl.css('padding-left', this.iconElPadding);
         this.iconEl.css('padding-right', this.iconElPadding);
@@ -163,7 +335,9 @@ define(['logme', 'update_input'], function (logme, updateInput) {
         this.iconEl.appendTo(this.state.baseImageEl.parent());
 
         if (this.labelEl !== null) {
-            this.labelEl.detach();
+            if (this.isOriginal === true) {
+                this.labelEl.detach();
+            }
             this.labelEl.css('background-color', this.state.config.labelBgColor);
             this.labelEl.css('padding-left', 8);
             this.labelEl.css('padding-right', 8);
@@ -184,14 +358,20 @@ define(['logme', 'update_input'], function (logme, updateInput) {
         this.zIndex = 1000;
         this.correctZIndexes();
 
-        this.state.numDraggablesInSlider -= 1;
-        this.state.updateArrowOpacity();
+        if (this.isOriginal === true) {
+            this.state.numDraggablesInSlider -= 1;
+            this.state.updateArrowOpacity();
+        }
+
     }
 
     function processDraggable(state, obj) {
         var draggableObj;
 
         draggableObj = {
+            'originalConfigObj': obj,
+            'stateDraggablesIndex': null,
+
             'id': obj.id,
 
             'isReusable': obj.can_reuse,
@@ -235,7 +415,9 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             'moveBackToSlider': moveBackToSlider,
 
             'moveDraggableToTarget': moveDraggableToTarget,
-            'moveDraggableToXY': moveDraggableToXY
+            'moveDraggableToXY': moveDraggableToXY,
+
+            'makeDraggableCopy': makeDraggableCopy
         };
 
         draggableObj.containerEl = $(
@@ -383,98 +565,71 @@ define(['logme', 'update_input'], function (logme, updateInput) {
         });
 
         state.numDraggablesInSlider += 1;
-        state.draggables.push(draggableObj);
+        draggableObj.stateDraggablesIndex = state.draggables.push(draggableObj) - 1;
     }
 
     function mouseDown(event) {
+        var draggableCopy;
+
         if (this.mousePressed === false) {
             // So that the browser does not perform a default drag.
             // If we don't do this, each drag operation will
             // potentially cause the highlghting of the dragged element.
             event.preventDefault();
 
-            if ((this.isReusable === true) && (this.isOriginal === true)) {
-
-                return;
-            }
-
             // If this draggable is just being dragged out of the
             // container, we must perform some additional tasks.
             if (this.inContainer === true) {
-                this.containerEl.hide();
+                if ((this.isReusable === true) && (this.isOriginal === true)) {
+                    draggableCopy = this.makeDraggableCopy();
+                    draggableCopy.mouseDown(event);
 
-                this.iconEl.detach();
-                this.iconEl.css(
-                    'background-color', this.iconElBGColor
-                );
-                this.iconEl.css(
-                    'padding-left', this.iconElPadding
-                );
-                this.iconEl.css(
-                    'padding-right', this.iconElPadding
-                );
-                this.iconEl.css(
-                    'border', this.iconElBorder
-                );
-                this.iconEl.css(
-                    'width',
-                    this.iconWidth
-                );
-                this.iconEl.css(
-                    'height',
-                    this.iconHeight
-                );
+                    return;
+                }
+
+                if (this.isOriginal === true) {
+                    this.containerEl.hide();
+                    this.iconEl.detach();
+                }
+                this.iconEl.css('background-color', this.iconElBGColor);
+                this.iconEl.css('padding-left', this.iconElPadding);
+                this.iconEl.css('padding-right', this.iconElPadding);
+                this.iconEl.css('border', this.iconElBorder);
+                this.iconEl.css('width', this.iconWidth);
+                this.iconEl.css('height', this.iconHeight);
                 this.iconEl.css(
                     'left',
-                    event.pageX -
-                        this.state.baseImageEl.offset().left -
-                        this.iconWidth * 0.5
-                        - this.iconElLeftOffset
+                    event.pageX - this.state.baseImageEl.offset().left - this.iconWidth * 0.5 - this.iconElLeftOffset
                 );
                 this.iconEl.css(
                     'top',
-                    event.pageY -
-                        this.state.baseImageEl.offset().top -
-                        this.iconHeight * 0.5
-                );
-                this.iconEl.appendTo(
-                    this.state.baseImageEl.parent()
+                    event.pageY - this.state.baseImageEl.offset().top - this.iconHeight * 0.5
                 );
+                this.iconEl.appendTo(this.state.baseImageEl.parent());
 
                 if (this.labelEl !== null) {
-                    this.labelEl.detach();
-                    this.labelEl.css(
-                        'background-color', this.state.config.labelBgColor
-                    );
-                    this.labelEl.css(
-                        'padding-left', 8
-                    );
-                    this.labelEl.css(
-                        'padding-right', 8
-                    );
-                    this.labelEl.css(
-                        'border', '1px solid black'
-                    );
+                    if (this.isOriginal === true) {
+                        this.labelEl.detach();
+                    }
+                    this.labelEl.css('background-color', this.state.config.labelBgColor);
+                    this.labelEl.css('padding-left', 8);
+                    this.labelEl.css('padding-right', 8);
+                    this.labelEl.css('border', '1px solid black');
                     this.labelEl.css(
                         'left',
-                        event.pageX -
-                            this.state.baseImageEl.offset().left -
-                            this.labelWidth * 0.5
-                            - 9 // Account for padding, border.
+                        event.pageX - this.state.baseImageEl.offset().left - this.labelWidth * 0.5 - 9 // Account for padding, border.
                     );
                     this.labelEl.css(
                         'top',
-                        event.pageY -
-                            this.state.baseImageEl.offset().top +
-                            this.iconHeight * 0.5 + 5
-                    );
-                    this.labelEl.appendTo(
-                        this.state.baseImageEl.parent()
+                        event.pageY - this.state.baseImageEl.offset().top + this.iconHeight * 0.5 + 5
                     );
+                    this.labelEl.appendTo(this.state.baseImageEl.parent());
                 }
 
                 this.inContainer = false;
-                this.state.numDraggablesInSlider -= 1;
+                if (this.isOriginal === true) {
+                    this.state.numDraggablesInSlider -= 1;
+                }
             }
 
             this.zIndex = 1000;
@@ -549,7 +704,9 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
                 this.moveBackToSlider();
 
-                this.state.numDraggablesInSlider += 1;
+                if (this.isOriginal === true) {
+                    this.state.numDraggablesInSlider += 1;
+                }
             }
         } else {
             if (
@@ -563,7 +720,9 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                 this.x = -1;
                 this.y = -1;
 
-                this.state.numDraggablesInSlider += 1;
+                if (this.isOriginal === true) {
+                    this.state.numDraggablesInSlider += 1;
+                }
             } else {
                 this.correctZIndexes();
 
@@ -572,11 +731,12 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             }
         }
 
-        this.state.updateArrowOpacity();
+        if (this.isOriginal === true) {
+            this.state.updateArrowOpacity();
+        }
         updateInput.update(this.state);
     }
 
-    //
     // Determine if a draggable, after it was relased, ends up on a
     // target. We do this by iterating over all of the targets, and
     // for each one we check whether the draggable's center is
@@ -585,7 +745,6 @@ define(['logme', 'update_input'], function (logme, updateInput) {
     // positionIE is the object as returned by
     //
     //     this.iconEl.position()
-    //
     function checkIfOnTarget(positionIE) {
         var c1, target;
 
@@ -732,9 +891,17 @@ define(['logme', 'update_input'], function (logme, updateInput) {
     // move it back to the slider, placing it in the same position
     // that it was dragged out of.
     function moveBackToSlider() {
+        if (this.isOriginal === false) {
+            this.iconEl.empty();
+            if (this.labelEl !== null) {
+                this.labelEl.empty();
+            }
+            this.state.draggables.splice(this.stateDraggablesIndex, 1);
+        }
+
         this.containerEl.show();
 
-        this.zIndex = this.oldZIndex;
+        this.zIndex = 1;
 
         this.iconEl.detach();
         this.iconEl.css('border', 'none');
diff --git a/common/static/js/capa/drag_and_drop/main.js b/common/static/js/capa/drag_and_drop/main.js
index e7b02dec47..114aa22616 100644
--- a/common/static/js/capa/drag_and_drop/main.js
+++ b/common/static/js/capa/drag_and_drop/main.js
@@ -69,10 +69,6 @@ define(
                 updateInput.update(state);
             }
         }());
-
-        setTimeout(function () {
-            logme('After 1000 ms:', state);
-        }, 1000);
     }
 });
 
diff --git a/common/static/js/capa/drag_and_drop/update_input.js b/common/static/js/capa/drag_and_drop/update_input.js
index e9c6222058..6685672420 100644
--- a/common/static/js/capa/drag_and_drop/update_input.js
+++ b/common/static/js/capa/drag_and_drop/update_input.js
@@ -198,9 +198,16 @@ define(['logme'], function (logme) {
     function getById(state, type, id) {
         return (function (c1) {
             while (c1 < state[type].length) {
-                if (state[type][c1].id === id) {
-                    return state[type][c1];
+                if (type === 'draggables') {
+                    if ((state[type][c1].id === id) && (state[type][c1].isOriginal === true)) {
+                        return state[type][c1];
+                    }
+                } else { // 'targets'
+                    if (state[type][c1].id === id) {
+                        return state[type][c1];
+                    }
                 }
+
                 c1 += 1;
             }
 

From 0f7b89faccb0f2d4495b8cf23e20d06474e1644d Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Fri, 18 Jan 2013 12:07:19 +0200
Subject: [PATCH 519/541] Bug fixes for new functionality: Draggable "is
 reusable".

---
 .../js/capa/drag_and_drop/draggables.js       | 83 ++++++++++++-------
 .../static/js/capa/drag_and_drop/targets.js   | 17 +++-
 2 files changed, 70 insertions(+), 30 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index aaa3001010..72d424c7af 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -59,7 +59,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
         }
     }
 
-    function makeDraggableCopy() {
+    function makeDraggableCopy(callbackFunc) {
         var draggableObj, obj;
 
         draggableObj = {
@@ -158,7 +158,26 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                         draggableObj.mouseMove.call(draggableObj, event);
                     });
                 }
+
+                // Attach events to "iconEl".
+                draggableObj.iconEl.mousedown(function (event) {
+                    draggableObj.mouseDown.call(draggableObj, event);
+                });
+                draggableObj.iconEl.mouseup(function (event) {
+                    draggableObj.mouseUp.call(draggableObj, event);
+                });
+                draggableObj.iconEl.mousemove(function (event) {
+                    draggableObj.mouseMove.call(draggableObj, event);
+                });
+
+                draggableObj.stateDraggablesIndex = draggableObj.state.draggables.push(draggableObj);
+
+                setTimeout(function () {
+                    callbackFunc(draggableObj);
+                }, 0);
             });
+
+            return;
         } else {
             if (obj.label.length > 0) {
                 draggableObj.iconEl = $(
@@ -189,26 +208,17 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             draggableObj.mouseMove.call(draggableObj, event);
         });
 
-        // Attach events to "containerEl".
-        draggableObj.containerEl.mousedown(function (event) {
-            draggableObj.mouseDown.call(draggableObj, event);
-        });
-        draggableObj.containerEl.mouseup(function (event) {
-            draggableObj.mouseUp.call(draggableObj, event);
-        });
-        draggableObj.containerEl.mousemove(function (event) {
-            draggableObj.mouseMove.call(draggableObj, event);
-        });
-
         draggableObj.stateDraggablesIndex = draggableObj.state.draggables.push(draggableObj);
 
-        logme('Returning from draggableCopy.');
+        setTimeout(function () {
+            callbackFunc(draggableObj);
+        }, 0);
 
-        return draggableObj;
+        return;
     }
 
     function moveDraggableToXY(newPosition) {
-        var self, offset, draggableCopy;
+        var self, offset;
 
         if (this.hasLoaded === false) {
             self = this;
@@ -220,10 +230,10 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             return;
         }
 
-        logme('moveDraggableToXY: isReusable = ' + this.isReusable);
         if ((this.isReusable === true) && (this.isOriginal === true)) {
-            draggableCopy = this.makeDraggableCopy();
-            draggableCopy.moveDraggableToXY(newPosition);
+            this.makeDraggableCopy(function (draggableCopy) {
+                draggableCopy.moveDraggableToXY(newPosition);
+            });
 
             return;
         }
@@ -287,7 +297,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
     }
 
     function moveDraggableToTarget(target) {
-        var self, offset, draggableCopy;
+        var self, offset;
 
         if (this.hasLoaded === false) {
             self = this;
@@ -299,10 +309,10 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             return;
         }
 
-        logme('moveDraggableToTarget: isReusable = ' + this.isReusable);
         if ((this.isReusable === true) && (this.isOriginal === true)) {
-            draggableCopy = this.makeDraggableCopy();
-            draggableCopy.moveDraggableToTarget(target);
+            this.makeDraggableCopy(function (draggableCopy) {
+                draggableCopy.moveDraggableToTarget(target);
+            });
 
             return;
         }
@@ -569,20 +579,20 @@ define(['logme', 'update_input'], function (logme, updateInput) {
     }
 
     function mouseDown(event) {
-        var draggableCopy;
-
         if (this.mousePressed === false) {
             // So that the browser does not perform a default drag.
             // If we don't do this, each drag operation will
             // potentially cause the highlghting of the dragged element.
             event.preventDefault();
+            event.stopPropagation();
 
             // If this draggable is just being dragged out of the
             // container, we must perform some additional tasks.
             if (this.inContainer === true) {
                 if ((this.isReusable === true) && (this.isOriginal === true)) {
-                    draggableCopy = this.makeDraggableCopy();
-                    draggableCopy.mouseDown(event);
+                    this.makeDraggableCopy(function (draggableCopy) {
+                        draggableCopy.mouseDown(event);
+                    });
 
                     return;
                 }
@@ -651,7 +661,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
         }
     }
 
-    function mouseMove() {
+    function mouseMove(event) {
         if (this.mousePressed === true) {
             // Because we have also attached a 'mousemove' event to the
             // 'document' (that will do the same thing), let's tell the
@@ -881,9 +891,9 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
         this.zIndex = highestZIndex + 1;
 
-        this.iconEl.css('z-index', highestZIndex);
+        this.iconEl.css('z-index', this.zIndex);
         if (this.labelEl !== null) {
-            this.labelEl.css('z-index', highestZIndex);
+            this.labelEl.css('z-index', this.zIndex);
         }
     }
 
@@ -891,12 +901,27 @@ define(['logme', 'update_input'], function (logme, updateInput) {
     // move it back to the slider, placing it in the same position
     // that it was dragged out of.
     function moveBackToSlider() {
+        var c1;
+
         if (this.isOriginal === false) {
             this.iconEl.empty();
+            this.iconEl.remove();
             if (this.labelEl !== null) {
                 this.labelEl.empty();
+                this.labelEl.remove();
             }
             this.state.draggables.splice(this.stateDraggablesIndex, 1);
+
+            c1 = 0;
+            while (c1 < this.state.draggables) {
+                if (this.state.draggables[c1].stateDraggablesIndex > this.stateDraggablesIndex) {
+                    this.state.draggables[c1].stateDraggablesIndex -= 1;
+                }
+
+                c1 += 1;
+            }
+
+            return;
         }
 
         this.containerEl.show();
diff --git a/common/static/js/capa/drag_and_drop/targets.js b/common/static/js/capa/drag_and_drop/targets.js
index 40828ffba3..2d1c8b8326 100644
--- a/common/static/js/capa/drag_and_drop/targets.js
+++ b/common/static/js/capa/drag_and_drop/targets.js
@@ -79,6 +79,8 @@ define(['logme'], function (logme) {
 
             'draggableList': [],
 
+            'state': state,
+
             'targetEl': targetEl,
 
             'numTextEl': numTextEl,
@@ -102,8 +104,21 @@ define(['logme'], function (logme) {
     }
 
     function removeDraggable(draggable) {
+        var c1;
+
         this.draggableList.splice(draggable.onTargetIndex, 1);
 
+        // An item from the array was removed. We need to updated all indexes accordingly.
+        // Shift all indexes down by one if they are higher than the index of the removed item.
+        c1 = 0;
+        while (c1 < this.draggableList.length) {
+            if (this.draggableList[c1].onTargetIndex > draggable.onTargetIndex) {
+                this.draggableList[c1].onTargetIndex -= 1;
+            }
+
+            c1 += 1;
+        }
+
         draggable.onTarget = null;
         draggable.onTargetIndex = null;
 
@@ -133,7 +148,7 @@ define(['logme'], function (logme) {
     function cycleDraggableOrder() {
         var c1, lowestZIndex, highestZIndex;
 
-        if (this.draggableList.length === 0) {
+        if (this.draggableList.length < 2) {
             return;
         }
 

From 1eec7bada710b90f10a05a39ee36a89246a35965 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Fri, 18 Jan 2013 12:51:48 +0200
Subject: [PATCH 520/541] Updated docs. Added debug output info for tracing
 problem related to server communications.

---
 common/static/js/capa/drag_and_drop/update_input.js | 1 +
 docs/source/drag_and_drop_input.rst                 | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/common/static/js/capa/drag_and_drop/update_input.js b/common/static/js/capa/drag_and_drop/update_input.js
index 6685672420..91881b21ec 100644
--- a/common/static/js/capa/drag_and_drop/update_input.js
+++ b/common/static/js/capa/drag_and_drop/update_input.js
@@ -50,6 +50,7 @@ define(['logme'], function (logme) {
             }(0));
         }
 
+        logme('input = "' + JSON.stringify({'draggables': draggables}) + '".');
         $('#input_' + state.problemId).val(JSON.stringify({'draggables': draggables}));
     }
 
diff --git a/docs/source/drag_and_drop_input.rst b/docs/source/drag_and_drop_input.rst
index fac75368b2..dc13dcfb11 100644
--- a/docs/source/drag_and_drop_input.rst
+++ b/docs/source/drag_and_drop_input.rst
@@ -215,8 +215,11 @@ If we have can_reuse=true, than one must use only long form of correct answer.
 Logic flow
 ----------
 
+(Click on image to see full size version.)
+
 .. image:: draganddrop_logic_flow.png
-    :scale: 36 %
+    :width: 100%
+    :target: _images/draganddrop_logic_flow.png
 
 
 Example

From 7ad6ef21f47e469cdb7d71bd303b9f12f82f55f4 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Fri, 18 Jan 2013 13:30:41 +0200
Subject: [PATCH 521/541] Removed unnecessary debug information.

---
 common/static/js/capa/drag_and_drop/update_input.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/static/js/capa/drag_and_drop/update_input.js b/common/static/js/capa/drag_and_drop/update_input.js
index 91881b21ec..20a75ecff3 100644
--- a/common/static/js/capa/drag_and_drop/update_input.js
+++ b/common/static/js/capa/drag_and_drop/update_input.js
@@ -50,7 +50,6 @@ define(['logme'], function (logme) {
             }(0));
         }
 
-        logme('input = "' + JSON.stringify({'draggables': draggables}) + '".');
         $('#input_' + state.problemId).val(JSON.stringify({'draggables': draggables}));
     }
 
@@ -183,6 +182,10 @@ define(['logme'], function (logme) {
     }
 
     function repositionDraggables(state, answer) {
+        if (answer.draggables.length === 0) {
+            return;
+        }
+
         if (state.config.individualTargets !== getUseTargets(answer)) {
             logme('ERROR: JSON config is not consistent with server response.');
 

From 5457f35f81f26c9bdf50022af549b4de697a4159 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Fri, 18 Jan 2013 16:05:33 +0200
Subject: [PATCH 522/541] Drag and Drop: Further testing of new feature "can
 reuse".

---
 .../js/capa/drag_and_drop/draggables.js       |  6 ++++-
 common/static/js/capa/drag_and_drop/state.js  | 26 ++++++++++++++++++-
 .../static/js/capa/drag_and_drop/targets.js   |  3 +--
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index 72d424c7af..87081a78f8 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -63,6 +63,8 @@ define(['logme', 'update_input'], function (logme, updateInput) {
         var draggableObj, obj;
 
         draggableObj = {
+            'uniqueId': /* this.uniqueId */ this.state.getUniqueId(), // Is newly set.
+
             'originalConfigObj': this.originalConfigObj,
             'stateDraggablesIndex': /* this.stateDraggablesIndex */ null, // Will be set.
 
@@ -379,6 +381,8 @@ define(['logme', 'update_input'], function (logme, updateInput) {
         var draggableObj;
 
         draggableObj = {
+            'uniqueId': state.getUniqueId(),
+
             'originalConfigObj': obj,
             'stateDraggablesIndex': null,
 
@@ -768,7 +772,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             if (
                 (this.state.config.onePerTarget === true) &&
                 (target.draggableList.length === 1) &&
-                (target.draggableList[0].id !== this.id)
+                (target.draggableList[0].uniqueId !== this.uniqueId)
             ) {
                 continue;
             }
diff --git a/common/static/js/capa/drag_and_drop/state.js b/common/static/js/capa/drag_and_drop/state.js
index d99b90872f..d0ea6b65ef 100644
--- a/common/static/js/capa/drag_and_drop/state.js
+++ b/common/static/js/capa/drag_and_drop/state.js
@@ -26,9 +26,33 @@ define([], function () {
 
             'targets': [],
 
-            'updateArrowOpacity': null
+            'updateArrowOpacity': null,
+
+            'uniqueId': 0,
+            'salt': makeSalt(),
+
+            'getUniqueId': getUniqueId
         };
     }
+
+    function getUniqueId() {
+        this.uniqueId += 1;
+
+        return this.salt + '_' + this.uniqueId.toFixed(0);
+    }
+
+    function makeSalt() {
+        var text, possible, i;
+
+        text = '';
+        possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+
+        for(i = 0; i < 5; i += 1) {
+            text += possible.charAt(Math.floor(Math.random() * possible.length));
+        }
+
+        return text;
+    }
 });
 
 // End of wrapper for RequireJS. As you can see, we are passing
diff --git a/common/static/js/capa/drag_and_drop/targets.js b/common/static/js/capa/drag_and_drop/targets.js
index 2d1c8b8326..e56020aac6 100644
--- a/common/static/js/capa/drag_and_drop/targets.js
+++ b/common/static/js/capa/drag_and_drop/targets.js
@@ -15,7 +15,7 @@ define(['logme'], function (logme) {
                 c1 += 1;
             }
         }(0));
-    } // function Targets(state) {
+    }
 
     function processTarget(state, obj) {
         var targetEl, borderCss, numTextEl, targetObj;
@@ -36,7 +36,6 @@ define(['logme'], function (logme) {
                     'left: ' + obj.x + 'px; ' +
                     borderCss +
                 '" ' +
-                'data-target-id="' + obj.id + '" ' +
             '></div>'
         );
         targetEl.appendTo(state.baseImageEl.parent());

From a228c163c7746dfc5691a959cc659ea49cea1c3b Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Fri, 18 Jan 2013 17:02:02 +0200
Subject: [PATCH 523/541]  added test for alternative answer notation

---
 common/lib/capa/capa/verifiers/tests_draganddrop.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/common/lib/capa/capa/verifiers/tests_draganddrop.py b/common/lib/capa/capa/verifiers/tests_draganddrop.py
index f708413c46..55425ae910 100644
--- a/common/lib/capa/capa/verifiers/tests_draganddrop.py
+++ b/common/lib/capa/capa/verifiers/tests_draganddrop.py
@@ -505,6 +505,17 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
         }]
         self.assertFalse(draganddrop.grade(user_input, correct_answer))
 
+    def test_alternative_correct_answer(self):
+        user_input = '{"draggables":[{"name_with_icon":"t1"},\
+        {"name_with_icon":"t1"},{"name_with_icon":"t1"},{"name4":"t1"}, \
+        {"name4":"t1"}]}'
+        correct_answer = [
+        {'draggables': ['name4'], 'targets': ['t1', 't1'], 'rule': 'exact'},
+        {'draggables': ['name_with_icon'], 'targets': ['t1', 't1', 't1'],
+        'rule': 'exact'}
+        ]
+        self.assertTrue(draganddrop.grade(user_input, correct_answer))
+
 
 class Test_DragAndDrop_Populate(unittest.TestCase):
 

From 3cc4a663ff047239150c4d9869fc8e97f0da6868 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Fri, 18 Jan 2013 18:32:27 +0200
Subject: [PATCH 524/541] Refactoring and cleaning of code.

---
 .../js/capa/drag_and_drop/base_image.js       |   6 +-
 .../js/capa/drag_and_drop/draggables.js       | 591 ++++++------------
 .../js/capa/drag_and_drop/update_input.js     |   4 +-
 3 files changed, 196 insertions(+), 405 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/base_image.js b/common/static/js/capa/drag_and_drop/base_image.js
index d818804be2..da875c4329 100644
--- a/common/static/js/capa/drag_and_drop/base_image.js
+++ b/common/static/js/capa/drag_and_drop/base_image.js
@@ -26,8 +26,10 @@ define(['logme'], function (logme) {
 
         state.baseImageEl.attr('src', state.config.baseImage);
         state.baseImageEl.load(function () {
-            baseImageElContainer.css('width', this.width);
-            baseImageElContainer.css('height', this.height);
+            baseImageElContainer.css({
+                'width': this.width,
+                'height': this.height
+            });
 
             state.baseImageEl.appendTo(baseImageElContainer);
             baseImageElContainer.appendTo(state.containerEl);
diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index 87081a78f8..a7c36e40fc 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -60,81 +60,37 @@ define(['logme', 'update_input'], function (logme, updateInput) {
     }
 
     function makeDraggableCopy(callbackFunc) {
-        var draggableObj, obj;
+        var draggableObj, property;
 
-        draggableObj = {
-            'uniqueId': /* this.uniqueId */ this.state.getUniqueId(), // Is newly set.
+        // Make a full proper copy of the draggable object, with some modifications.
+        draggableObj = {};
+        for (property in this) {
+            if (this.hasOwnProperty(property) === true) {
+                draggableObj[property] = this[property];
+            }
+        }
+        // The modifications to the draggable copy.
+        draggableObj.isOriginal = false; // This new draggable is a copy.
+        draggableObj.uniqueId = draggableObj.state.getUniqueId(); // Is newly set.
+        draggableObj.stateDraggablesIndex = null; // Will be set.
+        draggableObj.containerEl = null; // Not needed, since a copy will never return to a container element.
+        draggableObj.iconEl = null; // Will be created.
+        draggableObj.labelEl = null; // Will be created.
 
-            'originalConfigObj': this.originalConfigObj,
-            'stateDraggablesIndex': /* this.stateDraggablesIndex */ null, // Will be set.
-
-            'id': this.id,
-
-            'isReusable': this.isReusable,
-            'isOriginal': false,
-
-            'x': this.x,
-            'y': this.y,
-
-            'zIndex': this.zIndex,
-
-            // Not needed, since a copy will never return to a container element.
-            'containerEl': null,
-
-            'iconEl': /* this.iconEl */ null, // Will be created.
-            'iconElBGColor': this.iconElBGColor,
-            'iconElPadding': this.iconElPadding,
-            'iconElBorder': this.iconElBorder,
-            'iconElLeftOffset': this.iconElLeftOffset,
-            'iconWidth': this.iconWidth,
-            'iconHeight': this.iconHeight,
-            'iconWidthSmall': this.iconWidthSmall,
-            'iconHeightSmall': this.iconHeightSmall,
-
-            'labelEl': /* this.labelEl */ null, // Will be created.
-            'labelWidth': this.labelWidth,
-
-            'hasLoaded': this.hasLoaded,
-            'inContainer': this.inContainer,
-            'mousePressed': this.mousePressed,
-            'onTarget': this.onTarget,
-            'onTargetIndex': this.onTargetIndex,
-
-            'state': this.state,
-
-            'mouseDown': this.mouseDown,
-            'mouseUp': this.mouseUp,
-            'mouseMove': this.mouseMove,
-            'checkLandingElement': this.checkLandingElement,
-            'checkIfOnTarget': this.checkIfOnTarget,
-            'snapToTarget': this.snapToTarget,
-            'correctZIndexes': this.correctZIndexes,
-            'moveBackToSlider': this.moveBackToSlider,
-
-            'moveDraggableToTarget': this.moveDraggableToTarget,
-            'moveDraggableToXY': this.moveDraggableToXY,
-
-            'makeDraggableCopy': this.makeDraggableCopy
-        };
-
-        obj = draggableObj.originalConfigObj;
-
-        if (obj.icon.length > 0) {
+        // Create DOM elements and attach events.
+        if (draggableObj.originalConfigObj.icon.length > 0) {
             draggableObj.iconEl = $('<img />');
-            draggableObj.iconEl.attr('src', obj.icon);
+            draggableObj.iconEl.attr('src', draggableObj.originalConfigObj.icon);
             draggableObj.iconEl.load(function () {
-                draggableObj.iconEl.css('position', 'absolute');
-                draggableObj.iconEl.css('width', draggableObj.iconWidthSmall);
-                draggableObj.iconEl.css('height', draggableObj.iconHeightSmall);
-                draggableObj.iconEl.css('left', 50 - draggableObj.iconWidthSmall * 0.5);
+                draggableObj.iconEl.css({
+                    'position': 'absolute',
+                    'width': draggableObj.iconWidthSmall,
+                    'height': draggableObj.iconHeightSmall,
+                    'left': 50 - draggableObj.iconWidthSmall * 0.5,
+                    'top': ((draggableObj.originalConfigObj.label.length > 0) ? 5 : 50 - draggableObj.iconHeightSmall * 0.5)
+                });
 
-                if (obj.label.length > 0) {
-                    draggableObj.iconEl.css('top', 5);
-                } else {
-                    draggableObj.iconEl.css('top', 50 - draggableObj.iconHeightSmall * 0.5);
-                }
-
-                if (obj.label.length > 0) {
+                if (draggableObj.originalConfigObj.label.length > 0) {
                     draggableObj.labelEl = $(
                         '<div ' +
                             'style=" ' +
@@ -143,34 +99,18 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                                 'font-size: 0.95em; ' +
                             '" ' +
                         '>' +
-                            obj.label +
+                            draggableObj.originalConfigObj.label +
                         '</div>'
                     );
+                    draggableObj.labelEl.css({
+                        'left': 50 - draggableObj.labelWidth * 0.5,
+                        'top': 5 + draggableObj.iconHeightSmall + 5
+                    });
 
-                    draggableObj.labelEl.css('left', 50 - draggableObj.labelWidth * 0.5);
-                    draggableObj.labelEl.css('top', 5 + draggableObj.iconHeightSmall + 5);
-
-                    draggableObj.labelEl.mousedown(function (event) {
-                        draggableObj.mouseDown.call(draggableObj, event);
-                    });
-                    draggableObj.labelEl.mouseup(function (event) {
-                        draggableObj.mouseUp.call(draggableObj, event);
-                    });
-                    draggableObj.labelEl.mousemove(function (event) {
-                        draggableObj.mouseMove.call(draggableObj, event);
-                    });
+                    draggableObj.attachMouseEventsTo('labelEl');
                 }
 
-                // Attach events to "iconEl".
-                draggableObj.iconEl.mousedown(function (event) {
-                    draggableObj.mouseDown.call(draggableObj, event);
-                });
-                draggableObj.iconEl.mouseup(function (event) {
-                    draggableObj.mouseUp.call(draggableObj, event);
-                });
-                draggableObj.iconEl.mousemove(function (event) {
-                    draggableObj.mouseMove.call(draggableObj, event);
-                });
+                draggableObj.attachMouseEventsTo('iconEl');
 
                 draggableObj.stateDraggablesIndex = draggableObj.state.draggables.push(draggableObj);
 
@@ -181,7 +121,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
             return;
         } else {
-            if (obj.label.length > 0) {
+            if (draggableObj.originalConfigObj.label.length > 0) {
                 draggableObj.iconEl = $(
                     '<div ' +
                         'style=" ' +
@@ -190,43 +130,51 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                             'font-size: 0.95em; ' +
                         '" ' +
                     '>' +
-                        obj.label +
+                        draggableObj.originalConfigObj.label +
                     '</div>'
                 );
+                draggableObj.iconEl.css({
+                    'left': 50 - draggableObj.iconWidthSmall * 0.5,
+                    'top': 50 - draggableObj.iconHeightSmall * 0.5
+                });
 
-                draggableObj.iconEl.css('left', 50 - draggableObj.iconWidthSmall * 0.5);
-                draggableObj.iconEl.css('top', 50 - draggableObj.iconHeightSmall * 0.5);
+                draggableObj.attachMouseEventsTo('iconEl');
+
+                draggableObj.stateDraggablesIndex = draggableObj.state.draggables.push(draggableObj);
+
+                setTimeout(function () {
+                    callbackFunc(draggableObj);
+                }, 0);
+
+                return;
             }
         }
-
-        // Attach events to "iconEl".
-        draggableObj.iconEl.mousedown(function (event) {
-            draggableObj.mouseDown.call(draggableObj, event);
-        });
-        draggableObj.iconEl.mouseup(function (event) {
-            draggableObj.mouseUp.call(draggableObj, event);
-        });
-        draggableObj.iconEl.mousemove(function (event) {
-            draggableObj.mouseMove.call(draggableObj, event);
-        });
-
-        draggableObj.stateDraggablesIndex = draggableObj.state.draggables.push(draggableObj);
-
-        setTimeout(function () {
-            callbackFunc(draggableObj);
-        }, 0);
-
-        return;
     }
 
-    function moveDraggableToXY(newPosition) {
+    function attachMouseEventsTo(element) {
+        var self;
+
+        self = this;
+
+        this[element].mousedown(function (event) {
+            self.mouseDown(event);
+        });
+        this[element].mouseup(function (event) {
+            self.mouseUp(event);
+        });
+        this[element].mousemove(function (event) {
+            self.mouseMove(event);
+        });
+    }
+
+    function moveDraggableTo(moveType, target) {
         var self, offset;
 
         if (this.hasLoaded === false) {
             self = this;
 
             setTimeout(function () {
-                self.moveDraggableToXY(newPosition);
+                self.moveDraggableTo(moveType, target);
             }, 50);
 
             return;
@@ -234,7 +182,7 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
         if ((this.isReusable === true) && (this.isOriginal === true)) {
             this.makeDraggableCopy(function (draggableCopy) {
-                draggableCopy.moveDraggableToXY(newPosition);
+                draggableCopy.moveDraggableTo(moveType, target);
             });
 
             return;
@@ -251,121 +199,57 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             this.containerEl.hide();
             this.iconEl.detach();
         }
-        this.iconEl.css('background-color', this.iconElBGColor);
-        this.iconEl.css('padding-left', this.iconElPadding);
-        this.iconEl.css('padding-right', this.iconElPadding);
-        this.iconEl.css('border', this.iconElBorder);
-        this.iconEl.css('width', this.iconWidth);
-        this.iconEl.css('height', this.iconHeight);
-        this.iconEl.css(
-            'left',
-            newPosition.x - this.iconWidth * 0.5 + offset - this.iconElLeftOffset
-        );
-        this.iconEl.css(
-            'top',
-            newPosition.y - this.iconHeight * 0.5 + offset
-        );
-        this.iconEl.appendTo(this.state.baseImageEl.parent());
-
-        if (this.labelEl !== null) {
-            if (this.isOriginal === true) {
-                this.labelEl.detach();
-            }
-            this.labelEl.css('background-color', this.state.config.labelBgColor);
-            this.labelEl.css('padding-left', 8);
-            this.labelEl.css('padding-right', 8);
-            this.labelEl.css('border', '1px solid black');
-            this.labelEl.css(
-                'left',
-                newPosition.x - this.labelWidth * 0.5 + offset - 9 // Account for padding, border.
-            );
-            this.labelEl.css(
-                'top',
-                newPosition.y - this.iconHeight * 0.5 + this.iconHeight + 5 + offset
-            );
-            this.labelEl.appendTo(this.state.baseImageEl.parent());
-        }
-
-        this.x = newPosition.x;
-        this.y = newPosition.y;
-
-        this.zIndex = 1000;
-        this.correctZIndexes();
-
-        if (this.isOriginal === true) {
-            this.state.numDraggablesInSlider -= 1;
-            this.state.updateArrowOpacity();
-        }
-    }
-
-    function moveDraggableToTarget(target) {
-        var self, offset;
-
-        if (this.hasLoaded === false) {
-            self = this;
-
-            setTimeout(function () {
-                self.moveDraggableToTarget(target);
-            }, 50);
-
-            return;
-        }
-
-        if ((this.isReusable === true) && (this.isOriginal === true)) {
-            this.makeDraggableCopy(function (draggableCopy) {
-                draggableCopy.moveDraggableToTarget(target);
+        this.iconEl.css({
+            'background-color': this.iconElBGColor,
+            'padding-left': this.iconElPadding,
+            'padding-right': this.iconElPadding,
+            'border': this.iconElBorder,
+            'width': this.iconWidth,
+            'height': this.iconHeight
+        });
+        if (moveType === 'target') {
+            this.iconEl.css({
+                'left': target.offset.left + 0.5 * target.w - this.iconWidth * 0.5 + offset - this.iconElLeftOffset,
+                'top': target.offset.top + 0.5 * target.h - this.iconHeight * 0.5 + offset
+            });
+        } else {
+            this.iconEl.css({
+                'left': target.x - this.iconWidth * 0.5 + offset - this.iconElLeftOffset,
+                'top': target.y - this.iconHeight * 0.5 + offset
             });
-
-            return;
         }
-
-        offset = 0;
-        if (this.state.config.targetOutline === true) {
-            offset = 1;
-        }
-
-        this.inContainer = false;
-
-        if (this.isOriginal === true) {
-            this.containerEl.hide();
-            this.iconEl.detach();
-        }
-        this.iconEl.css('background-color', this.iconElBGColor);
-        this.iconEl.css('padding-left', this.iconElPadding);
-        this.iconEl.css('padding-right', this.iconElPadding);
-        this.iconEl.css('border', this.iconElBorder);
-        this.iconEl.css('width', this.iconWidth);
-        this.iconEl.css('height', this.iconHeight);
-        this.iconEl.css(
-            'left',
-            target.offset.left + 0.5 * target.w - this.iconWidth * 0.5 + offset - this.iconElLeftOffset
-        );
-        this.iconEl.css(
-            'top',
-            target.offset.top + 0.5 * target.h - this.iconHeight * 0.5 + offset
-        );
         this.iconEl.appendTo(this.state.baseImageEl.parent());
 
         if (this.labelEl !== null) {
             if (this.isOriginal === true) {
                 this.labelEl.detach();
             }
-            this.labelEl.css('background-color', this.state.config.labelBgColor);
-            this.labelEl.css('padding-left', 8);
-            this.labelEl.css('padding-right', 8);
-            this.labelEl.css('border', '1px solid black');
-            this.labelEl.css(
-                'left',
-                target.offset.left + 0.5 * target.w - this.labelWidth * 0.5 + offset - 9 // Account for padding, border.
-            );
-            this.labelEl.css(
-                'top',
-                target.offset.top + 0.5 * target.h + this.iconHeight * 0.5 + 5 + offset
-            );
+            this.labelEl.css({
+                'background-color': this.state.config.labelBgColor,
+                'padding-left': 8,
+                'padding-right': 8,
+                'border': '1px solid black'
+            });
+            if (moveType === 'target') {
+                this.labelEl.css({
+                    'left': target.offset.left + 0.5 * target.w - this.labelWidth * 0.5 + offset - 9, // Account for padding, border.
+                    'top': target.offset.top + 0.5 * target.h + this.iconHeight * 0.5 + 5 + offset
+                });
+            } else {
+                this.labelEl.css({
+                    'left': target.x - this.labelWidth * 0.5 + offset - 9, // Account for padding, border.
+                    'top': target.y - this.iconHeight * 0.5 + this.iconHeight + 5 + offset
+                });
+            }
             this.labelEl.appendTo(this.state.baseImageEl.parent());
         }
 
-        target.addDraggable(this);
+        if (moveType === 'target') {
+            target.addDraggable(this);
+        } else {
+            this.x = target.x;
+            this.y = target.y;
+        }
 
         this.zIndex = 1000;
         this.correctZIndexes();
@@ -374,7 +258,6 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             this.state.numDraggablesInSlider -= 1;
             this.state.updateArrowOpacity();
         }
-
     }
 
     function processDraggable(state, obj) {
@@ -382,22 +265,15 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
         draggableObj = {
             'uniqueId': state.getUniqueId(),
-
             'originalConfigObj': obj,
             'stateDraggablesIndex': null,
-
             'id': obj.id,
-
             'isReusable': obj.can_reuse,
             'isOriginal': true,
-
             'x': -1,
             'y': -1,
-
             'zIndex': 1,
-
             'containerEl': null,
-
             'iconEl': null,
             'iconElBGColor': null,
             'iconElPadding': null,
@@ -407,16 +283,13 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             'iconHeight': null,
             'iconWidthSmall': null,
             'iconHeightSmall': null,
-
             'labelEl': null,
             'labelWidth': null,
-
             'hasLoaded': false,
             'inContainer': true,
             'mousePressed': false,
             'onTarget': null,
             'onTargetIndex': null,
-
             'state': state,
 
             'mouseDown': mouseDown,
@@ -427,11 +300,9 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             'snapToTarget': snapToTarget,
             'correctZIndexes': correctZIndexes,
             'moveBackToSlider': moveBackToSlider,
-
-            'moveDraggableToTarget': moveDraggableToTarget,
-            'moveDraggableToXY': moveDraggableToXY,
-
-            'makeDraggableCopy': makeDraggableCopy
+            'moveDraggableTo': moveDraggableTo,
+            'makeDraggableCopy': makeDraggableCopy,
+            'attachMouseEventsTo': attachMouseEventsTo
         };
 
         draggableObj.containerEl = $(
@@ -472,17 +343,13 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                     draggableObj.iconWidthSmall = draggableObj.iconHeightSmall * (draggableObj.iconWidth / draggableObj.iconHeight);
                 }
 
-                draggableObj.iconEl.css('position', 'absolute');
-                draggableObj.iconEl.css('width', draggableObj.iconWidthSmall);
-                draggableObj.iconEl.css('height', draggableObj.iconHeightSmall);
-                draggableObj.iconEl.css('left', 50 - draggableObj.iconWidthSmall * 0.5);
-
-                if (obj.label.length > 0) {
-                    draggableObj.iconEl.css('top', 5);
-                } else {
-                    draggableObj.iconEl.css('top', 50 - draggableObj.iconHeightSmall * 0.5);
-                }
-
+                draggableObj.iconEl.css({
+                    'position': 'absolute',
+                    'width': draggableObj.iconWidthSmall,
+                    'height': draggableObj.iconHeightSmall,
+                    'left': 50 - draggableObj.iconWidthSmall * 0.5,
+                    'top': ((obj.label.length > 0) ? 5 : 50 - draggableObj.iconHeightSmall * 0.5)
+                });
                 draggableObj.iconEl.appendTo(draggableObj.containerEl);
 
                 if (obj.label.length > 0) {
@@ -500,18 +367,12 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
                     draggableObj.labelEl.appendTo(draggableObj.containerEl);
                     draggableObj.labelWidth = draggableObj.labelEl.width();
-                    draggableObj.labelEl.css('left', 50 - draggableObj.labelWidth * 0.5);
-                    draggableObj.labelEl.css('top', 5 + draggableObj.iconHeightSmall + 5);
+                    draggableObj.labelEl.css({
+                        'left': 50 - draggableObj.labelWidth * 0.5,
+                        'top': 5 + draggableObj.iconHeightSmall + 5
+                    });
 
-                    draggableObj.labelEl.mousedown(function (event) {
-                        draggableObj.mouseDown.call(draggableObj, event);
-                    });
-                    draggableObj.labelEl.mouseup(function (event) {
-                        draggableObj.mouseUp.call(draggableObj, event);
-                    });
-                    draggableObj.labelEl.mousemove(function (event) {
-                        draggableObj.mouseMove.call(draggableObj, event);
-                    });
+                    draggableObj.attachMouseEventsTo('labelEl');
                 }
 
                 draggableObj.hasLoaded = true;
@@ -546,8 +407,10 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                 draggableObj.iconWidthSmall = draggableObj.iconWidth;
                 draggableObj.iconHeightSmall = draggableObj.iconHeight;
 
-                draggableObj.iconEl.css('left', 50 - draggableObj.iconWidthSmall * 0.5);
-                draggableObj.iconEl.css('top', 50 - draggableObj.iconHeightSmall * 0.5);
+                draggableObj.iconEl.css({
+                    'left': 50 - draggableObj.iconWidthSmall * 0.5,
+                    'top': 50 - draggableObj.iconHeightSmall * 0.5
+                });
 
                 draggableObj.hasLoaded = true;
             } else {
@@ -556,27 +419,8 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             }
         }
 
-        // Attach events to "iconEl".
-        draggableObj.iconEl.mousedown(function (event) {
-            draggableObj.mouseDown.call(draggableObj, event);
-        });
-        draggableObj.iconEl.mouseup(function (event) {
-            draggableObj.mouseUp.call(draggableObj, event);
-        });
-        draggableObj.iconEl.mousemove(function (event) {
-            draggableObj.mouseMove.call(draggableObj, event);
-        });
-
-        // Attach events to "containerEl".
-        draggableObj.containerEl.mousedown(function (event) {
-            draggableObj.mouseDown.call(draggableObj, event);
-        });
-        draggableObj.containerEl.mouseup(function (event) {
-            draggableObj.mouseUp.call(draggableObj, event);
-        });
-        draggableObj.containerEl.mousemove(function (event) {
-            draggableObj.mouseMove.call(draggableObj, event);
-        });
+        draggableObj.attachMouseEventsTo('iconEl');
+        draggableObj.attachMouseEventsTo('containerEl');
 
         state.numDraggablesInSlider += 1;
         draggableObj.stateDraggablesIndex = state.draggables.push(draggableObj) - 1;
@@ -605,38 +449,30 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                     this.containerEl.hide();
                     this.iconEl.detach();
                 }
-                this.iconEl.css('background-color', this.iconElBGColor);
-                this.iconEl.css('padding-left', this.iconElPadding);
-                this.iconEl.css('padding-right', this.iconElPadding);
-                this.iconEl.css('border', this.iconElBorder);
-                this.iconEl.css('width', this.iconWidth);
-                this.iconEl.css('height', this.iconHeight);
-                this.iconEl.css(
-                    'left',
-                    event.pageX - this.state.baseImageEl.offset().left - this.iconWidth * 0.5 - this.iconElLeftOffset
-                );
-                this.iconEl.css(
-                    'top',
-                    event.pageY - this.state.baseImageEl.offset().top - this.iconHeight * 0.5
-                );
+                this.iconEl.css({
+                    'background-color': this.iconElBGColor,
+                    'padding-left': this.iconElPadding,
+                    'padding-right': this.iconElPadding,
+                    'border': this.iconElBorder,
+                    'width': this.iconWidth,
+                    'height': this.iconHeight,
+                    'left': event.pageX - this.state.baseImageEl.offset().left - this.iconWidth * 0.5 - this.iconElLeftOffset,
+                    'top': event.pageY - this.state.baseImageEl.offset().top - this.iconHeight * 0.5
+                });
                 this.iconEl.appendTo(this.state.baseImageEl.parent());
 
                 if (this.labelEl !== null) {
                     if (this.isOriginal === true) {
                         this.labelEl.detach();
                     }
-                    this.labelEl.css('background-color', this.state.config.labelBgColor);
-                    this.labelEl.css('padding-left', 8);
-                    this.labelEl.css('padding-right', 8);
-                    this.labelEl.css('border', '1px solid black');
-                    this.labelEl.css(
-                        'left',
-                        event.pageX - this.state.baseImageEl.offset().left - this.labelWidth * 0.5 - 9 // Account for padding, border.
-                    );
-                    this.labelEl.css(
-                        'top',
-                        event.pageY - this.state.baseImageEl.offset().top + this.iconHeight * 0.5 + 5
-                    );
+                    this.labelEl.css({
+                        'background-color': this.state.config.labelBgColor,
+                        'padding-left': 8,
+                        'padding-right': 8,
+                        'border': '1px solid black',
+                        'left': event.pageX - this.state.baseImageEl.offset().left - this.labelWidth * 0.5 - 9, // Account for padding, border.
+                        'top': event.pageY - this.state.baseImageEl.offset().top + this.iconHeight * 0.5 + 5
+                    });
                     this.labelEl.appendTo(this.state.baseImageEl.parent());
                 }
 
@@ -675,24 +511,16 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             // of a drag operation (user moves the mouse very quickly).
             event.stopPropagation();
 
-            this.iconEl.css(
-                'left',
-                event.pageX - this.state.baseImageEl.offset().left - this.iconWidth * 0.5 - this.iconElLeftOffset
-            );
-            this.iconEl.css(
-                'top',
-                event.pageY - this.state.baseImageEl.offset().top - this.iconHeight * 0.5
-            );
+            this.iconEl.css({
+                'left': event.pageX - this.state.baseImageEl.offset().left - this.iconWidth * 0.5 - this.iconElLeftOffset,
+                'top': event.pageY - this.state.baseImageEl.offset().top - this.iconHeight * 0.5
+            });
 
             if (this.labelEl !== null) {
-                this.labelEl.css(
-                    'left',
-                    event.pageX - this.state.baseImageEl.offset().left - this.labelWidth * 0.5 - 9 // Acoount for padding, border.
-                );
-                this.labelEl.css(
-                    'top',
-                    event.pageY - this.state.baseImageEl.offset().top + this.iconHeight * 0.5 + 5
-                );
+                this.labelEl.css({
+                    'left': event.pageX - this.state.baseImageEl.offset().left - this.labelWidth * 0.5 - 9, // Acoount for padding, border.
+                    'top': event.pageY - this.state.baseImageEl.offset().top + this.iconHeight * 0.5 + 5
+                });
             }
         }
     }
@@ -779,16 +607,12 @@ define(['logme', 'update_input'], function (logme, updateInput) {
 
             // Check if the draggable's center coordinate is within
             // the target's dimensions. If not, go to next target.
-            if (positionIE.top + this.iconHeight * 0.5 < target.offset.top) {
-                continue;
-            }
-            if (positionIE.top + this.iconHeight * 0.5 > target.offset.top + target.h) {
-                continue;
-            }
-            if (positionIE.left + this.iconWidth * 0.5 < target.offset.left) {
-                continue;
-            }
-            if (positionIE.left + this.iconWidth * 0.5 > target.offset.left + target.w) {
+            if (
+                (positionIE.top + this.iconHeight * 0.5 < target.offset.top) ||
+                (positionIE.top + this.iconHeight * 0.5 > target.offset.top + target.h) ||
+                (positionIE.left + this.iconWidth * 0.5 < target.offset.left) ||
+                (positionIE.left + this.iconWidth * 0.5 > target.offset.left + target.w)
+            ) {
                 continue;
             }
 
@@ -827,24 +651,16 @@ define(['logme', 'update_input'], function (logme, updateInput) {
             offset = 1;
         }
 
-        this.iconEl.css(
-            'left',
-            target.offset.left + 0.5 * target.w - this.iconWidth * 0.5 + offset - this.iconElLeftOffset
-        );
-        this.iconEl.css(
-            'top',
-            target.offset.top + 0.5 * target.h - this.iconHeight * 0.5 + offset
-        );
+        this.iconEl.css({
+            'left': target.offset.left + 0.5 * target.w - this.iconWidth * 0.5 + offset - this.iconElLeftOffset,
+            'top': target.offset.top + 0.5 * target.h - this.iconHeight * 0.5 + offset
+        });
 
         if (this.labelEl !== null) {
-            this.labelEl.css(
-                'left',
-                target.offset.left + 0.5 * target.w - this.labelWidth * 0.5 + offset - 9 // Acoount for padding, border.
-            );
-            this.labelEl.css(
-                'top',
-                target.offset.top + 0.5 * target.h + this.iconHeight * 0.5 + 5 + offset
-            );
+            this.labelEl.css({
+                'left': target.offset.left + 0.5 * target.w - this.labelWidth * 0.5 + offset - 9, // Acoount for padding, border.
+                'top': target.offset.top + 0.5 * target.h + this.iconHeight * 0.5 + 5 + offset
+            });
         }
     }
 
@@ -908,77 +724,50 @@ define(['logme', 'update_input'], function (logme, updateInput) {
         var c1;
 
         if (this.isOriginal === false) {
-            this.iconEl.empty();
             this.iconEl.remove();
             if (this.labelEl !== null) {
-                this.labelEl.empty();
                 this.labelEl.remove();
             }
             this.state.draggables.splice(this.stateDraggablesIndex, 1);
 
-            c1 = 0;
-            while (c1 < this.state.draggables) {
+            for (c1 = 0; c1 < this.state.draggables; c1 += 1) {
                 if (this.state.draggables[c1].stateDraggablesIndex > this.stateDraggablesIndex) {
                     this.state.draggables[c1].stateDraggablesIndex -= 1;
                 }
-
-                c1 += 1;
             }
 
             return;
         }
 
         this.containerEl.show();
-
         this.zIndex = 1;
 
         this.iconEl.detach();
-        this.iconEl.css('border', 'none');
-        this.iconEl.css('background-color', 'transparent');
-        this.iconEl.css('padding-left', 0);
-        this.iconEl.css('padding-right', 0);
-        this.iconEl.css('z-index', this.zIndex);
-        this.iconEl.css(
-            'width',
-            this.iconWidthSmall
-        );
-        this.iconEl.css(
-            'height',
-            this.iconHeightSmall
-        );
-        this.iconEl.css(
-            'left',
-            50 - this.iconWidthSmall * 0.5
-        );
-        if (this.labelEl !== null) {
-            this.iconEl.css('top', 5);
-        } else {
-            this.iconEl.css(
-                'top',
-                50 - this.iconHeightSmall * 0.5
-            );
-        }
-
+        this.iconEl.css({
+            'border': 'none',
+            'background-color': 'transparent',
+            'padding-left': 0,
+            'padding-right': 0,
+            'z-index': this.zIndex,
+            'width': this.iconWidthSmall,
+            'height': this.iconHeightSmall,
+            'left': 50 - this.iconWidthSmall * 0.5,
+            'top': ((this.labelEl !== null) ? 5 : 50 - this.iconHeightSmall * 0.5)
+        });
         this.iconEl.appendTo(this.containerEl);
 
         if (this.labelEl !== null) {
             this.labelEl.detach();
-            this.labelEl.css('border', 'none');
-            this.labelEl.css('background-color', 'transparent');
-            this.labelEl.css('padding-left', 0);
-            this.labelEl.css('padding-right', 0);
-            this.labelEl.css('z-index', this.zIndex);
-            this.labelEl.css(
-                'left',
-                50 - this.labelWidth * 0.5
-            );
-            this.labelEl.css(
-                'top',
-                5 + this.iconHeightSmall + 5
-            );
-            this.labelEl.appendTo(
-                this.containerEl
-            );
+            this.labelEl.css({
+                'border': 'none',
+                'background-color': 'transparent',
+                'padding-left': 0,
+                'padding-right': 0,
+                'z-index': this.zIndex,
+                'left': 50 - this.labelWidth * 0.5,
+                'top': 5 + this.iconHeightSmall + 5
+            });
+            this.labelEl.appendTo(this.containerEl);
         }
 
         this.inContainer = true;
diff --git a/common/static/js/capa/drag_and_drop/update_input.js b/common/static/js/capa/drag_and_drop/update_input.js
index 20a75ecff3..04715a3ecf 100644
--- a/common/static/js/capa/drag_and_drop/update_input.js
+++ b/common/static/js/capa/drag_and_drop/update_input.js
@@ -142,7 +142,7 @@ define(['logme'], function (logme) {
                         continue;
                     }
 
-                    draggable.moveDraggableToTarget(target);
+                    draggable.moveDraggableTo('target', target);
                 }
 
                 c1 += 1;
@@ -170,7 +170,7 @@ define(['logme'], function (logme) {
                         continue;
                     }
 
-                    draggable.moveDraggableToXY({
+                    draggable.moveDraggableTo('XY', {
                         'x': answer.draggables[c1][draggableId][0],
                         'y': answer.draggables[c1][draggableId][1]
                     });

From 47d1173394fa5b8302cd1bcc98285c1b4ec3a1ce Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Fri, 18 Jan 2013 18:44:50 +0200
Subject: [PATCH 525/541] Refactoring and cleaning of code.

---
 .../js/capa/drag_and_drop/draggables.js       | 41 -----------------
 common/static/js/capa/drag_and_drop/main.js   |  2 +
 common/static/js/capa/drag_and_drop/state.js  | 45 ++++++++++++++++++-
 3 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index a7c36e40fc..a867cf73fe 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -16,47 +16,6 @@ define(['logme', 'update_input'], function (logme, updateInput) {
                 c1 += 1
             }
         }(0));
-
-        state.updateArrowOpacity();
-
-        $(document).mousemove(function (event) {
-            documentMouseMove(state, event);
-        });
-    }
-
-    function documentMouseMove(state, event) {
-        if (state.currentMovingDraggable !== null) {
-            state.currentMovingDraggable.iconEl.css(
-                'left',
-                event.pageX -
-                    state.baseImageEl.offset().left -
-                    state.currentMovingDraggable.iconWidth * 0.5
-                    - state.currentMovingDraggable.iconElLeftOffset
-            );
-            state.currentMovingDraggable.iconEl.css(
-                'top',
-                event.pageY -
-                    state.baseImageEl.offset().top -
-                    state.currentMovingDraggable.iconHeight * 0.5
-            );
-
-            if (state.currentMovingDraggable.labelEl !== null) {
-                state.currentMovingDraggable.labelEl.css(
-                    'left',
-                    event.pageX -
-                        state.baseImageEl.offset().left -
-                        state.currentMovingDraggable.labelWidth * 0.5
-                        - 9 // Account for padding, border.
-                );
-                state.currentMovingDraggable.labelEl.css(
-                    'top',
-                    event.pageY -
-                        state.baseImageEl.offset().top +
-                        state.currentMovingDraggable.iconHeight * 0.5 +
-                        5
-                );
-            }
-        }
     }
 
     function makeDraggableCopy(callbackFunc) {
diff --git a/common/static/js/capa/drag_and_drop/main.js b/common/static/js/capa/drag_and_drop/main.js
index 114aa22616..89cf08001d 100644
--- a/common/static/js/capa/drag_and_drop/main.js
+++ b/common/static/js/capa/drag_and_drop/main.js
@@ -63,6 +63,8 @@ define(
             Scroller(state);
             Draggables.init(state);
 
+            state.updateArrowOpacity();
+
             // Update the input element, checking first that it is not filled with
             // an answer from the server.
             if (updateInput.check(state) === false) {
diff --git a/common/static/js/capa/drag_and_drop/state.js b/common/static/js/capa/drag_and_drop/state.js
index d0ea6b65ef..4565acd842 100644
--- a/common/static/js/capa/drag_and_drop/state.js
+++ b/common/static/js/capa/drag_and_drop/state.js
@@ -8,7 +8,9 @@ define([], function () {
     return State;
 
     function State(problemId) {
-        return {
+        var state;
+
+        state = {
             'config': null,
 
             'baseImageEl': null,
@@ -33,6 +35,12 @@ define([], function () {
 
             'getUniqueId': getUniqueId
         };
+
+        $(document).mousemove(function (event) {
+            documentMouseMove(state, event);
+        });
+
+        return state;
     }
 
     function getUniqueId() {
@@ -53,6 +61,41 @@ define([], function () {
 
         return text;
     }
+
+    function documentMouseMove(state, event) {
+        if (state.currentMovingDraggable !== null) {
+            state.currentMovingDraggable.iconEl.css(
+                'left',
+                event.pageX -
+                    state.baseImageEl.offset().left -
+                    state.currentMovingDraggable.iconWidth * 0.5
+                    - state.currentMovingDraggable.iconElLeftOffset
+            );
+            state.currentMovingDraggable.iconEl.css(
+                'top',
+                event.pageY -
+                    state.baseImageEl.offset().top -
+                    state.currentMovingDraggable.iconHeight * 0.5
+            );
+
+            if (state.currentMovingDraggable.labelEl !== null) {
+                state.currentMovingDraggable.labelEl.css(
+                    'left',
+                    event.pageX -
+                        state.baseImageEl.offset().left -
+                        state.currentMovingDraggable.labelWidth * 0.5
+                        - 9 // Account for padding, border.
+                );
+                state.currentMovingDraggable.labelEl.css(
+                    'top',
+                    event.pageY -
+                        state.baseImageEl.offset().top +
+                        state.currentMovingDraggable.iconHeight * 0.5 +
+                        5
+                );
+            }
+        }
+    }
 });
 
 // End of wrapper for RequireJS. As you can see, we are passing

From a4e8cb362d7e85e6e0ac391ac2fc68c42025ffd9 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Mon, 21 Jan 2013 14:10:17 +0200
Subject: [PATCH 526/541] updated docs

---
 docs/source/drag_and_drop_input.rst    |  87 +++++++++++++++++++++++++
 docs/source/draganddrop_logic_flow.png | Bin 305578 -> 305398 bytes
 2 files changed, 87 insertions(+)

diff --git a/docs/source/drag_and_drop_input.rst b/docs/source/drag_and_drop_input.rst
index dc13dcfb11..82cb99436a 100644
--- a/docs/source/drag_and_drop_input.rst
+++ b/docs/source/drag_and_drop_input.rst
@@ -212,6 +212,93 @@ for same number of draggables, anyof is equal to unordered_equal
 
 If we have can_reuse=true, than one must use only long form of correct answer.
 
+
+Grading logic
+-------------
+
+1. User answer and correct answer populated to the same form::
+
+    group_id: group_draggables, group_targets, group_rule
+
+Group_id is ordinal number, for every dict in correct answer incremental
+group_id is assigned: 0, 1, 2, ...
+
+Draggables from user answer are added to same group_id where identical draggables
+from correct answer are::
+
+    If correct_draggables[group_0] = [t1, t2] then
+       user_draggables[group_0] are all draggables t1 and t2 from user answer:
+        [t1] or [t1, t2] or [t1, t2, t2] etc..
+
+2. For every group user_draggables, if 'number' not in rule, set() is applicated,
+if 'number' not in rule, set is not applicated::
+
+    from [t1, t2, t3, t3] -> [t1, t2, ,t3]
+
+Set() and 'number' are needed only for case of reusable draggables,
+for other cases there are no equal draggables in list, so set() does nothing.
+
+Usege of set() operation allows easily create rule for case of
+``any number of same draggable can be dragged to some targets``::
+
+    {
+            'draggables': ['draggable_1'],
+            'targets': ['target3', 'target6', 'target9'],
+            'rule': 'anyof'
+    }
+
+'number' rule is used for the case of reusable draggables, when one want to
+fix number of draggable to drag. In this example only two instances of
+draggables_1 are allowed to be dragged::
+
+    {
+            'draggables': ['draggable_1', 'draggable_1'],
+            'targets': ['target3', 'target6', 'target9'],
+            'rule': 'anyof+number'
+    }
+
+Note, that in using rule 'exact', one does not need 'number', because you can't
+recognize from user interface which reusable draggable on which target.
+Absurd example::
+
+        {
+            'draggables': ['draggable_1', 'draggable_1', 'draggable_2'],
+            'targets': ['target3', 'target6', 'target9'],
+            'rule': 'exact'
+    }
+
+
+Correct handling of upper example is create different rule for draggable_1 and
+draggable_2
+
+For 'unordered_equal' (or 'exact') we not need 'number' if you have only same
+draggable in group, as targets length will provide contraing for the number of
+draggables::
+
+    {
+            'draggables': ['draggable_1'],
+            'targets': ['target3', 'target6', 'target9'],
+            'rule': 'unordered_equal'
+    }
+
+This means that only three draggaggables 'draggable_1' can be dragged.
+
+But if you have more that one different reusable draggable in lis, you may use
+'number' rule::
+
+    {
+            'draggables': ['draggable_1', 'draggable_1', 'draggable_2'],
+            'targets': ['target3', 'target6', 'target9'],
+            'rule': 'unordered_equal+number'
+    }
+
+If not use number, draggables list will be setted to  ['draggable_1', 'draggable_2']
+
+For every group, at this step, draggables lists are equal
+
+3. For every group, lists of targets are compared using rule for that group.
+
+
 Logic flow
 ----------
 
diff --git a/docs/source/draganddrop_logic_flow.png b/docs/source/draganddrop_logic_flow.png
index 5708d3628477e989d11c228ad04b80e987a1591a..2bb1c11a41eebe8ca593671f01c6ea4a5a6d6c85 100644
GIT binary patch
delta 193942
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

delta 194078
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
F{{xl0t>*v$


From b25d4224b5c827c94c5d418d4399ae153790e2db Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Mon, 21 Jan 2013 15:42:41 +0200
Subject: [PATCH 527/541] updated docs

---
 docs/source/drag_and_drop_input.rst | 100 ++++++++++++++--------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/docs/source/drag_and_drop_input.rst b/docs/source/drag_and_drop_input.rst
index 82cb99436a..d03d9755bd 100644
--- a/docs/source/drag_and_drop_input.rst
+++ b/docs/source/drag_and_drop_input.rst
@@ -128,9 +128,10 @@ Wrong (for draggable id 7)::
 
 Rules are: exact, anyof, unordered_equal, anyof+number, unordered_equal+number
 
-- Exact rule means that targets for draggable id's in user_answer are the same
-that targets from correct answer. For example, for draggables 7 and 8 user must
-drag 7 to target1 and 8 to target2 if correct_answer is::
+
+.. such long lines are needed for sphinx to display lists correctly
+
+- Exact rule means that targets for draggable id's in user_answer are the same that targets from correct answer. For example, for draggables 7 and 8 user must drag 7 to target1 and 8 to target2 if correct_answer is::
 
     correct_answer = [
     {
@@ -140,9 +141,7 @@ drag 7 to target1 and 8 to target2 if correct_answer is::
     }]
 
 
-- unordered_equal rule allows draggables be dragged to targets unordered. If one
-want to allow for student to drag 7 to target1 or target2 and 8 to target2 or
-target 1 and 7 and 8 must be in different targets, then correct answer must be::
+- unordered_equal rule allows draggables be dragged to targets unordered. If one want to allow for student to drag 7 to target1 or target2 and 8 to target2 or target 1 and 7 and 8 must be in different targets, then correct answer must be::
 
     correct_answer = [
     {
@@ -151,10 +150,8 @@ target 1 and 7 and 8 must be in different targets, then correct answer must be::
     'rule': 'unordered_equal'
     }]
 
-- Anyof rule allows draggables to be dragged to any of targets. If one want to
-allow for student to drag 7 and 8 to target1 or target2, which means that if 7
-is on target1 and 8 is on target1 or 7 on target2 and 8 on target2 or 7 on
-target1 and 8 on target2. Any of theese are correct which anyof rule::
+
+- Anyof rule allows draggables to be dragged to any of targets. If one want to allow for student to drag 7 and 8 to target1 or target2, which means that if 7 is on target1 and 8 is on target1 or 7 on target2 and 8 on target2 or 7 on target1 and 8 on target2. Any of theese are correct which anyof rule::
 
     correct_answer = [
     {
@@ -164,11 +161,7 @@ target1 and 8 on target2. Any of theese are correct which anyof rule::
     }]
 
 
-- If you have can_reuse true, then you, for example, have draggables a,b,c and 10
-targets. These will allow you to drag 4 'a' draggables to
-['target1',  'target4', 'target7', 'target10'] , you do not need to write 'a'
-four times. Also this will allow you to drag 'b' draggable to target2 or target5
-or target5 and target2 etc..::
+- If you have can_reuse true, then you, for example, have draggables a,b,c and 10 targets. These will allow you to drag 4 'a' draggables to ['target1',  'target4', 'target7', 'target10'] , you do not need to write 'a' four times. Also this will allow you to drag 'b' draggable to target2 or target5 for target5 and target2 etc..::
 
     correct_answer = [
         {
@@ -187,8 +180,7 @@ or target5 and target2 etc..::
             'rule': 'unordered_equal'
         }]
 
-And sometimes you want to allow drag only two 'b' draggables, in these case
-you sould use 'anyof+number' of 'unordered_equal+number' rule::
+- And sometimes you want to allow drag only two 'b' draggables, in these case you sould use 'anyof+number' of 'unordered_equal+number' rule::
 
     correct_answer = [
         {
@@ -216,40 +208,52 @@ If we have can_reuse=true, than one must use only long form of correct answer.
 Grading logic
 -------------
 
-1. User answer and correct answer populated to the same form::
+1. User answer (that comes from browser) and correct answer (from xml) are parsed to the same format::
 
     group_id: group_draggables, group_targets, group_rule
 
+
 Group_id is ordinal number, for every dict in correct answer incremental
 group_id is assigned: 0, 1, 2, ...
 
 Draggables from user answer are added to same group_id where identical draggables
-from correct answer are::
+from correct answer are, for example::
 
     If correct_draggables[group_0] = [t1, t2] then
-       user_draggables[group_0] are all draggables t1 and t2 from user answer:
-        [t1] or [t1, t2] or [t1, t2, t2] etc..
+    user_draggables[group_0] are all draggables t1 and t2 from user answer:
+    [t1] or [t1, t2] or [t1, t2, t2] etc..
 
-2. For every group user_draggables, if 'number' not in rule, set() is applicated,
-if 'number' not in rule, set is not applicated::
+2. For every group from user answer, for that group draggables, if 'number' is in  group rule, set() is applied,
+if 'number' is not in rule, set is not applied::
 
-    from [t1, t2, t3, t3] -> [t1, t2, ,t3]
+    set() : [t1, t2, t3, t3] -> [t1, t2, ,t3]
 
-Set() and 'number' are needed only for case of reusable draggables,
+For every group, at this step, draggables lists are equal.
+
+
+3. For every group, lists of targets are compared using rule for that group.
+
+
+Set and '+number' cases
+.......................
+
+Set() and '+number' are needed only for case of reusable draggables,
 for other cases there are no equal draggables in list, so set() does nothing.
 
-Usege of set() operation allows easily create rule for case of
-``any number of same draggable can be dragged to some targets``::
+.. such long lines needed for sphinx to display nicely
 
-    {
-            'draggables': ['draggable_1'],
-            'targets': ['target3', 'target6', 'target9'],
-            'rule': 'anyof'
-    }
+* Usage of set() operation allows easily create rule for case of "any number of same draggable can be dragged to some targets"::
 
-'number' rule is used for the case of reusable draggables, when one want to
-fix number of draggable to drag. In this example only two instances of
-draggables_1 are allowed to be dragged::
+        {
+                'draggables': ['draggable_1'],
+                'targets': ['target3', 'target6', 'target9'],
+                'rule': 'anyof'
+        }
+
+
+
+
+* 'number' rule is used for the case of reusable draggables, when one want to fix number of draggable to drag. In this example only two instances of draggables_1 are allowed to be dragged::
 
     {
             'draggables': ['draggable_1', 'draggable_1'],
@@ -257,23 +261,20 @@ draggables_1 are allowed to be dragged::
             'rule': 'anyof+number'
     }
 
-Note, that in using rule 'exact', one does not need 'number', because you can't
-recognize from user interface which reusable draggable on which target.
-Absurd example::
 
-        {
+* Note, that in using rule 'exact', one does not need 'number', because you can't recognize from user interface which reusable draggable is on which target. Absurd example::
+
+    {
             'draggables': ['draggable_1', 'draggable_1', 'draggable_2'],
             'targets': ['target3', 'target6', 'target9'],
             'rule': 'exact'
     }
 
 
-Correct handling of upper example is create different rule for draggable_1 and
-draggable_2
+    Correct handling of this example is to create different rules for draggable_1 and
+    draggable_2
 
-For 'unordered_equal' (or 'exact') we not need 'number' if you have only same
-draggable in group, as targets length will provide contraing for the number of
-draggables::
+* For 'unordered_equal' (or 'exact' too) we don't need 'number' if you have only same draggable in group, as targets length will provide constraint for the number of draggables::
 
     {
             'draggables': ['draggable_1'],
@@ -281,10 +282,10 @@ draggables::
             'rule': 'unordered_equal'
     }
 
-This means that only three draggaggables 'draggable_1' can be dragged.
 
-But if you have more that one different reusable draggable in lis, you may use
-'number' rule::
+    This means that only three draggaggables 'draggable_1' can be dragged.
+
+* But if you have more that one different reusable draggable in list, you may use 'number' rule::
 
     {
             'draggables': ['draggable_1', 'draggable_1', 'draggable_2'],
@@ -292,11 +293,10 @@ But if you have more that one different reusable draggable in lis, you may use
             'rule': 'unordered_equal+number'
     }
 
-If not use number, draggables list will be setted to  ['draggable_1', 'draggable_2']
 
-For every group, at this step, draggables lists are equal
+    If not use number, draggables list will be setted to  ['draggable_1', 'draggable_2']
+
 
-3. For every group, lists of targets are compared using rule for that group.
 
 
 Logic flow

From e273bb12591d399592c201fe15bf9de059fcadc3 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Mon, 21 Jan 2013 15:47:59 +0200
Subject: [PATCH 528/541] Updated DOCS with sample XML for DnD.

---
 docs/source/drag-n-drop-demo.xml    | 245 +++++++++---------
 docs/source/drag-n-drop-demo2.xml   | 373 ++++++++++++++++++++++++++++
 docs/source/drag_and_drop_input.rst |   9 +-
 3 files changed, 498 insertions(+), 129 deletions(-)
 create mode 100644 docs/source/drag-n-drop-demo2.xml

diff --git a/docs/source/drag-n-drop-demo.xml b/docs/source/drag-n-drop-demo.xml
index 6f82db24a2..67712407a1 100644
--- a/docs/source/drag-n-drop-demo.xml
+++ b/docs/source/drag-n-drop-demo.xml
@@ -1,13 +1,15 @@
-<problem display_name="Drag and drop demo" >
+<problem display_name="Drag and drop demos: drag and drop icons or labels
+    to proper positions." >
 
 <customresponse>
     <text>
-        <h3>Please set hydrogen atoms to LEFT carbon atom</h3>
-        <br />
+        <h4>[Anyof rule example]</h4><br/>
+        <h4>Please label hydrogen  atoms connected with left carbon atom.</h4>
+        <br/>
     </text>
 
-    <drag_and_drop_input img="images_list/ethglycol.jpg" target_outline="true"
-        one_per_target="true" no_labels="true">
+    <drag_and_drop_input img="/static/images/images_list/ethglycol.jpg" target_outline="true"
+        one_per_target="true" no_labels="true" label_bg_color="rgb(222, 139, 238)">
         <draggable id="1" label="Hydrogen" />
         <draggable id="2" label="Hydrogen" />
 
@@ -39,43 +41,44 @@ else:
 
 <customresponse>
     <text>
-        <h3>Describe carbon molecule in LCAO-MO</h3>
-        <br />
+        <h4>[Complex grading example]</h4><br/>
+        <h4>Describe carbon molecule in LCAO-MO.</h4>
+        <br/>
     </text>
 
-    <drag_and_drop_input img="images_list/lcao-mo/lcao-mo.jpg" target_outline="true" >
+    <drag_and_drop_input img="/static/images/images_list/lcao-mo/lcao-mo.jpg" target_outline="true" >
 
         <!-- filled bond -->
-        <draggable id="1" icon="images_list/lcao-mo/u_d.png" />
-        <draggable id="2" icon="images_list/lcao-mo/u_d.png" />
-        <draggable id="3" icon="images_list/lcao-mo/u_d.png" />
-        <draggable id="4" icon="images_list/lcao-mo/u_d.png" />
-        <draggable id="5" icon="images_list/lcao-mo/u_d.png" />
-        <draggable id="6" icon="images_list/lcao-mo/u_d.png" />
+        <draggable id="1" icon="/static/images/images_list/lcao-mo/u_d.png" />
+        <draggable id="2" icon="/static/images/images_list/lcao-mo/u_d.png" />
+        <draggable id="3" icon="/static/images/images_list/lcao-mo/u_d.png" />
+        <draggable id="4" icon="/static/images/images_list/lcao-mo/u_d.png" />
+        <draggable id="5" icon="/static/images/images_list/lcao-mo/u_d.png" />
+        <draggable id="6" icon="/static/images/images_list/lcao-mo/u_d.png" />
 
         <!-- up bond -->
-        <draggable id="7"  icon="images_list/lcao-mo/up.png"/>
-        <draggable id="8"  icon="images_list/lcao-mo/up.png"/>
-        <draggable id="9"  icon="images_list/lcao-mo/up.png"/>
-        <draggable id="10" icon="images_list/lcao-mo/up.png"/>
+        <draggable id="7"  icon="/static/images/images_list/lcao-mo/up.png"/>
+        <draggable id="8"  icon="/static/images/images_list/lcao-mo/up.png"/>
+        <draggable id="9"  icon="/static/images/images_list/lcao-mo/up.png"/>
+        <draggable id="10" icon="/static/images/images_list/lcao-mo/up.png"/>
 
         <!-- sigma -->
-        <draggable id="11" icon="images_list/lcao-mo/sigma.png"/>
-        <draggable id="12" icon="images_list/lcao-mo/sigma.png"/>
+        <draggable id="11" icon="/static/images/images_list/lcao-mo/sigma.png"/>
+        <draggable id="12" icon="/static/images/images_list/lcao-mo/sigma.png"/>
 
         <!-- sigma* -->
-        <draggable id="13" icon="images_list/lcao-mo/sigma_s.png"/>
-        <draggable id="14" icon="images_list/lcao-mo/sigma_s.png"/>
+        <draggable id="13" icon="/static/images/images_list/lcao-mo/sigma_s.png"/>
+        <draggable id="14" icon="/static/images/images_list/lcao-mo/sigma_s.png"/>
 
         <!-- pi -->
-        <draggable id="15" icon="images_list/lcao-mo/pi.png" />
+        <draggable id="15" icon="/static/images/images_list/lcao-mo/pi.png" />
 
         <!-- pi* -->
-        <draggable id="16" icon="images_list/lcao-mo/pi_s.png" />
+        <draggable id="16" icon="/static/images/images_list/lcao-mo/pi_s.png" />
 
         <!-- images that should not be dragged -->
-        <draggable id="17" icon="images_list/lcao-mo/d.png" />
-        <draggable id="18" icon="images_list/lcao-mo/d.png" />
+        <draggable id="17" icon="/static/images/images_list/lcao-mo/d.png" />
+        <draggable id="18" icon="/static/images/images_list/lcao-mo/d.png" />
 
         <!-- positions of electrons and electron pairs -->
         <target id="s_left"       x="130" y="360"    w="32" h="32"/>
@@ -112,27 +115,27 @@ correct_answer = [
   'targets': [
     's_left', 's_right', 's_sigma', 's_sigma_star', 'p_pi_1', 'p_pi_2'
   ],
-  'rule': 'anyof'
+  'rule': 'unordered_equal'
 }, {
   'draggables': ['7','8', '9', '10'],
   'targets': ['p_left_1', 'p_left_2', 'p_right_1','p_right_2'],
-  'rule': 'anyof'
+  'rule': 'unordered_equal'
 }, {
   'draggables': ['11', '12'],
   'targets': ['s_sigma_name', 'p_sigma_name'],
-  'rule': 'anyof'
+  'rule': 'unordered_equal'
 }, {
   'draggables': ['13', '14'],
   'targets': ['s_sigma_star_name', 'p_sigma_star_name'],
-  'rule': 'anyof'
+  'rule': 'unordered_equal'
 }, {
   'draggables': ['15'],
   'targets': ['p_pi_name'],
-  'rule': 'anyof'
+  'rule': 'unordered_equal'
 }, {
   'draggables': ['16'],
   'targets': ['p_pi_star_name'],
-  'rule': 'anyof'
+  'rule': 'unordered_equal'
 }]
 
 if draganddrop.grade(submission[0], correct_answer):
@@ -144,47 +147,48 @@ else:
 
 <customresponse>
     <text>
-        <h3>Describe oxygen molecule in LCAO-MO</h3>
-        <br />
+        <h4>[Another complex grading example]</h4><br/>
+        <h4>Describe oxygen molecule in LCAO-MO</h4>
+        <br/>
     </text>
 
-    <drag_and_drop_input img="images_list/lcao-mo/lcao-mo.jpg" target_outline="true" one_per_target="true">
+    <drag_and_drop_input img="/static/images/images_list/lcao-mo/lcao-mo.jpg" target_outline="true" one_per_target="true">
         <!-- filled bond -->
-        <draggable id="1" icon="images_list/lcao-mo/u_d.png" />
-        <draggable id="2" icon="images_list/lcao-mo/u_d.png" />
-        <draggable id="3" icon="images_list/lcao-mo/u_d.png" />
-        <draggable id="4" icon="images_list/lcao-mo/u_d.png" />
-        <draggable id="5" icon="images_list/lcao-mo/u_d.png" />
-        <draggable id="6" icon="images_list/lcao-mo/u_d.png" />
-        <draggable id="v_fb_1" icon="images_list/lcao-mo/u_d.png" />
-        <draggable id="v_fb_2" icon="images_list/lcao-mo/u_d.png" />
-        <draggable id="v_fb_3" icon="images_list/lcao-mo/u_d.png" />
+        <draggable id="1" icon="/static/images/images_list/lcao-mo/u_d.png" />
+        <draggable id="2" icon="/static/images/images_list/lcao-mo/u_d.png" />
+        <draggable id="3" icon="/static/images/images_list/lcao-mo/u_d.png" />
+        <draggable id="4" icon="/static/images/images_list/lcao-mo/u_d.png" />
+        <draggable id="5" icon="/static/images/images_list/lcao-mo/u_d.png" />
+        <draggable id="6" icon="/static/images/images_list/lcao-mo/u_d.png" />
+        <draggable id="v_fb_1" icon="/static/images/images_list/lcao-mo/u_d.png" />
+        <draggable id="v_fb_2" icon="/static/images/images_list/lcao-mo/u_d.png" />
+        <draggable id="v_fb_3" icon="/static/images/images_list/lcao-mo/u_d.png" />
 
         <!-- up bond -->
-        <draggable id="7"  icon="images_list/lcao-mo/up.png"/>
-        <draggable id="8"  icon="images_list/lcao-mo/up.png"/>
-        <draggable id="9"  icon="images_list/lcao-mo/up.png"/>
-        <draggable id="10" icon="images_list/lcao-mo/up.png"/>
-        <draggable id="v_ub_1" icon="images_list/lcao-mo/up.png"/>
-        <draggable id="v_ub_2" icon="images_list/lcao-mo/up.png"/>
+        <draggable id="7"  icon="/static/images/images_list/lcao-mo/up.png"/>
+        <draggable id="8"  icon="/static/images/images_list/lcao-mo/up.png"/>
+        <draggable id="9"  icon="/static/images/images_list/lcao-mo/up.png"/>
+        <draggable id="10" icon="/static/images/images_list/lcao-mo/up.png"/>
+        <draggable id="v_ub_1" icon="/static/images/images_list/lcao-mo/up.png"/>
+        <draggable id="v_ub_2" icon="/static/images/images_list/lcao-mo/up.png"/>
 
         <!-- sigma -->
-        <draggable id="11" icon="images_list/lcao-mo/sigma.png"/>
-        <draggable id="12" icon="images_list/lcao-mo/sigma.png"/>
+        <draggable id="11" icon="/static/images/images_list/lcao-mo/sigma.png"/>
+        <draggable id="12" icon="/static/images/images_list/lcao-mo/sigma.png"/>
 
         <!-- sigma* -->
-        <draggable id="13" icon="images_list/lcao-mo/sigma_s.png"/>
-        <draggable id="14" icon="images_list/lcao-mo/sigma_s.png"/>
+        <draggable id="13" icon="/static/images/images_list/lcao-mo/sigma_s.png"/>
+        <draggable id="14" icon="/static/images/images_list/lcao-mo/sigma_s.png"/>
 
         <!-- pi -->
-        <draggable id="15" icon="images_list/lcao-mo/pi.png" />
+        <draggable id="15" icon="/static/images/images_list/lcao-mo/pi.png" />
 
         <!-- pi* -->
-        <draggable id="16" icon="images_list/lcao-mo/pi_s.png" />
+        <draggable id="16" icon="/static/images/images_list/lcao-mo/pi_s.png" />
 
         <!-- images that should not be dragged -->
-        <draggable id="17" icon="images_list/lcao-mo/d.png" />
-        <draggable id="18" icon="images_list/lcao-mo/d.png" />
+        <draggable id="17" icon="/static/images/images_list/lcao-mo/d.png" />
+        <draggable id="18" icon="/static/images/images_list/lcao-mo/d.png" />
 
         <!-- positions of electrons and electron pairs -->
         <target id="s_left"       x="130" y="360"    w="32" h="32"/>
@@ -255,30 +259,21 @@ else:
 ]]></answer>
 </customresponse>
 
-<text>
-    <p>
-      Drag and drop pictures to proper positions.
-    </p>
-    <p>
-      Drag images to the cow)).
-    </p>
-</text>
-
 <customresponse>
     <text>
-        <h3>Individual targets with outlines. One draggable per target.</h3>
-        <p> Drag ant to first and star to 3rd. </p>
-        <br />
+        <h4>[Individual targets with outlines, One draggable per target]</h4><br/>
+        <h4>
+        Drag -Ant- to first position and -Star- to third position </h4><br/>
     </text>
 
-    <drag_and_drop_input img="cow.png" target_outline="true">
+    <drag_and_drop_input img="/static/images/cow.png" target_outline="true">
         <draggable id="1" label="Label 1"/>
-        <draggable id="name_with_icon" label="Ant" icon="images_list/ant.jpg"/>
-        <draggable id="with_icon" label="Cloud" icon="images_list/cloud.jpg" />
+        <draggable id="name_with_icon" label="Ant" icon="/static/images/images_list/ant.jpg"/>
+        <draggable id="with_icon" label="Cloud" icon="/static/images/images_list/cloud.jpg" />
         <draggable id="5" label="Label2" />
-        <draggable id="2" label="Drop" icon="images_list/drop.jpg" />
-        <draggable id="name_label_icon3" label="Grass" icon="images_list/grass.jpg" />
-        <draggable id="name4" label="Star" icon="images_list/star.png" />
+        <draggable id="2" label="Drop" icon="/static/images/images_list/drop.jpg" />
+        <draggable id="name_label_icon3" label="Grass" icon="/static/images/images_list/grass.jpg" />
+        <draggable id="name4" label="Star" icon="/static/images/images_list/star.png" />
         <draggable id="7" label="Label3" />
 
         <target id="t1" x="20" y="20" w="90" h="90"/>
@@ -298,22 +293,22 @@ else:
 
 <customresponse>
     <text>
-        <h3>
-            SMALL IMAGE. Individual targets WITHOUT outlines. Move Star to the
-            volcano opening, and Label3 on to the right ear of the cow.
-            One draggable per target.
-        </h3>
-        <br />
+        <h4>[SMALL IMAGE,  Individual targets WITHOUT outlines, One draggable
+            per target]</h4><br/>
+        <h4>
+            Move -Star- to the volcano opening, and -Label3- on to
+            the right ear of the cow.
+        </h4><br/>
     </text>
 
-    <drag_and_drop_input img="cow3.png" target_outline="false">
+    <drag_and_drop_input img="/static/images/cow3.png" target_outline="false">
         <draggable id="1" label="Label 1"/>
-        <draggable id="name_with_icon" label="Ant" icon="images_list/ant.jpg"/>
-        <draggable id="with_icon" label="Cloud" icon="images_list/cloud.jpg" />
+        <draggable id="name_with_icon" label="Ant" icon="/static/images/images_list/ant.jpg"/>
+        <draggable id="with_icon" label="Cloud" icon="/static/images/images_list/cloud.jpg" />
         <draggable id="5" label="Label2" />
-        <draggable id="2" label="Drop" icon="images_list/drop.jpg" />
-        <draggable id="name_label_icon3" label="Grass" icon="images_list/grass.jpg" />
-        <draggable id="name4" label="Star" icon="images_list/star.png" />
+        <draggable id="2" label="Drop" icon="/static/images/images_list/drop.jpg" />
+        <draggable id="name_label_icon3" label="Grass" icon="/static/images/images_list/grass.jpg" />
+        <draggable id="name4" label="Star" icon="/static/images/images_list/star.png" />
         <draggable id="7" label="Label3" />
 
         <target id="t1" x="111" y="58" w="90" h="90"/>
@@ -333,19 +328,19 @@ else:
 
 <customresponse>
     <text>
-        <h3>Many draggable per target. Move star and ant to most left target
-            and lable 3 and label 2 to most right target.</h3>
-        <br />
+        <h4>[Many draggables per target]</h4><br/>
+        <h4>Move -Star- and -Ant- to most left target
+            and -Label3- and -Label2- to most right target.</h4><br/>
     </text>
 
-    <drag_and_drop_input img="cow.png" target_outline="true" one_per_target="false">
+    <drag_and_drop_input img="/static/images/cow.png" target_outline="true" one_per_target="false">
         <draggable id="1" label="Label 1"/>
-        <draggable id="name_with_icon" label="Ant" icon="images_list/ant.jpg"/>
-        <draggable id="with_icon" label="Cloud" icon="images_list/cloud.jpg" />
+        <draggable id="name_with_icon" label="Ant" icon="/static/images/images_list/ant.jpg"/>
+        <draggable id="with_icon" label="Cloud" icon="/static/images/images_list/cloud.jpg" />
         <draggable id="5" label="Label2" />
-        <draggable id="2" label="Drop" icon="images_list/drop.jpg" />
-        <draggable id="name_label_icon3" label="Grass" icon="images_list/grass.jpg" />
-        <draggable id="name4" label="Star" icon="images_list/star.png" />
+        <draggable id="2" label="Drop" icon="/static/images/images_list/drop.jpg" />
+        <draggable id="name_label_icon3" label="Grass" icon="/static/images/images_list/grass.jpg" />
+        <draggable id="name4" label="Star" icon="/static/images/images_list/star.png" />
         <draggable id="7" label="Label3" />
 
         <target id="t1" x="20" y="20" w="90" h="90"/>
@@ -368,20 +363,20 @@ else:
 
 <customresponse>
     <text>
-        <h3>Draggables can be places anywhere on base image.
-            Place grass in the middle of the image and ant in the
-            right upper corner.</h3>
-        <br />
+        <h4>[Draggables can be placed anywhere on base image]</h4><br/>
+        <h4>
+            Place -Grass- in the middle of the image and -Ant- in the
+            right upper corner.</h4><br/>
     </text>
 
-    <drag_and_drop_input img="cow.png" >
+    <drag_and_drop_input img="/static/images/cow.png" >
         <draggable id="1" label="Label 1"/>
-        <draggable id="ant" label="Ant" icon="images_list/ant.jpg"/>
-        <draggable id="with_icon" label="Cloud" icon="images_list/cloud.jpg" />
+        <draggable id="ant" label="Ant" icon="/static/images/images_list/ant.jpg"/>
+        <draggable id="with_icon" label="Cloud" icon="/static/images/images_list/cloud.jpg" />
         <draggable id="5" label="Label2" />
-        <draggable id="2" label="Drop" icon="images_list/drop.jpg" />
-        <draggable id="grass" label="Grass" icon="images_list/grass.jpg" />
-        <draggable id="name4" label="Star" icon="images_list/star.png" />
+        <draggable id="2" label="Drop" icon="/static/images/images_list/drop.jpg" />
+        <draggable id="grass" label="Grass" icon="/static/images/images_list/grass.jpg" />
+        <draggable id="name4" label="Star" icon="/static/images/images_list/star.png" />
         <draggable id="7" label="Label3" />
 
     </drag_and_drop_input>
@@ -398,11 +393,11 @@ else:
 
 <customresponse>
     <text>
-        <h3>Please identify the Carbon and Oxygen atoms in the molecule.</h3>
-        <br />
+        <h4>[Another anyof example]</h4><br/>
+        <h4>Please identify the Carbon and Oxygen atoms in the molecule.</h4><br/>
     </text>
 
-    <drag_and_drop_input img="images_list/ethglycol.jpg" target_outline="true" one_per_target="true">
+    <drag_and_drop_input img="/static/images/images_list/ethglycol.jpg" target_outline="true" one_per_target="true">
         <draggable id="l1_c" label="Carbon" />
         <draggable id="l2" label="Methane"/>
         <draggable id="l3_o" label="Oxygen" />
@@ -449,13 +444,13 @@ else:
 
 <customresponse>
     <text>
-        <h3>If the element appears in this molecule,
-         drag the label onto it</h3>
-        <br />
+        <h4>[Again another anyof example]</h4><br/>
+        <h4>If the element appears in this molecule, drag the label onto it</h4>
+        <br/>
     </text>
 
-    <drag_and_drop_input img="images_list/ethglycol.jpg" target_outline="true"
-        one_per_target="true" no_labels="true">
+    <drag_and_drop_input img="/static/images/images_list/ethglycol.jpg" target_outline="true"
+        one_per_target="true" no_labels="true" label_bg_color="rgb(222, 139, 238)">
         <draggable id="1" label="Hydrogen" />
         <draggable id="2" label="Hydrogen" />
         <draggable id="3" label="Nytrogen" />
@@ -499,22 +494,18 @@ else:
 
 <customresponse>
     <text>
-        <h3>
-            SMALL IMAGE. Individual targets WITHOUT outlines. Move Star to the
-            volcano opening, and Label3 on to the right ear of the cow.
-            One draggable per target.
-        </h3>
-        <br />
+        <h4>[Wrong base image url example]
+        </h4><br/>
     </text>
 
-    <drag_and_drop_input img="cow3_bad.png" target_outline="false">
+    <drag_and_drop_input img="/static/images/cow3_bad.png" target_outline="false">
         <draggable id="1" label="Label 1"/>
-        <draggable id="name_with_icon" label="Ant" icon="images_list/ant.jpg"/>
-        <draggable id="with_icon" label="Cloud" icon="images_list/cloud.jpg" />
+        <draggable id="name_with_icon" label="Ant" icon="/static/images/images_list/ant.jpg"/>
+        <draggable id="with_icon" label="Cloud" icon="/static/images/images_list/cloud.jpg" />
         <draggable id="5" label="Label2" />
-        <draggable id="2" label="Drop" icon="images_list/drop.jpg" />
-        <draggable id="name_label_icon3" label="Grass" icon="images_list/grass.jpg" />
-        <draggable id="name4" label="Star" icon="images_list/star.png" />
+        <draggable id="2" label="Drop" icon="/static/images/images_list/drop.jpg" />
+        <draggable id="name_label_icon3" label="Grass" icon="/static/images/images_list/grass.jpg" />
+        <draggable id="name4" label="Star" icon="/static/images/images_list/star.png" />
         <draggable id="7" label="Label3" />
 
         <target id="t1" x="111" y="58" w="90" h="90"/>
diff --git a/docs/source/drag-n-drop-demo2.xml b/docs/source/drag-n-drop-demo2.xml
new file mode 100644
index 0000000000..6ffac18e44
--- /dev/null
+++ b/docs/source/drag-n-drop-demo2.xml
@@ -0,0 +1,373 @@
+<problem display_name="Drag and drop demos: drag and drop icons or labels
+    to proper positions." >
+
+<customresponse>
+    <text>
+        <h4>[Draggable is reusable example]</h4>
+        <br/>
+        <h4>Please label all hydrogen atoms.</h4>
+        <br/>
+    </text>
+
+    <drag_and_drop_input
+        img="/static/images/images_list/ethglycol.jpg"
+        target_outline="true"
+        one_per_target="true"
+        no_labels="true"
+        label_bg_color="rgb(222, 139, 238)"
+    >
+        <draggable id="1" label="Hydrogen" can_reuse='true' />
+
+        <target id="t1_o" x="10" y="67" w="100" h="100" />
+        <target id="t2" x="133" y="3" w="70" h="70" />
+        <target id="t3" x="2" y="384" w="70" h="70" />
+        <target id="t4" x="95" y="386" w="70" h="70" />
+        <target id="t5_c" x="94" y="293" w="91" h="91" />
+        <target id="t6_c" x="328" y="294" w="91" h="91" />
+        <target id="t7" x="393" y="463" w="70" h="70" />
+        <target id="t8" x="344" y="214" w="70" h="70" />
+        <target id="t9_o" x="445" y="162" w="100" h="100" />
+        <target id="t10" x="591" y="132" w="70" h="70" />
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python">
+    <![CDATA[
+correct_answer = [{
+    'draggables': ['1'],
+    'targets': ['t2', 't3', 't4', 't7', 't8', 't10'],
+    'rule': 'exact'
+}]
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+    ]]>
+    </answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h4>[Complex grading example]</h4><br/>
+        <h4>Describe carbon molecule in LCAO-MO.</h4>
+        <br/>
+    </text>
+
+    <drag_and_drop_input img="/static/images/images_list/lcao-mo/lcao-mo.jpg" target_outline="true" >
+
+        <!-- filled bond -->
+        <draggable id="1" icon="/static/images/images_list/lcao-mo/u_d.png" can_reuse="true" />
+
+        <!-- up bond -->
+        <draggable id="7"  icon="/static/images/images_list/lcao-mo/up.png" can_reuse="true" />
+
+        <!-- sigma -->
+        <draggable id="11" icon="/static/images/images_list/lcao-mo/sigma.png" can_reuse="true" />
+
+        <!-- sigma* -->
+        <draggable id="13" icon="/static/images/images_list/lcao-mo/sigma_s.png" can_reuse="true" />
+
+        <!-- pi -->
+        <draggable id="15" icon="/static/images/images_list/lcao-mo/pi.png" can_reuse="true" />
+
+        <!-- pi* -->
+        <draggable id="16" icon="/static/images/images_list/lcao-mo/pi_s.png" can_reuse="true" />
+
+        <!-- images that should not be dragged -->
+        <draggable id="17" icon="/static/images/images_list/lcao-mo/d.png" can_reuse="true" />
+
+        <!-- positions of electrons and electron pairs -->
+        <target id="s_left"       x="130" y="360"    w="32" h="32"/>
+        <target id="s_right"      x="505" y="360"    w="32" h="32"/>
+        <target id="s_sigma"      x="320" y="425"    w="32" h="32"/>
+        <target id="s_sigma_star" x="320" y="290"    w="32" h="32"/>
+        <target id="p_left_1"     x="80"  y="100"    w="32" h="32"/>
+        <target id="p_left_2"     x="125" y="100"    w="32" h="32"/>
+        <target id="p_left_3"     x="175" y="100"    w="32" h="32"/>
+        <target id="p_right_1"    x="465" y="100"    w="32" h="32"/>
+        <target id="p_right_2"    x="515" y="100"    w="32" h="32"/>
+        <target id="p_right_3"    x="560" y="100"    w="32" h="32"/>
+        <target id="p_pi_1"       x="290" y="220"    w="32" h="32"/>
+        <target id="p_pi_2"       x="335" y="220"    w="32" h="32"/>
+        <target id="p_sigma"      x="315" y="170"    w="32" h="32"/>
+        <target id="p_pi_star_1"  x="290" y="40"     w="32" h="32"/>
+        <target id="p_pi_star_2"  x="340" y="40"     w="32" h="32"/>
+        <target id="p_sigma_star" x="315" y="0"      w="32" h="32"/>
+
+        <!-- positions of names of energy levels -->
+        <target id="s_sigma_name"      x="400" y="425"  w="32" h="32"/>
+        <target id="s_sigma_star_name" x="400" y="290"  w="32" h="32"/>
+        <target id="p_pi_name"         x="400" y="220"  w="32" h="32"/>
+        <target id="p_sigma_name"      x="400" y="170"  w="32" h="32"/>
+        <target id="p_pi_star_name"    x="400" y="40"   w="32" h="32"/>
+        <target id="p_sigma_star_name" x="400" y="0"    w="32" h="32"/>
+
+  </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = [
+{
+  'draggables': ['1'],
+  'targets': [
+    's_left', 's_right', 's_sigma', 's_sigma_star', 'p_pi_1', 'p_pi_2'
+  ],
+  'rule': 'exact'
+}, {
+  'draggables': ['7'],
+  'targets': ['p_left_1', 'p_left_2', 'p_right_1','p_right_2'],
+  'rule': 'exact'
+}, {
+  'draggables': ['11'],
+  'targets': ['s_sigma_name', 'p_sigma_name'],
+  'rule': 'exact'
+}, {
+  'draggables': ['13'],
+  'targets': ['s_sigma_star_name', 'p_sigma_star_name'],
+  'rule': 'exact'
+}, {
+  'draggables': ['15'],
+  'targets': ['p_pi_name'],
+  'rule': 'exact'
+}, {
+  'draggables': ['16'],
+  'targets': ['p_pi_star_name'],
+  'rule': 'exact'
+}]
+
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h4>[Many draggables per target]</h4><br/>
+        <h4>Move two Stars and three Ants to most left target
+            and one Label3 and four Label2 to most right target.</h4><br/>
+    </text>
+
+    <drag_and_drop_input img="/static/images/cow.png" target_outline="true" one_per_target="false">
+        <draggable id="1" label="Label 1" can_reuse="true" />
+        <draggable id="name_with_icon" label="Ant" icon="/static/images/images_list/ant.jpg" can_reuse="true" />
+        <draggable id="with_icon" label="Cloud" icon="/static/images/images_list/cloud.jpg" can_reuse="true" />
+        <draggable id="5" label="Label2" can_reuse="true" />
+        <draggable id="2" label="Drop" icon="/static/images/images_list/drop.jpg" can_reuse="true" />
+        <draggable id="name_label_icon3" label="Grass" icon="/static/images/images_list/grass.jpg" can_reuse="true" />
+        <draggable id="name4" label="Star" icon="/static/images/images_list/star.png" can_reuse="true" />
+        <draggable id="7" label="Label3" can_reuse="true" />
+
+        <target id="t1" x="20" y="20" w="90" h="90"/>
+        <target id="t2" x="300" y="100" w="90" h="90"/>
+        <target id="t3" x="150" y="40" w="50" h="50"/>
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = [
+{
+    'draggables': ['name4'],
+    'targets': [
+        't1', 't1'
+    ],
+    'rule': 'exact'
+},
+{
+    'draggables': ['name_with_icon'],
+    'targets': [
+        't1', 't1', 't1'
+    ],
+    'rule': 'exact'
+},
+{
+    'draggables': ['5'],
+    'targets': [
+        't2', 't2', 't2', 't2'
+    ],
+    'rule': 'exact'
+},
+{
+    'draggables': ['7'],
+    'targets': [
+        't2'
+    ],
+    'rule': 'exact'
+}
+]
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h4>[Draggables can be placed anywhere on base image]</h4><br/>
+        <h4>
+            Place -Grass- in the middle of the image and -Ant- in the
+            right upper corner.</h4><br/>
+    </text>
+
+    <drag_and_drop_input img="/static/images/cow.png" >
+        <draggable id="1" label="Label 1" can_reuse="true" />
+        <draggable id="ant" label="Ant" icon="/static/images/images_list/ant.jpg" can_reuse="true" />
+        <draggable id="with_icon" label="Cloud" icon="/static/images/images_list/cloud.jpg" can_reuse="true" />
+        <draggable id="5" label="Label2" can_reuse="true" />
+        <draggable id="2" label="Drop" icon="/static/images/images_list/drop.jpg" can_reuse="true" />
+        <draggable id="grass" label="Grass" icon="/static/images/images_list/grass.jpg" can_reuse="true" />
+        <draggable id="name4" label="Star" icon="/static/images/images_list/star.png" can_reuse="true" />
+        <draggable id="7" label="Label3" can_reuse="true" />
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = {
+    'grass': [[300, 200], 200],
+    'ant': [[500, 0], 200]
+}
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h4>[Another anyof example]</h4><br/>
+        <h4>Please identify the Carbon and Oxygen atoms in the molecule.</h4><br/>
+    </text>
+
+    <drag_and_drop_input img="/static/images/images_list/ethglycol.jpg" target_outline="true" one_per_target="true">
+        <draggable id="l1_c" label="Carbon" can_reuse="true" />
+        <draggable id="l2" label="Methane" can_reuse="true" />
+        <draggable id="l3_o" label="Oxygen" can_reuse="true" />
+        <draggable id="l4" label="Calcium" can_reuse="true" />
+        <draggable id="l7" label="Hydrogen" can_reuse="true" />
+
+        <target id="t1_o" x="10" y="67" w="100" h="100"/>
+        <target id="t2" x="133" y="3" w="70" h="70"/>
+        <target id="t3" x="2" y="384" w="70" h="70"/>
+        <target id="t4" x="95" y="386" w="70" h="70"/>
+        <target id="t5_c" x="94" y="293" w="91" h="91"/>
+        <target id="t6_c" x="328" y="294" w="91" h="91"/>
+        <target id="t7" x="393" y="463" w="70" h="70"/>
+        <target id="t8" x="344" y="214" w="70" h="70"/>
+        <target id="t9_o" x="445" y="162" w="100" h="100"/>
+        <target id="t10" x="591" y="132" w="70" h="70"/>
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = [
+{
+    'draggables': ['l3_o'],
+    'targets': ['t1_o', 't9_o'],
+    'rule': 'exact'
+},
+{
+    'draggables': ['l1_c'],
+    'targets': ['t5_c', 't6_c'],
+    'rule': 'exact'
+}
+]
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h4>[Exact number of draggables for a set of targets.]</h4><br/>
+        <h4>Drag two Grass and one Star to first or second positions, and three Cloud to any of the three positions.</h4>
+        <br/>
+    </text>
+
+    <drag_and_drop_input img="/static/images/cow.png" target_outline="true" one_per_target="false">
+        <draggable id="1" label="Label 1" can_reuse="true" />
+        <draggable id="name_with_icon" label="Ant" icon="/static/images/images_list/ant.jpg" can_reuse="true" />
+        <draggable id="with_icon" label="Cloud" icon="/static/images/images_list/cloud.jpg" can_reuse="true" />
+        <draggable id="5" label="Label2" can_reuse="true" />
+        <draggable id="2" label="Drop" icon="/static/images/images_list/drop.jpg" can_reuse="true" />
+        <draggable id="name_label_icon3" label="Grass" icon="/static/images/images_list/grass.jpg" can_reuse="true" />
+        <draggable id="name4" label="Star" icon="/static/images/images_list/star.png" can_reuse="true" />
+        <draggable id="7" label="Label3" can_reuse="true" />
+
+        <target id="t1" x="20" y="20" w="90" h="90"/>
+        <target id="t2" x="300" y="100" w="90" h="90"/>
+        <target id="t3" x="150" y="40" w="50" h="50"/>
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = [
+{
+    'draggables': ['name_label_icon3', 'name_label_icon3'],
+    'targets': ['t1', 't3'],
+    'rule': 'unordered_equal+number'
+},
+{
+    'draggables': ['name4'],
+    'targets': ['t1', 't3'],
+    'rule': 'anyof+number'
+},
+{
+    'draggables': ['with_icon', 'with_icon', 'with_icon'],
+    'targets': ['t1', 't2', 't3'],
+    'rule': 'anyof+number'
+}
+]
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+<customresponse>
+    <text>
+        <h4>[As many as you like draggables for a set of targets.]</h4><br/>
+        <h4>Drag some Grass to any of the targets, and some Stars to either first or last target.</h4>
+        <br/>
+    </text>
+
+    <drag_and_drop_input img="/static/images/cow.png" target_outline="true" one_per_target="false">
+        <draggable id="1" label="Label 1" can_reuse="true" />
+        <draggable id="name_with_icon" label="Ant" icon="/static/images/images_list/ant.jpg" can_reuse="true" />
+        <draggable id="with_icon" label="Cloud" icon="/static/images/images_list/cloud.jpg" can_reuse="true" />
+        <draggable id="5" label="Label2" can_reuse="true" />
+        <draggable id="2" label="Drop" icon="/static/images/images_list/drop.jpg" can_reuse="true" />
+        <draggable id="name_label_icon3" label="Grass" icon="/static/images/images_list/grass.jpg" can_reuse="true" />
+        <draggable id="name4" label="Star" icon="/static/images/images_list/star.png" can_reuse="true" />
+        <draggable id="7" label="Label3" can_reuse="true" />
+
+        <target id="t1" x="20" y="20" w="90" h="90"/>
+        <target id="t2" x="300" y="100" w="90" h="90"/>
+        <target id="t3" x="150" y="40" w="50" h="50"/>
+
+    </drag_and_drop_input>
+
+    <answer type="loncapa/python"><![CDATA[
+correct_answer = [
+{
+    'draggables': ['name_label_icon3'],
+    'targets': ['t1', 't2', 't3'],
+    'rule': 'anyof'
+},
+{
+    'draggables': ['name4'],
+    'targets': ['t1', 't2'],
+    'rule': 'anyof'
+}
+]
+if draganddrop.grade(submission[0], correct_answer):
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+]]></answer>
+</customresponse>
+
+</problem>
diff --git a/docs/source/drag_and_drop_input.rst b/docs/source/drag_and_drop_input.rst
index d03d9755bd..06a28a5926 100644
--- a/docs/source/drag_and_drop_input.rst
+++ b/docs/source/drag_and_drop_input.rst
@@ -312,7 +312,12 @@ Logic flow
 Example
 =======
 
-Various configuration of DnD on one page
-----------------------------------------
+Examples of draggables that can't be reused
+-------------------------------------------
 
 .. literalinclude:: drag-n-drop-demo.xml
+
+Draggables can be reused
+------------------------
+
+.. literalinclude:: drag-n-drop-demo2.xml

From 3e0333309d5635d36549c1bd5da0b98783173670 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Mon, 21 Jan 2013 18:03:04 +0200
Subject: [PATCH 529/541] removed openendedinput

---
 common/lib/capa/capa/inputtypes.py | 49 ------------------------------
 1 file changed, 49 deletions(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index 919c4a3eec..0b0e86ce66 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -740,55 +740,6 @@ registry.register(ChemicalEquationInput)
 
 #-----------------------------------------------------------------------------
 
-class OpenEndedInput(InputTypeBase):
-    """
-    A text area input for code--uses codemirror, does syntax highlighting, special tab handling,
-    etc.
-    """
-
-    template = "openendedinput.html"
-    tags = ['openendedinput']
-
-    # pulled out for testing
-    submitted_msg = ("Feedback not yet available.  Reload to check again. "
-                     "Once the problem is graded, this message will be "
-                     "replaced with the grader's feedback")
-
-    @classmethod
-    def get_attributes(cls):
-        """
-        Convert options to a convenient format.
-        """
-        return [Attribute('rows', '30'),
-                Attribute('cols', '80'),
-                Attribute('hidden', ''),
-                ]
-
-    def setup(self):
-        """
-        Implement special logic: handle queueing state, and default input.
-        """
-        # if no student input yet, then use the default input given by the problem
-        if not self.value:
-            self.value = self.xml.text
-
-        # Check if problem has been queued
-        self.queue_len = 0
-        # Flag indicating that the problem has been queued, 'msg' is length of queue
-        if self.status == 'incomplete':
-            self.status = 'queued'
-            self.queue_len = self.msg
-            self.msg = self.submitted_msg
-
-    def _extra_context(self):
-        """Defined queue_len, add it """
-        return {'queue_len': self.queue_len, }
-
-registry.register(OpenEndedInput)
-
-# -------------------------------------------------------------------------
-
-
 class DragAndDropInput(InputTypeBase):
     """
     Input for drag and drop problems. Allows student to drag and drop images and

From 07c10859669fbc5c9539980e833ce4b62a6f3034 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Mon, 21 Jan 2013 18:33:17 +0200
Subject: [PATCH 530/541] improved readability of drag and drop render test

---
 common/lib/capa/capa/tests/test_inputtypes.py | 42 ++++++++++++-------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/common/lib/capa/capa/tests/test_inputtypes.py b/common/lib/capa/capa/tests/test_inputtypes.py
index a61d47a243..6c282baf95 100644
--- a/common/lib/capa/capa/tests/test_inputtypes.py
+++ b/common/lib/capa/capa/tests/test_inputtypes.py
@@ -16,6 +16,7 @@ TODO:
 
 """
 
+import json
 from lxml import etree
 import unittest
 import xml.sax.saxutils as saxutils
@@ -533,6 +534,25 @@ class DragAndDropTest(unittest.TestCase):
         state = {'value': value,
                  'status': 'unsubmitted'}
 
+        user_input = {  # order matters, for string comparison
+                        "target_outline": "false",
+                        "base_image": "/static/images/about_1.png",
+                        "draggables": [
+{"can_reuse": "", "label": "Label 1", "id": "1", "icon": ""},
+{"can_reuse": "", "label": "cc", "id": "name_with_icon", "icon": "/static/images/cc.jpg", },
+{"can_reuse": "", "label": "arrow-left", "id": "with_icon", "icon": "/static/images/arrow-left.png", "can_reuse": ""},
+{"can_reuse": "", "label": "Label2", "id": "5", "icon": "", "can_reuse": ""},
+{"can_reuse": "", "label": "Mute", "id": "2", "icon": "/static/images/mute.png", "can_reuse": ""},
+{"can_reuse": "", "label": "spinner", "id": "name_label_icon3", "icon": "/static/images/spinner.gif", "can_reuse": ""},
+{"can_reuse": "", "label": "Star", "id": "name4", "icon": "/static/images/volume.png", "can_reuse": ""},
+{"can_reuse": "", "label": "Label3", "id": "7", "icon": "", "can_reuse": ""}],
+                        "one_per_target": "True",
+                        "targets": [
+                {"y": "90", "x": "210", "id": "t1", "w": "90", "h": "90"},
+                {"y": "160", "x": "370", "id": "t2", "w": "90", "h": "90"}
+                                    ]
+                    }
+
         the_input = lookup_tag('drag_and_drop_input')(test_system, element, state)
 
         context = the_input._get_render_context()
@@ -540,20 +560,12 @@ class DragAndDropTest(unittest.TestCase):
                     'value': value,
                     'status': 'unsubmitted',
                     'msg': '',
-                    'drag_and_drop_json': '{"use_targets": "True", \
-"target_outline": "false", "one_per_target": "True", \
-"draggables": [{"label": "Label 1", "id": "1", "icon": ""}, \
-{"label": "cc", "id": "name_with_icon", "icon": \
-"/static/images/cc.jpg"}, {"label": "arrow-left", "id": \
-"with_icon", "icon": "/static/images/arrow-left.png"}, \
-{"label": "Label2", "id": "5", "icon": ""}, {"label": \
-"Mute", "id": "2", "icon": "/static/images/mute.png"}, \
-{"label": "spinner", "id": "name_label_icon3", "icon": \
-"/static/images/spinner.gif"}, {"label": "Star", "id": \
-"name4", "icon": "/static/images/volume.png"}, {"label": \
-"Label3", "id": "7", "icon": ""}], "base_image": \
-"/static/images/about_1.png", "targets": \
-[{"y": "90", "x": "210", "id": "t1", "w": "90", "h": "90"}, \
-{"y": "160", "x": "370", "id": "t2", "w": "90", "h": "90"}]}',
+                    'drag_and_drop_json': json.dumps(user_input)
                     }
+
+        # as we are dumping 'draggables' dicts while dumping user_input, string
+        # comparison will fail, as order of keys is random.
+        self.assertEqual(json.loads(context['drag_and_drop_json']), user_input)
+        context.pop('drag_and_drop_json')
+        expected.pop('drag_and_drop_json')
         self.assertEqual(context, expected)

From e78c020a52dd0b8e979b2d746dfc20599be05e04 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Mon, 21 Jan 2013 18:38:03 +0200
Subject: [PATCH 531/541] removed dublicate comment

---
 common/lib/capa/capa/verifiers/draganddrop.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/common/lib/capa/capa/verifiers/draganddrop.py b/common/lib/capa/capa/verifiers/draganddrop.py
index 9bfbf982ff..906b9ffb7e 100644
--- a/common/lib/capa/capa/verifiers/draganddrop.py
+++ b/common/lib/capa/capa/verifiers/draganddrop.py
@@ -130,7 +130,6 @@ class DragAndDrop(object):
             current_rule = self.correct_positions[groupname].keys()[0]
             if 'number' in current_rule:
                 rule_values = self.correct_positions[groupname][current_rule]
-                #clean rule, do not do clean dublicate items
                 self.correct_positions[groupname].pop(current_rule, None)
                 parsed_rule = current_rule.replace('+', '').replace('number', '')
                 self.correct_positions[groupname][parsed_rule] = rule_values

From 0f5e7cd9e44b04d47b298b2f28a1652c729a4784 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Mon, 21 Jan 2013 18:55:29 +0200
Subject: [PATCH 532/541] explained for - else

---
 common/lib/capa/capa/verifiers/draganddrop.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/common/lib/capa/capa/verifiers/draganddrop.py b/common/lib/capa/capa/verifiers/draganddrop.py
index 906b9ffb7e..b1072507d2 100644
--- a/common/lib/capa/capa/verifiers/draganddrop.py
+++ b/common/lib/capa/capa/verifiers/draganddrop.py
@@ -217,6 +217,13 @@ class DragAndDrop(object):
                     if PositionsCompare(u_el) == PositionsCompare(c_el):
                         break
                 else:
+                    # General: the else is executed after the for,
+                    # only if the for terminates normally (not by a break)
+
+                    # In this case, 'for' is terminated normally if every element
+                    # from 'correct' list isn't equal to concrete element from
+                    # 'user' list. So as we found one element from 'user' list,
+                    # that not in 'correct' list - we return False
                     return False
 
         if flag == 'unordered_equal':
@@ -229,6 +236,8 @@ class DragAndDrop(object):
                         temp.remove(c_el)
                         break
                 else:
+                    # same as upper -  if we found element from 'user' list,
+                    # that not in 'correct' list - we return False.
                     return False
 
         return True

From 2d67ee477eaaa5c984abbbddf1c56c2233f30978 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Mon, 21 Jan 2013 18:58:30 +0200
Subject: [PATCH 533/541] commend about rule in simple form

---
 common/lib/capa/capa/verifiers/draganddrop.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/lib/capa/capa/verifiers/draganddrop.py b/common/lib/capa/capa/verifiers/draganddrop.py
index b1072507d2..6d4f0623ab 100644
--- a/common/lib/capa/capa/verifiers/draganddrop.py
+++ b/common/lib/capa/capa/verifiers/draganddrop.py
@@ -255,6 +255,9 @@ class DragAndDrop(object):
 
             It is draggable_name: dragable_position mapping.
 
+            Complex form converted from simple form uses 'exact' rule
+            for matching.
+
         Correct answer in list form is designed for complex cases::
 
         correct_answers = [

From a95e809824cfa03f54ded72354bb166250d4c756 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Mon, 21 Jan 2013 19:05:30 +0200
Subject: [PATCH 534/541] documentation extended

---
 common/lib/capa/capa/verifiers/draganddrop.py | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/common/lib/capa/capa/verifiers/draganddrop.py b/common/lib/capa/capa/verifiers/draganddrop.py
index 6d4f0623ab..1756ab355b 100644
--- a/common/lib/capa/capa/verifiers/draganddrop.py
+++ b/common/lib/capa/capa/verifiers/draganddrop.py
@@ -126,7 +126,8 @@ class DragAndDrop(object):
             # 'number' rule special case
             # for reusable draggables we may get in self.user_groups
             # {'1': [u'2', u'2', u'2'], '0': [u'1', u'1'], '2': [u'3']}
-            # if +number in rule - do not remove duplicates but clean rule
+            # if '+number' is in rule - do not remove duplicates and strip
+            # '+number' from rule
             current_rule = self.correct_positions[groupname].keys()[0]
             if 'number' in current_rule:
                 rule_values = self.correct_positions[groupname][current_rule]
@@ -246,7 +247,7 @@ class DragAndDrop(object):
         """ Populates DragAndDrop variables from user_answer and correct_answer.
         If correct_answer is dict, converts it to list.
         Correct answer in dict form is simpe structure for fast and simple
-        grading. Example of corrrect answer dict example::
+        grading. Example of correct answer dict example::
 
             correct_answer = {'name4': 't1',
                             'name_with_icon': 't1',
@@ -255,10 +256,10 @@ class DragAndDrop(object):
 
             It is draggable_name: dragable_position mapping.
 
-            Complex form converted from simple form uses 'exact' rule
+            Advanced form converted from simple form uses 'exact' rule
             for matching.
 
-        Correct answer in list form is designed for complex cases::
+        Correct answer in list form is designed for advanced cases::
 
         correct_answers = [
         {
@@ -273,10 +274,17 @@ class DragAndDrop(object):
         }
                         ]
 
-        Correct answer in list form is list of dicts, and every dict must have
+        Advanced answer in list form is list of dicts, and every dict must have
         3 keys: 'draggables', 'targets' and 'rule'. 'Draggables' value is
         list of draggables ids, 'targes' values are list of targets ids, 'rule'
-        value is 'exact' or 'anyof'.
+        value one of 'exact', 'anyof', 'unordered_equal', 'anyof+number',
+        'unordered_equal+number'
+
+        Advanced form uses "all dicts must match with their rule" logic.
+
+        Same draggable cannot appears more that in one dict.
+
+        Behavior is more widely explained in sphinx documentation.
 
         Args:
             user_answer: json

From 00f966a94a0d32691f990bcc41b3ab2fccf5c861 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Mon, 21 Jan 2013 19:22:23 +0200
Subject: [PATCH 535/541] populate -> __init__

---
 common/lib/capa/capa/verifiers/draganddrop.py | 23 ++++++++-----------
 .../capa/capa/verifiers/tests_draganddrop.py  | 19 ++++++++-------
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/common/lib/capa/capa/verifiers/draganddrop.py b/common/lib/capa/capa/verifiers/draganddrop.py
index 1756ab355b..87381fad76 100644
--- a/common/lib/capa/capa/verifiers/draganddrop.py
+++ b/common/lib/capa/capa/verifiers/draganddrop.py
@@ -101,11 +101,6 @@ class PositionsCompare(list):
 class DragAndDrop(object):
     """ Grader class for drag and drop inputtype.
     """
-    def __init__(self):
-        self.correct_groups = dict()  # correct groups from xml
-        self.correct_positions = dict()  # correct positions for comparing
-        self.user_groups = dict()  # will be populated from user answer
-        self.user_positions = dict()  # will be populated from user answer
 
     def grade(self):
         ''' Grader user answer.
@@ -243,7 +238,7 @@ class DragAndDrop(object):
 
         return True
 
-    def populate(self, correct_answer, user_answer):
+    def __init__(self, correct_answer, user_answer):
         """ Populates DragAndDrop variables from user_answer and correct_answer.
         If correct_answer is dict, converts it to list.
         Correct answer in dict form is simpe structure for fast and simple
@@ -289,10 +284,13 @@ class DragAndDrop(object):
         Args:
             user_answer: json
             correct_answer: dict  or list
+        """
 
-        Returns: None
+        self.correct_groups = dict()  # correct groups from xml
+        self.correct_positions = dict()  # correct positions for comparing
+        self.user_groups = dict()  # will be populated from user answer
+        self.user_positions = dict()  # will be populated from user answer
 
-         """
         # convert from dict answer format to list format
         if isinstance(correct_answer, dict):
             tmp = []
@@ -330,8 +328,8 @@ class DragAndDrop(object):
 
 
 def grade(user_input, correct_answer):
-    """ Populates DragAndDrop instance from user_input and correct_answer and
-        calls DragAndDrop.drade for grading.
+    """ Creates DragAndDrop instance from user_input and correct_answer and
+        calls DragAndDrop.grade for grading.
 
         Supports two interfaces for correct_answer: dict and list.
 
@@ -373,6 +371,5 @@ def grade(user_input, correct_answer):
 
         Returns: bool
     """
-    dnd = DragAndDrop()
-    dnd.populate(correct_answer=correct_answer, user_answer=user_input)
-    return dnd.grade()
+    return DragAndDrop(correct_answer=correct_answer,
+                       user_answer=user_input).grade()
diff --git a/common/lib/capa/capa/verifiers/tests_draganddrop.py b/common/lib/capa/capa/verifiers/tests_draganddrop.py
index 55425ae910..9b1b15ce0c 100644
--- a/common/lib/capa/capa/verifiers/tests_draganddrop.py
+++ b/common/lib/capa/capa/verifiers/tests_draganddrop.py
@@ -520,11 +520,10 @@ class Test_DragAndDrop_Grade(unittest.TestCase):
 class Test_DragAndDrop_Populate(unittest.TestCase):
 
     def test_1(self):
-        dnd = draganddrop.DragAndDrop()
         correct_answer = {'1': [[40, 10], 29], 'name_with_icon': [20, 20]}
         user_input = '{"draggables": \
         [{"1": [10, 10]}, {"name_with_icon": [20, 20]}]}'
-        dnd.populate(correct_answer, user_input)
+        dnd = draganddrop.DragAndDrop(correct_answer, user_input)
 
         correct_groups = {'1': ['name_with_icon'], '0': ['1']}
         correct_positions = {'1': {'exact': [[20, 20]]}, '0': {'exact': [[[40, 10], 29]]}}
@@ -540,49 +539,49 @@ class Test_DragAndDrop_Populate(unittest.TestCase):
 class Test_DraAndDrop_Compare_Positions(unittest.TestCase):
 
     def test_1(self):
-        dnd = draganddrop.DragAndDrop()
+        dnd = draganddrop.DragAndDrop({'1': 't1'}, '{"draggables": [{"1": "t1"}]}')
         self.assertTrue(dnd.compare_positions(correct=[[1, 1], [2, 3]],
                                               user=[[2, 3], [1, 1]],
                                               flag='anyof'))
 
     def test_2a(self):
-        dnd = draganddrop.DragAndDrop()
+        dnd = draganddrop.DragAndDrop({'1': 't1'}, '{"draggables": [{"1": "t1"}]}')
         self.assertTrue(dnd.compare_positions(correct=[[1, 1], [2, 3]],
                                                user=[[2, 3], [1, 1]],
                                                flag='exact'))
 
     def test_2b(self):
-        dnd = draganddrop.DragAndDrop()
+        dnd = draganddrop.DragAndDrop({'1': 't1'}, '{"draggables": [{"1": "t1"}]}')
         self.assertFalse(dnd.compare_positions(correct=[[1, 1], [2, 3]],
                                                user=[[2, 13], [1, 1]],
                                                flag='exact'))
 
     def test_3(self):
-        dnd = draganddrop.DragAndDrop()
+        dnd = draganddrop.DragAndDrop({'1': 't1'}, '{"draggables": [{"1": "t1"}]}')
         self.assertFalse(dnd.compare_positions(correct=["a", "b"],
                                                user=["a", "b", "c"],
                                                flag='anyof'))
 
     def test_4(self):
-        dnd = draganddrop.DragAndDrop()
+        dnd = draganddrop.DragAndDrop({'1': 't1'}, '{"draggables": [{"1": "t1"}]}')
         self.assertTrue(dnd.compare_positions(correct=["a", "b", "c"],
                                               user=["a", "b"],
                                               flag='anyof'))
 
     def test_5(self):
-        dnd = draganddrop.DragAndDrop()
+        dnd = draganddrop.DragAndDrop({'1': 't1'}, '{"draggables": [{"1": "t1"}]}')
         self.assertFalse(dnd.compare_positions(correct=["a", "b", "c"],
                                                user=["a", "c", "b"],
                                                flag='exact'))
 
     def test_6(self):
-        dnd = draganddrop.DragAndDrop()
+        dnd = draganddrop.DragAndDrop({'1': 't1'}, '{"draggables": [{"1": "t1"}]}')
         self.assertTrue(dnd.compare_positions(correct=["a", "b", "c"],
                                                user=["a", "c", "b"],
                                                flag='anyof'))
 
     def test_7(self):
-        dnd = draganddrop.DragAndDrop()
+        dnd = draganddrop.DragAndDrop({'1': 't1'}, '{"draggables": [{"1": "t1"}]}')
         self.assertFalse(dnd.compare_positions(correct=["a", "b", "b"],
                                                user=["a", "c", "b"],
                                                flag='anyof'))

From 91281915c4b7f8ed4a0c70488ffb3e7485f6ed79 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Mon, 21 Jan 2013 19:28:49 +0200
Subject: [PATCH 536/541] update of deleted comment

---
 common/lib/capa/capa/verifiers/draganddrop.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/lib/capa/capa/verifiers/draganddrop.py b/common/lib/capa/capa/verifiers/draganddrop.py
index 87381fad76..eb91208923 100644
--- a/common/lib/capa/capa/verifiers/draganddrop.py
+++ b/common/lib/capa/capa/verifiers/draganddrop.py
@@ -126,6 +126,7 @@ class DragAndDrop(object):
             current_rule = self.correct_positions[groupname].keys()[0]
             if 'number' in current_rule:
                 rule_values = self.correct_positions[groupname][current_rule]
+                # clean rule, do not do clean duplicate items
                 self.correct_positions[groupname].pop(current_rule, None)
                 parsed_rule = current_rule.replace('+', '').replace('number', '')
                 self.correct_positions[groupname][parsed_rule] = rule_values

From 899c501d3d29ea3b4fa83610e45e90ae075bdc99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s=20Rocha?= <rocha@edx.org>
Date: Mon, 21 Jan 2013 13:56:01 -0500
Subject: [PATCH 537/541] Add announcement of Walter Lewin's course

[#157]
---
 .../dr-lewin-276_2400x1600.jpg.REMOVED.git-id |   1 +
 .../press/releases/dr-lewin-276_240x180.jpg   | Bin 0 -> 18144 bytes
 .../press/releases/dr-lewin-316_240x180.jpg   | Bin 0 -> 9681 bytes
 lms/templates/feed.rss                        |  23 ++++--
 .../Lewin_course_announcement.html            |  77 ++++++++++++++++++
 lms/urls.py                                   |   4 +-
 6 files changed, 97 insertions(+), 8 deletions(-)
 create mode 100644 lms/static/images/press/releases/dr-lewin-276_2400x1600.jpg.REMOVED.git-id
 create mode 100644 lms/static/images/press/releases/dr-lewin-276_240x180.jpg
 create mode 100644 lms/static/images/press/releases/dr-lewin-316_240x180.jpg
 create mode 100644 lms/templates/static_templates/press_releases/Lewin_course_announcement.html

diff --git a/lms/static/images/press/releases/dr-lewin-276_2400x1600.jpg.REMOVED.git-id b/lms/static/images/press/releases/dr-lewin-276_2400x1600.jpg.REMOVED.git-id
new file mode 100644
index 0000000000..7166a5027c
--- /dev/null
+++ b/lms/static/images/press/releases/dr-lewin-276_2400x1600.jpg.REMOVED.git-id
@@ -0,0 +1 @@
+b4d043bb1ca4a8815d4a388a2c9d96038211417b
\ No newline at end of file
diff --git a/lms/static/images/press/releases/dr-lewin-276_240x180.jpg b/lms/static/images/press/releases/dr-lewin-276_240x180.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d1a5300b1ec60f0a4b63ea92d2794d159ed279c1
GIT binary patch
literal 18144
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
LCOI+`ysrE|>Lb?e

literal 0
HcmV?d00001

diff --git a/lms/static/images/press/releases/dr-lewin-316_240x180.jpg b/lms/static/images/press/releases/dr-lewin-316_240x180.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6a659a36124a62dcc1649700edbff710184f17bb
GIT binary patch
literal 9681
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

literal 0
HcmV?d00001

diff --git a/lms/templates/feed.rss b/lms/templates/feed.rss
index 415199141d..aa84e0ff52 100644
--- a/lms/templates/feed.rss
+++ b/lms/templates/feed.rss
@@ -6,16 +6,25 @@
   <link type="text/html" rel="alternate" href="http://blog.edx.org/"/>
   ##<link type="application/atom+xml" rel="self" href="https://github.com/blog.atom"/>
   <title>EdX Blog</title>
-  <updated>2012-12-19T14:00:12-07:00</updated>
+  <updated>2013-01-21T14:00:12-07:00</updated>
   <entry>
-    <id>tag:www.edx.org,2012:Post/10</id>
-    <published>2012-12-19T14:00:00-07:00</published>
-    <updated>2012-12-19T14:00:00-07:00</updated>
-    <link type="text/html" rel="alternate" href="${reverse('press/spring-courses')}"/>
-    <title>edX announces first wave of new courses for Spring 2013</title>
-    <content type="html">&lt;img src=&quot;${static.url('images/press/releases/edx-logo_240x180.png')}&quot; /&gt;
+    <id>tag:www.edx.org,2012:Post/11</id>
+    <published>2013-01-22T10:00:00-07:00</published>
+    <updated>2013-01-22T10:00:00-07:00</updated>
+    <link type="text/html" rel="alternate" href="${reverse('press/lewin-course-announcement')}"/>
+    <title>New course from legendary MIT physics professor Walter Lewin</title>
+    <content type="html">&lt;img src=&quot;${static.url('images/press/releases/dr-lewin-316_240x180.jpg')}&quot; /&gt;
         &lt;p&gt;&lt;/p&gt;</content>
   </entry>
+  <!-- <entry> -->
+  <!--   <id>tag:www.edx.org,2012:Post/10</id> -->
+  <!--   <published>2012-12-19T14:00:00-07:00</published> -->
+  <!--   <updated>2012-12-19T14:00:00-07:00</updated> -->
+  <!--   <link type="text/html" rel="alternate" href="${reverse('press/spring-courses')}"/> -->
+  <!--   <title>edX announces first wave of new courses for Spring 2013</title> -->
+  <!--   <content type="html">&lt;img src=&quot;${static.url('images/press/releases/edx-logo_240x180.png')}&quot; /&gt; -->
+  <!--       &lt;p&gt;&lt;/p&gt;</content> -->
+  <!-- </entry> -->
   <entry>
     <id>tag:www.edx.org,2012:Post/9</id>
     <published>2012-12-10T14:00:00-07:00</published>
diff --git a/lms/templates/static_templates/press_releases/Lewin_course_announcement.html b/lms/templates/static_templates/press_releases/Lewin_course_announcement.html
new file mode 100644
index 0000000000..4fb2a2c83e
--- /dev/null
+++ b/lms/templates/static_templates/press_releases/Lewin_course_announcement.html
@@ -0,0 +1,77 @@
+<%! from django.core.urlresolvers import reverse %>
+<%inherit file="../../main.html" />
+
+<%namespace name='static' file='../../static_content.html'/>
+
+<%block name="title"><title>New Course from legendary MIT physics professor Walter Lewin</title></%block>
+<div id="fb-root"></div>
+<script>(function(d, s, id) {
+  var js, fjs = d.getElementsByTagName(s)[0];
+  if (d.getElementById(id)) return;
+  js = d.createElement(s); js.id = id;
+  js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
+  fjs.parentNode.insertBefore(js, fjs);
+}(document, 'script', 'facebook-jssdk'));</script>
+
+<section class="pressrelease">
+  <section class="container">
+    <h1>Afraid of physics? Do you hate it?<br/>Walter Lewin will make you love physics whether you like it or not</h1>
+    <hr class="horizontal-divider">
+      <article>
+        <h2>MIT physics professor and online web star brings his renowned Electricity and Magnetism course to edX</h2>
+
+        <figure>
+          <a href="${static.url('images/press/releases/dr-lewin-276_2400x1600.jpg')}"><img src="${static.url('images/press/releases/dr-lewin-276_240x180.jpg')}" /></a>
+          <figcaption>
+            <p>Walter Lewin, legendary MIT physics professor, demonstrates, in his inimitable fashion, one of the many laws of physics covered in his new course on edX.</p>
+            <p>Credit: Dominick Reuter</p>
+            <a href="${static.url('images/press/releases/dr-lewin-276_2400x1600.jpg')}">High Resolution Image</a></p>
+          </figcaption>
+        </figure>
+
+        <p><strong>CAMBRIDGE, MA  &ndash; January 22, 2013 &ndash;</strong> <a href="http://www.edx.org">EdX</a>, the not-for-profit online learning initiative founded by Harvard University and the Massachusetts Institute of Technology (MIT), announced today a new course from the legendary Professor Walter Lewin who, for 47 years, has provided generations of MIT students – and millions watching online – with his inspiring and unconventional lectures. Now, with this edX version of Professor Lewin’s famous course Electricity and Magnetism (Physics), people around the world can experience it just like his students on the MIT campus. MITx <a href="https://www.edx.org/courses/MITx/8.02x/2013_Spring/about">8.02x Electricity and Magnetism</a> is now open for enrollment and classes will begin on February 18, 2013.</p>
+
+        <p>“I have taught this course to tens of thousands and many tell me it changed their lives,” said Walter Lewin, Professor of Physics at MIT. “Teaching is my passion:  I want to open peoples’ eyes and minds to the beauty of physics so they will begin to see the world in a new way.”</p>
+
+        <p>In <a href="https://www.edx.org/courses/MITx/8.02x/2013_Spring/about">8.02x Electricity and Magnetism</a>, Professor Lewin will teach students to “see” the world instead of just “looking at” it. He will make them “see” natural phenomena such as rainbows in a way they never imagined before. Through his dynamic teaching, enthusiasm and great sense of humor, Professor Lewin has an innate ability to make difficult concepts easy.  The New York Times has crowned him a “Web Star” and noted how his lectures, with their engaging physics demonstrations, have won him devotees around the world.  While this course is MIT level, edX and Professor Lewin encourage even senior high school students from around the world to watch his lectures and take the course.</p>
+
+        <p>“Walter Lewin is an international treasure,” said Anant Agarwal, President of edX. “His physics lectures on the MIT campus were already legendary before he put them online and they became an international sensation. We know edX learners will be awestruck by his provocative and enlightening course.”</p>
+
+        <p>In addition to the basic concepts of Electromagnetism, a vast variety of interesting topics are covered, including Lightning, Pacemakers, Electric Shock Treatment, Electrocardiograms, Metal Detectors, Musical Instruments, Magnetic Levitation, Bullet Trains, Electric Motors, Radios, TV, Car Coils, Superconductivity, Aurora Borealis, Rainbows, Radio Telescopes, Interferometers, Particle Accelerators such as the Large Hadron Collider, Mass Spectrometers, Red Sunsets, Blue Skies, Haloes around Sun and Moon, Color Perception, Doppler Effect and Big-Bang Cosmology.</p>
+
+        <p>Professor Lewin received his PhD in Nuclear Physics at the Technical University in Delft, the Netherlands in 1965. He joined the Physics faculty at MIT in 1966 and became a pioneer in the new field of X-ray Astronomy. His 105 online lectures are world-renowned and are viewed by nearly 2 million people annually. Professor Lewin has received five teaching awards and is the only MIT professor featured in "The Best 300 Professors" by The Princeton Review. He has co-authored with Warren Goldstein the book "For the Love of Physics" (Free Press, Simon & Schuster), which has been translated into 9 languages.</p>
+
+        <p>Previously announced new 2013 courses include: <a href="http://www.edx.org/courses/HarvardX/ER22x/2013_Spring/about">Justice from Michael Sandel</a>; <a href="http://www.edx.org/courses/BerkeleyX/Stat2.1x/2013_Spring/about">Introduction to Statistics from Ani Adhikari</a>; <a href="http://www.edx.org/courses/MITx/14.73x/2013_Spring/about">The Challenges of Global Poverty from Esther Duflo</a>; <a href="http://www.edx.org/courses/HarvardX/CB22x/2013_Spring/about">The Ancient Greek Hero from Gregory Nagy</a>; <a href="https://www.edx.org/courses/BerkeleyX/CS191x/2013_Spring/about">Quantum Mechanics and Quantum Computation from Umesh Vazirani</a>; <a href="https://www.edx.org/courses/HarvardX/PH278x/2013_Spring/about">Human Health and Global Environmental Change, from Aaron Bernstein and Jack Spengler</a>.</p>
+
+        <p>In addition to these new courses, edX is bringing back several courses from the popular fall 2012 semester: <a href="http://www.edx.org/courses/MITx/6.00x/2013_Spring/about">Introduction to Computer Science and Programming</a>; <a href="http://www.edx.org/courses/MITx/3.091x/2013_Spring/about">Introduction to Solid State Chemistry</a>; <a href="http://www.edx.org/courses/BerkeleyX/CS188.1x/2013_Spring/about">Introduction to Artificial Intelligence</a>; <a href="https://www.edx.org/courses/BerkeleyX/CS169.1x/2013_Spring/about">Software as a Service I</a>; <a href="https://www.edx.org/courses/BerkeleyX/CS169.2x/2013_Spring/about">Software as a Service II</a>; <a href="http://www.edx.org/courses/BerkeleyX/CS184.1x/2013_Spring/about">Foundations of Computer Graphics</a>.</p>
+
+        <h2>About edX</h2>
+
+        <p><a href="https://www.edx.org/">EdX</a> is a not-for-profit enterprise of its founding partners <a href="http://www.harvard.edu">Harvard University</a> and the <a href="http://www.mit.edu">Massachusetts Institute of Technology</a> focused on transforming online and on-campus learning through groundbreaking methodologies, game-like experiences and cutting-edge research. EdX provides inspirational and transformative knowledge to students of all ages, social status, and income who form worldwide communities of learners. EdX uses its open source technology to transcend physical and social borders. We’re focused on people, not profit. EdX is based in Cambridge, Massachusetts in the USA.</p>
+
+      <section class="contact">
+        <p><strong>Contact:</strong></p>
+        <p>Brad Baker, Weber Shandwick for edX</p>
+        <p>BBaker@webershandwick.com</p>
+        <p>(617) 520-7043</p>
+      </section>
+
+      <section class="footer">
+        <hr class="horizontal-divider">
+        <div class="logo"></div><h3 class="date">12 - 22 - 2013</h3>
+        <div class="social-sharing">
+        <hr class="horizontal-divider">
+          <p>Share with friends and family:</p>
+          <a href="http://twitter.com/intent/tweet?text=:MIT+physics+professor+and+online+web+star+brings+his+renowned+Electricity+and+Magnetism+course+to+edX+http://www.edx.org/press/lewin-course-announcement" class="share">
+            <img src="${static.url('images/social/twitter-sharing.png')}">
+          </a>
+        </a>
+        <a href="mailto:?subject=MIT%20physics%20professor%20and%20online%20web%20star%20brings%20his%20renowned%20Electricity%20and%20Magnetism%20course%20to%20edX&body=Afraid%20of%20physics?%20Do%20you%20hate%20it?%20Walter%20Lewin%20will%20make%20you%20love%20physics%20whether%20you%20like%20it%20or%20not…http://edx.org/press/lewin-course-announcement" class="share">
+          <img src="${static.url('images/social/email-sharing.png')}">
+        </a>
+        <div class="fb-like" data-href="http://edx.org/press/lewin-course-announcement" data-send="true" data-width="450" data-show-faces="true"></div>
+      </div>
+      </section>
+    </article>
+  </section>
+</section>
diff --git a/lms/urls.py b/lms/urls.py
index cab0533f89..ad3b324534 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -118,9 +118,11 @@ urlpatterns = ('',
         {'template': 'press_releases/Georgetown_joins_edX.html'}, name="press/georgetown-joins-edx"),
     url(r'^press/spring-courses$', 'static_template_view.views.render',
         {'template': 'press_releases/Spring_2013_course_announcements.html'}, name="press/spring-courses"),
+    url(r'^press/lewin-course-announcement$', 'static_template_view.views.render',
+        {'template': 'press_releases/Lewin_course_announcement.html'}, name="press/lewin-course-announcement"),
 
     # Should this always update to point to the latest press release?
-    (r'^pressrelease$', 'django.views.generic.simple.redirect_to', {'url': '/press/spring-courses'}),
+    (r'^pressrelease$', 'django.views.generic.simple.redirect_to', {'url': '/press/lewin-course-announcement'}),
 
 
     (r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/static/images/favicon.ico'}),

From 183721ecf5247e00d0dc8e0cc903509a3b907760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s=20Rocha?= <rocha@edx.org>
Date: Mon, 21 Jan 2013 13:59:05 -0500
Subject: [PATCH 538/541] Correct last screenshot caption of media-kit page.

[#159]
---
 lms/templates/static_templates/media-kit.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lms/templates/static_templates/media-kit.html b/lms/templates/static_templates/media-kit.html
index 458cfb8e15..73eea9c3b8 100644
--- a/lms/templates/static_templates/media-kit.html
+++ b/lms/templates/static_templates/media-kit.html
@@ -89,7 +89,7 @@
             <figure>
               <a rel="asset" class="action action-download" href="${static.url('images/press-kit/3.091x_high-res.png')}">
                 <img src="${static.url('images/press-kit/3.091x_x200.jpg')}"/>
-          <figcaption>Screenshot of 6.00x: Introduction to Computer Science and Programming.</figcaption>
+          <figcaption>Screenshot of 3.091x: Introduction to Solid State Chemistry.</figcaption>
                 <span class="note">Download (High Resolution Photo)</span>
               </a>
             </figure>
@@ -108,4 +108,4 @@
         return false;
       });
    </script>
-</%block>
\ No newline at end of file
+</%block>

From 45f2a690d039276b797d503f6f37ee3250c81a47 Mon Sep 17 00:00:00 2001
From: Peter Baratta <peter.baratta@gmail.com>
Date: Thu, 17 Jan 2013 06:51:57 -0700
Subject: [PATCH 539/541] Commented on high level functions

---
 lms/lib/symmath/formula.py       | 16 ++++++++++----
 lms/lib/symmath/symmath_check.py | 37 +++++++++++++++++++++++++++++---
 2 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/lms/lib/symmath/formula.py b/lms/lib/symmath/formula.py
index bab0ab3691..c34156da52 100644
--- a/lms/lib/symmath/formula.py
+++ b/lms/lib/symmath/formula.py
@@ -154,8 +154,9 @@ def my_sympify(expr, normphase=False, matrix=False, abcsym=False, do_qubit=False
 
 class formula(object):
     '''
-    Representation of a mathematical formula object.  Accepts mathml math expression for constructing,
-    and can produce sympy translation.  The formula may or may not include an assignment (=).
+    Representation of a mathematical formula object.  Accepts mathml math expression
+    for constructing, and can produce sympy translation.  The formula may or may not
+    include an assignment (=).
     '''
     def __init__(self, expr, asciimath='', options=None):
         self.expr = expr.strip()
@@ -194,8 +195,12 @@ class formula(object):
 
     def preprocess_pmathml(self, xml):
         '''
-        Pre-process presentation MathML from ASCIIMathML to make it more acceptable for SnuggleTeX, and also
-        to accomodate some sympy conventions (eg hat(i) for \hat{i}).
+        Pre-process presentation MathML from ASCIIMathML to make it more
+        acceptable for SnuggleTeX, and also to accomodate some sympy
+        conventions (eg hat(i) for \hat{i}).
+
+        This method would be a good spot to look for an integral and convert
+        it, if possible...
         '''
 
         if type(xml) == str or type(xml) == unicode:
@@ -266,6 +271,9 @@ class formula(object):
         '''
         Return sympy expression for the math formula.
         The math formula is converted to Content MathML then that is parsed.
+
+        This is a recursive function, called on every CMML node. Support for
+        more functions can be added by modifying opdict, abould halfway down
         '''
 
         if self.the_sympy: return self.the_sympy
diff --git a/lms/lib/symmath/symmath_check.py b/lms/lib/symmath/symmath_check.py
index bcb4a0d490..3cc4fd7d3c 100644
--- a/lms/lib/symmath/symmath_check.py
+++ b/lms/lib/symmath/symmath_check.py
@@ -157,13 +157,33 @@ def symmath_check(expect, ans, dynamath=None, options=None, debug=None, xml=None
     '''
     Check a symbolic mathematical expression using sympy.
     The input may be presentation MathML.  Uses formula.
+
+    This is the default Symbolic Response checking function
+
+    Desc of args:
+    expect is a sympy string representing the correct answer. It is interpreted
+     using my_sympify (from formula.py), which reads strings as sympy input
+     (e.g. 'integrate(x^2, (x,1,2))' would be valid, and evaluate to give 1.5)
+
+    ans is student-typed answer. It is expected to be ascii math, but the code
+     below would support a sympy string.
+
+    dynamath is the PMathML string converted by MathJax. It is used if
+     evaluation with ans is not sufficient.
+
+    options is a string with these possible substrings, set as an xml property
+     of the problem:
+     -matrix - make a sympy matrix, rather than a list of lists, if possible
+     -qubit - passed to my_sympify
+     -imaginary - used in formla, presumably to signal to use i as sqrt(-1)?
+     -numerical - force numerical comparison.
     '''
 
     msg = ''
     # msg += '<p/>abname=%s' % abname
     # msg += '<p/>adict=%s' % (repr(adict).replace('<','&lt;'))
 
-    threshold = 1.0e-3
+    threshold = 1.0e-3 # for numerical comparison (also with matrices)
     DEBUG = debug
 
     if xml is not None:
@@ -184,13 +204,17 @@ def symmath_check(expect, ans, dynamath=None, options=None, debug=None, xml=None
         msg += '<p>Error %s in parsing OUR expected answer "%s"</p>' % (err, expect)
         return {'ok': False, 'msg': make_error_message(msg)}
 
+
+    ###### Sympy input #######
     # if expected answer is a number, try parsing provided answer as a number also
     try:
         fans = my_sympify(str(ans), matrix=do_matrix, do_qubit=do_qubit)
     except Exception, err:
         fans = None
 
-    if hasattr(fexpect, 'is_number') and fexpect.is_number and fans and hasattr(fans, 'is_number') and fans.is_number:
+    # do a numerical comparison if both expected and answer are numbers
+    if (hasattr(fexpect, 'is_number') and fexpect.is_number and fans
+        and hasattr(fans, 'is_number') and fans.is_number):
         if abs(abs(fans - fexpect) / fexpect) < threshold:
             return {'ok': True, 'msg': msg}
         else:
@@ -208,6 +232,8 @@ def symmath_check(expect, ans, dynamath=None, options=None, debug=None, xml=None
         msg += '<p>You entered: %s</p>' % to_latex(fans)
         return {'ok': True, 'msg': msg}
 
+
+    ###### PMathML input ######
     # convert mathml answer to formula
     try:
         if dynamath:
@@ -216,6 +242,7 @@ def symmath_check(expect, ans, dynamath=None, options=None, debug=None, xml=None
         mmlans = None
     if not mmlans:
         return {'ok': False, 'msg': '[symmath_check] failed to get MathML for input; dynamath=%s' % dynamath}
+
     f = formula(mmlans, options=options)
 
     # get sympy representation of the formula
@@ -238,7 +265,7 @@ def symmath_check(expect, ans, dynamath=None, options=None, debug=None, xml=None
             msg += '<hr>'
         return {'ok': False, 'msg': make_error_message(msg)}
 
-    # compare with expected
+    # do numerical comparison with expected
     if hasattr(fexpect, 'is_number') and fexpect.is_number:
         if hasattr(fsym, 'is_number') and fsym.is_number:
             if abs(abs(fsym - fexpect) / fexpect) < threshold:
@@ -250,6 +277,10 @@ def symmath_check(expect, ans, dynamath=None, options=None, debug=None, xml=None
         # msg += "<p>cmathml = <pre>%s</pre></p>" % str(f.cmathml).replace('<','&lt;')
         return {'ok': False, 'msg': make_error_message(msg)}
 
+    # Here is a good spot for adding calls to X.simplify() or X.expand(),
+    #  allowing equivalence over binomial expansion or trig identities
+
+    # exactly the same?
     if fexpect == fsym:
         return {'ok': True, 'msg': msg}
 

From edda80d485883c34038a1e6adb79666719314e2f Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Tue, 22 Jan 2013 11:30:24 -0500
Subject: [PATCH 540/541] New style base python classes and basestring type.

---
 cms/djangoapps/models/settings/course_details.py | 5 ++---
 cms/djangoapps/models/settings/course_grading.py | 2 +-
 common/djangoapps/models/course_relative.py      | 2 +-
 common/djangoapps/util/converters.py             | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/cms/djangoapps/models/settings/course_details.py b/cms/djangoapps/models/settings/course_details.py
index 2bb9d98be7..d01e784d74 100644
--- a/cms/djangoapps/models/settings/course_details.py
+++ b/cms/djangoapps/models/settings/course_details.py
@@ -12,7 +12,7 @@ import re
 import logging
 
 
-class CourseDetails:
+class CourseDetails(object):
     def __init__(self, location):
         self.course_location = location    # a Location obj
         self.start_date = None  # 'start'
@@ -79,8 +79,7 @@ class CourseDetails:
         descriptor = get_modulestore(course_location).get_item(course_location)
         
         dirty = False
-        
-        ## ??? Will this comparison work?
+
         if 'start_date' in jsondict:
             converted = jsdate_to_time(jsondict['start_date'])
         else:
diff --git a/cms/djangoapps/models/settings/course_grading.py b/cms/djangoapps/models/settings/course_grading.py
index e0bab1f225..9cfa18c8c9 100644
--- a/cms/djangoapps/models/settings/course_grading.py
+++ b/cms/djangoapps/models/settings/course_grading.py
@@ -4,7 +4,7 @@ import re
 from util import converters
 
 
-class CourseGradingModel:
+class CourseGradingModel(object):
     """
     Basically a DAO and Model combo for CRUD operations pertaining to grading policy. 
     """
diff --git a/common/djangoapps/models/course_relative.py b/common/djangoapps/models/course_relative.py
index 4dfb83d183..58cc0fb0de 100644
--- a/common/djangoapps/models/course_relative.py
+++ b/common/djangoapps/models/course_relative.py
@@ -1,4 +1,4 @@
-class CourseRelativeMember:
+class CourseRelativeMember(object):
     def __init__(self, location, idx):
         self.course_location = location     # a Location obj
         self.idx = idx                   # which milestone this represents. Hopefully persisted # so we don't have race conditions
diff --git a/common/djangoapps/util/converters.py b/common/djangoapps/util/converters.py
index 17c45114d1..7f96dc6c30 100644
--- a/common/djangoapps/util/converters.py
+++ b/common/djangoapps/util/converters.py
@@ -15,7 +15,7 @@ def jsdate_to_time(field):
     """
     if field is None:
         return field
-    elif isinstance(field, unicode) or isinstance(field, str):  # iso format but ignores time zone assuming it's Z
+    elif isinstance(field, basestring):  # iso format but ignores time zone assuming it's Z
         d=datetime.datetime(*map(int, re.split('[^\d]', field)[:6])) # stop after seconds. Debatable  
         return d.utctimetuple()
     elif isinstance(field, int) or isinstance(field, float):

From bbcab7314a07ec2d34347935a7808e4e9f8a297f Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Tue, 22 Jan 2013 14:10:01 -0500
Subject: [PATCH 541/541] Anonymous users don't have an email attribute, and
 shouldn't be checked for CourseEnrollmentAllowed

---
 lms/djangoapps/courseware/access.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/djangoapps/courseware/access.py b/lms/djangoapps/courseware/access.py
index a176d2a171..f58c53c0cc 100644
--- a/lms/djangoapps/courseware/access.py
+++ b/lms/djangoapps/courseware/access.py
@@ -127,7 +127,7 @@ def _has_access_course_desc(user, course, action):
             return True
 
         # if user is in CourseEnrollmentAllowed with right course_id then can also enroll
-        if user is not None and CourseEnrollmentAllowed:
+        if user is not None and user.is_authenticated() and CourseEnrollmentAllowed:
             if CourseEnrollmentAllowed.objects.filter(email=user.email, course_id=course.id):
                 return True