E1946

.generators

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Settings><!--This file was automatically generated by Ruby plugin.
+You are allowed to: 
+1. Reorder generators
+2. Remove generators
+3. Add installed generators
+To add new installed generators automatically delete this file and reload the project.
+--><GeneratorsGroup><Generator name="active_record:migration" /><Generator name="active_record:model" /><Generator name="active_record:observer" /><Generator name="active_record:session_migration" /><Generator name="controller" /><Generator name="erb:controller" /><Generator name="erb:mailer" /><Generator name="erb:scaffold" /><Generator name="generator" /><Generator name="helper" /><Generator name="integration_test" /><Generator name="mailer" /><Generator name="metal" /><Generator name="migration" /><Generator name="model" /><Generator name="model_subclass" /><Generator name="observer" /><Generator name="performance_test" /><Generator name="plugin" /><Generator name="resource" /><Generator name="scaffold" /><Generator name="scaffold_controller" /><Generator name="session_migration" /><Generator name="stylesheets" /><Generator name="test_unit:controller" /><Generator name="test_unit:helper" /><Generator name="test_unit:integration" /><Generator name="test_unit:mailer" /><Generator name="test_unit:model" /><Generator name="test_unit:observer" /><Generator name="test_unit:performance" /><Generator name="test_unit:plugin" /><Generator name="test_unit:scaffold" /></GeneratorsGroup></Settings>

.rakeTasks

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Settings><!--This file was automatically generated by Ruby plugin.
+You are allowed to: 
+1. Remove rake task
+2. Add existing rake tasks
+To add existing rake tasks automatically delete this file and reload the project.
+--><RakeGroup description="" fullCmd="" taksId="rake" /></Settings>

Gemfile

@@ -8,6 +8,7 @@ gem 'activesupport', '~> 4.2.11.1'
 gem 'airbrake'
 gem 'awesome_nested_set'
 gem 'bind-it'
+gem 'bootstrap3-datetimepicker-rails', '~> 4.17.47'
 gem 'capistrano'
 gem 'capistrano-bundler'
 gem "capistrano-db-tasks", require: false
@@ -18,7 +19,7 @@ gem 'capistrano-rvm'
 gem 'chartjs-ror'
 gem 'coffee-rails'
 gem 'coveralls', require: false
-gem 'danger', git: 'https://github.com/Winbobob/danger.git', ref: '6df469a', require: false
+gem 'danger', git: 'https://github.com/Winbobob/danger.git', ref: 'a2fe557209879642615473ee9919788fc650be75', require: false
 gem 'delayed_job_active_record'
 gem 'dynamic_form'
 gem 'edavis10-ruby-web-search'
@@ -38,6 +39,7 @@ gem 'jquery-tablesorter'
 gem 'jquery-ui-sass-rails'
 gem 'json'
 gem 'lingua'
+gem 'momentjs-rails', '>= 2.9.0'
 gem 'mysql2'
 gem 'nokogiri'
 gem 'omniauth-google-oauth2'

Gemfile.lock

@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/Winbobob/danger.git
-  revision: 6df469a1c1359ea06ce7ba7eccd4a0ad73a9efdb
-  ref: 6df469a
+  revision: a2fe557209879642615473ee9919788fc650be75
+  ref: a2fe557209879642615473ee9919788fc650be75
   specs:
-    danger (5.8.0)
+    danger (5.16.1)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -95,6 +95,8 @@ GEM
       execjs (~> 2.0)
     bind-it (0.2.7)
       rjb (~> 1.4.3)
+    bootstrap3-datetimepicker-rails (4.17.47)
+      momentjs-rails (>= 2.8.1)
     builder (3.2.3)
     capistrano (3.10.1)
       airbrussh (>= 1.0.0)
@@ -125,7 +127,7 @@ GEM
       rails (>= 3.1)
     childprocess (0.8.0)
       ffi (~> 1.0, >= 1.0.11)
-    claide (1.0.2)
+    claide (1.0.3)
     claide-plugins (0.9.2)
       cork
       nap
@@ -194,7 +196,8 @@ GEM
     gchartrb (0.8)
     gdata (1.1.2)
     gherkin (5.0.0)
-    git (1.5.0)
+    git (1.7.0)
+      rchardet (~> 1.8)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     googlecharts (1.6.12)
@@ -276,6 +279,8 @@ GEM
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
+    momentjs-rails (2.20.1)
+      railties (>= 3.1)
     morpher (0.2.6)
       abstract_type (~> 0.0.7)
       adamantium (~> 0.2.0)
@@ -326,7 +331,8 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    octokit (4.13.0)
+    octokit (4.18.0)
+      faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     omniauth (1.8.1)
       hashie (>= 3.4.6, < 3.6.0)
@@ -403,6 +409,7 @@ GEM
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     rb-readline (0.5.5)
+    rchardet (1.8.0)
     react-rails (1.11.0)
       babel-transpiler (>= 0.7.0)
       connection_pool
@@ -487,9 +494,9 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
     scrypt (2.1.1)
       ffi-compiler (>= 0.0.2)
       rake
@@ -582,6 +589,7 @@ DEPENDENCIES
   airbrake
   awesome_nested_set
   bind-it
+  bootstrap3-datetimepicker-rails (~> 4.17.47)
   capistrano
   capistrano-bundler
   capistrano-db-tasks
@@ -619,6 +627,7 @@ DEPENDENCIES
   json
   launchy
   lingua
+  momentjs-rails (>= 2.9.0)
   mutant-rspec
   mysql2
   nokogiri

app/assets/javascripts/application.js

@@ -34,6 +34,8 @@
 //= require awesome_input
 //= require jquery-bar-rating/jquery.barrating
 //= require Chart.min
+//= require moment
+//= require bootstrap-datetimepicker
 // Eliminate the “element.dispatchEvent is not a function” error
 jQuery.noConflict();
 

app/assets/javascripts/team_users_popup.js

@@ -0,0 +1,73 @@
+$(document).ready(function () {
+    $('#dialogConfirmMark').dialog({
+        autoOpen: false
+    })
+    $('#dialogConfirmUnmark').dialog({
+        autoOpen: false
+    })
+});
+
+function publish_example_review(bid) {
+    $("#dialogConfirmMark").dialog({
+        modal: true,
+        height: 600,
+        width: 500,
+
+        buttons: {
+            Cancel : function () {
+                $(this).dialog("close");
+            },
+            'Publish Sample Reviews': function() {
+                var array = [];
+                $("input:checkbox[name=published_assignments]:checked").each(function() {
+                    array.push($(this).val());
+                });
+                $.ajax({
+                    "url":"/sample_reviews/map/"+bid.getAttribute('data-response-id'),
+                    "type":"POST",
+                    "data":{
+                        "assignments":array
+                    },
+                    "dataType":"json",
+                    success:function(data, textStatus, jqXHR)
+                    {
+                        window.location.reload();
+                    },
+                });
+            }}});
+
+    $('#dialogConfirmMark').dialog('open');
+}
+
+function suppress_example_review(bid) {
+    $("#dialogConfirmUnmark").dialog({
+        modal: true,
+        height: 600,
+        width: 500,
+
+        buttons: {
+            Cancel : function () {
+                $(this).dialog("close");
+            },
+            Yes: function() {
+                var array = [];
+                $("input:checkbox[name=published_assignments]:checked").each(function() {
+                    array.push($(this).val());
+                });
+
+                $.ajax({
+                    "url":"/sample_reviews/unmap/"+bid.getAttribute('data-response-id'),
+                    "type":"POST",
+                    "data":{
+                        "assignments":array
+                    },
+                    "dataType":"json", success:function(data, textStatus, jqXHR)
+                    {
+                        window.location.reload();
+                    },
+                });
+            }}});
+
+    $('#dialogConfirmUnmark').dialog('open');
+}
+

app/assets/javascripts/tree_display.jsx

@@ -1,3 +1,21 @@
+// initialize a global object available throughout the application
+// can be useful on different pages
+let app_variables = {
+  currentUserId: null
+};
+
+// execute the grabbing of user id after the page is fully loaded
+// helps to make sure that the react component is rendered for sure
+// also avoid hindering the rendering steps
+window.addEventListener('load', e => {
+  // grab the data attribute
+  let treeDisplayDiv = document.querySelector('#tree_display');
+  // check if the html element is present requested in the query above
+  if (treeDisplayDiv) {
+    // set the userid for the current user
+    app_variables.currentUserId = treeDisplayDiv.dataset.userId;
+  }
+});
 jQuery(document).ready(function() {
   // This preloadedImages function is refered from http://jsfiddle.net/slashingweapon/8jAeu/
   // Actually I am not using the values in preloadedImages, but image loading speed is indeed getting faster
@@ -91,9 +109,18 @@ jQuery(document).ready(function() {
           newNodeType = this.props.nodeType + "s"
         }
         if (this.props.is_available || newNodeType == 'questionnaires') {
+          // check if the user id exists
+          // check if the current user id matches the user/instructor id associated with a questionnaire/survey
+          // show edit button only for the items which are associated to that user
+          if (app_variables.currentUserId == null || this.props.instructor_id == app_variables.currentUserId) {
+            moreContent.push(
+              <span>
+                <a title="Edit" href={"/"+newNodeType+"/"+(parseInt(this.props.id)/2).toString()+"/edit"}><img src="/assets/tree_view/edit-icon-24.png" /></a>
+              </span>
+            );  
+          }
           moreContent.push(
             <span>
-              <a title="Edit" href={"/"+newNodeType+"/"+(parseInt(this.props.id)/2).toString()+"/edit"}><img src="/assets/tree_view/edit-icon-24.png" /></a>
               <a title="Delete" href={"/tree_display/confirm?id="+(parseInt(this.props.id)/2).toString()+"&nodeType="+newNodeType}><img src="/assets/tree_view/delete-icon-24.png" /></a>
             </span>
           )
@@ -310,6 +337,7 @@ jQuery(document).ready(function() {
                             allow_suggestions={this.props.allow_suggestions}
                             has_topic={this.props.has_topic}
                             id={id}
+                            instructor_id = {this.props.instructor_id}
                         />
                     </td>
                 </tr>
@@ -336,6 +364,7 @@ jQuery(document).ready(function() {
                             allow_suggestions={this.props.allow_suggestions}
                             has_topic={this.props.has_topic}
                             id={id}
+                            instructor_id = {this.props.instructor_id}
                         />
                     </td>
                 </tr>
@@ -381,6 +410,7 @@ jQuery(document).ready(function() {
                       require_quiz={entry.require_quiz}
                       has_topic={entry.has_topic}
                       dataType={_this.props.dataType}
+                      instructor_id={entry.instructor_id}
                   />)
               })
           }
@@ -402,6 +432,7 @@ jQuery(document).ready(function() {
                       require_quiz={entry.require_quiz}
                       has_topic={entry.has_topic}
                       dataType={_this.props.dataType}
+                      instructor_id={entry.instructor_id}
                   />)
               })
           }
@@ -464,6 +495,26 @@ jQuery(document).ready(function() {
         expanded: false
       }
     },
+      componentDidMount: function() {
+        // this buffer holds the title for all of the rubric types under the Questionnaire tab
+          rubricBuffer = ["Review", "Metareview", "Author Feedback", "Teammate Review", "Assignment Survey", "Global Survey", "Course Survey"];
+
+       //selectedMenuItem then takes the clicked rubric from the panel under questionnaire
+       //selectedMenuItemIndex finds the corresponding index of the click rubric from the above buffer
+          selectedMenuItem = document.getElementById("tree_display").getAttribute("data-menu-item");
+          selectedMenuItemIndex = rubricBuffer.indexOf(selectedMenuItem);
+
+          if (selectedMenuItemIndex !== -1) {
+          if(rubricBuffer[selectedMenuItemIndex] === this.props.name) {
+              //if the name matches, expand the rubric panel by setting this property to true
+                  this.setState({
+                      expanded: true
+                  }, function () {
+                      this.props.rowClicked(this.props.id, true, this.props.newParams)
+                  })
+              }
+          }
+      },
     handleClick: function(event) {
         //alert('click');
 

app/assets/stylesheets/application.scss

@@ -26,3 +26,4 @@ $icon-font-path: "bootstrap-sass/assets/fonts/bootstrap/";
 @import "confirm_box";
 @import "inner-pages";
 @import "homepage";
+@import 'bootstrap-datetimepicker';

app/controllers/admin_controller.rb

@@ -1,4 +1,5 @@
 class AdminController < ApplicationController
+
   def action_allowed?
     case params[:action]
     when 'list_instructors'
@@ -34,4 +35,5 @@ def show_instructor
     @user = User.find(params[:id])
     @role = Role.find(@user.role_id)
   end
+
 end