From 91690ec9a1c8fe35a50081accc5ff94f839f22af Mon Sep 17 00:00:00 2001 From: ahmed93 Date: Tue, 15 Apr 2014 17:23:06 +0200 Subject: [PATCH 01/55] Issue #188 create controllers --- tutor/app/assets/javascripts/method_constraints.js.coffee | 3 +++ tutor/app/assets/stylesheets/method_constraints.css.scss | 3 +++ tutor/app/controllers/method_constraints_controller.rb | 7 +++++++ tutor/app/helpers/method_constraints_helper.rb | 2 ++ .../test/controllers/method_constraints_controller_test.rb | 7 +++++++ tutor/test/helpers/method_constraints_helper_test.rb | 4 ++++ 6 files changed, 26 insertions(+) create mode 100644 tutor/app/assets/javascripts/method_constraints.js.coffee create mode 100644 tutor/app/assets/stylesheets/method_constraints.css.scss create mode 100644 tutor/app/controllers/method_constraints_controller.rb create mode 100644 tutor/app/helpers/method_constraints_helper.rb create mode 100644 tutor/test/controllers/method_constraints_controller_test.rb create mode 100644 tutor/test/helpers/method_constraints_helper_test.rb diff --git a/tutor/app/assets/javascripts/method_constraints.js.coffee b/tutor/app/assets/javascripts/method_constraints.js.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/tutor/app/assets/javascripts/method_constraints.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/tutor/app/assets/stylesheets/method_constraints.css.scss b/tutor/app/assets/stylesheets/method_constraints.css.scss new file mode 100644 index 00000000..611417eb --- /dev/null +++ b/tutor/app/assets/stylesheets/method_constraints.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the methodConstraints controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/tutor/app/controllers/method_constraints_controller.rb b/tutor/app/controllers/method_constraints_controller.rb new file mode 100644 index 00000000..582ebb5a --- /dev/null +++ b/tutor/app/controllers/method_constraints_controller.rb @@ -0,0 +1,7 @@ +class MethodConstraintsController < ApplicationController + + def create + + end + +end diff --git a/tutor/app/helpers/method_constraints_helper.rb b/tutor/app/helpers/method_constraints_helper.rb new file mode 100644 index 00000000..1102b1dc --- /dev/null +++ b/tutor/app/helpers/method_constraints_helper.rb @@ -0,0 +1,2 @@ +module MethodConstraintsHelper +end diff --git a/tutor/test/controllers/method_constraints_controller_test.rb b/tutor/test/controllers/method_constraints_controller_test.rb new file mode 100644 index 00000000..28467947 --- /dev/null +++ b/tutor/test/controllers/method_constraints_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class MethodConstraintsControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/tutor/test/helpers/method_constraints_helper_test.rb b/tutor/test/helpers/method_constraints_helper_test.rb new file mode 100644 index 00000000..45964376 --- /dev/null +++ b/tutor/test/helpers/method_constraints_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class MethodConstraintsHelperTest < ActionView::TestCase +end From 7b8a309f28a1fa65f67b78d0d99a737322057692 Mon Sep 17 00:00:00 2001 From: ahmed93 Date: Sun, 20 Apr 2014 22:07:27 +0200 Subject: [PATCH 02/55] Issue #188 adding the right controllers --- ...ns.js.coffee => method_constrains.js.coffee} | 0 .../javascripts/variable_constrains.js.coffee | 3 +++ ...ains.css.scss => method_constrains.css.scss} | 2 +- .../stylesheets/variable_constrains.css.scss | 3 +++ tutor/app/controllers/constrains_controller.rb | 17 ----------------- .../controllers/method_constrains_controller.rb | 10 ++++++++++ .../variable_constrains_controller.rb | 6 ++++++ tutor/app/helpers/constrains_helper.rb | 2 -- tutor/app/helpers/method_constrains_helper.rb | 2 ++ tutor/app/helpers/variable_constrains_helper.rb | 2 ++ .../constrains/_create_method_constrains.rb | 1 - .../views/constrains/_create_method_params.rb | 1 - .../constrains/_create_variable_constrains.rb | 1 - ....rb => method_constrains_controller_test.rb} | 2 +- .../variable_constrains_controller_test.rb | 7 +++++++ tutor/test/helpers/constrains_helper_test.rb | 4 ---- .../helpers/method_constrains_helper_test.rb | 4 ++++ .../helpers/variable_constrains_helper_test.rb | 4 ++++ 18 files changed, 43 insertions(+), 28 deletions(-) rename tutor/app/assets/javascripts/{constrains.js.coffee => method_constrains.js.coffee} (100%) create mode 100644 tutor/app/assets/javascripts/variable_constrains.js.coffee rename tutor/app/assets/stylesheets/{constrains.css.scss => method_constrains.css.scss} (60%) create mode 100644 tutor/app/assets/stylesheets/variable_constrains.css.scss delete mode 100644 tutor/app/controllers/constrains_controller.rb create mode 100644 tutor/app/controllers/method_constrains_controller.rb create mode 100644 tutor/app/controllers/variable_constrains_controller.rb delete mode 100644 tutor/app/helpers/constrains_helper.rb create mode 100644 tutor/app/helpers/method_constrains_helper.rb create mode 100644 tutor/app/helpers/variable_constrains_helper.rb delete mode 100644 tutor/app/views/constrains/_create_method_constrains.rb delete mode 100644 tutor/app/views/constrains/_create_method_params.rb delete mode 100644 tutor/app/views/constrains/_create_variable_constrains.rb rename tutor/test/controllers/{constrains_controller_test.rb => method_constrains_controller_test.rb} (53%) create mode 100644 tutor/test/controllers/variable_constrains_controller_test.rb delete mode 100644 tutor/test/helpers/constrains_helper_test.rb create mode 100644 tutor/test/helpers/method_constrains_helper_test.rb create mode 100644 tutor/test/helpers/variable_constrains_helper_test.rb diff --git a/tutor/app/assets/javascripts/constrains.js.coffee b/tutor/app/assets/javascripts/method_constrains.js.coffee similarity index 100% rename from tutor/app/assets/javascripts/constrains.js.coffee rename to tutor/app/assets/javascripts/method_constrains.js.coffee diff --git a/tutor/app/assets/javascripts/variable_constrains.js.coffee b/tutor/app/assets/javascripts/variable_constrains.js.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/tutor/app/assets/javascripts/variable_constrains.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/tutor/app/assets/stylesheets/constrains.css.scss b/tutor/app/assets/stylesheets/method_constrains.css.scss similarity index 60% rename from tutor/app/assets/stylesheets/constrains.css.scss rename to tutor/app/assets/stylesheets/method_constrains.css.scss index 3be7e221..199c2d3b 100644 --- a/tutor/app/assets/stylesheets/constrains.css.scss +++ b/tutor/app/assets/stylesheets/method_constrains.css.scss @@ -1,3 +1,3 @@ -// Place all the styles related to the constrains controller here. +// Place all the styles related to the methodConstrains controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/tutor/app/assets/stylesheets/variable_constrains.css.scss b/tutor/app/assets/stylesheets/variable_constrains.css.scss new file mode 100644 index 00000000..8f921aad --- /dev/null +++ b/tutor/app/assets/stylesheets/variable_constrains.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the variableConstrains controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/tutor/app/controllers/constrains_controller.rb b/tutor/app/controllers/constrains_controller.rb deleted file mode 100644 index 0e71fade..00000000 --- a/tutor/app/controllers/constrains_controller.rb +++ /dev/null @@ -1,17 +0,0 @@ -class ConstrainsController < ApplicationController - - def create_method_constrains - - end - - def create_method_params - - end - - def create_method_params - - end - - - -end diff --git a/tutor/app/controllers/method_constrains_controller.rb b/tutor/app/controllers/method_constrains_controller.rb new file mode 100644 index 00000000..932b5107 --- /dev/null +++ b/tutor/app/controllers/method_constrains_controller.rb @@ -0,0 +1,10 @@ +class MethodConstrainsController < ApplicationController + + def create + @method = MethodConstrain.new() + end + + + + +end diff --git a/tutor/app/controllers/variable_constrains_controller.rb b/tutor/app/controllers/variable_constrains_controller.rb new file mode 100644 index 00000000..c077b135 --- /dev/null +++ b/tutor/app/controllers/variable_constrains_controller.rb @@ -0,0 +1,6 @@ +class VariableConstrainsController < ApplicationController + + def create + + end +end diff --git a/tutor/app/helpers/constrains_helper.rb b/tutor/app/helpers/constrains_helper.rb deleted file mode 100644 index da14d5dc..00000000 --- a/tutor/app/helpers/constrains_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module ConstrainsHelper -end diff --git a/tutor/app/helpers/method_constrains_helper.rb b/tutor/app/helpers/method_constrains_helper.rb new file mode 100644 index 00000000..f31d7a41 --- /dev/null +++ b/tutor/app/helpers/method_constrains_helper.rb @@ -0,0 +1,2 @@ +module MethodConstrainsHelper +end diff --git a/tutor/app/helpers/variable_constrains_helper.rb b/tutor/app/helpers/variable_constrains_helper.rb new file mode 100644 index 00000000..7fdf77fe --- /dev/null +++ b/tutor/app/helpers/variable_constrains_helper.rb @@ -0,0 +1,2 @@ +module VariableConstrainsHelper +end diff --git a/tutor/app/views/constrains/_create_method_constrains.rb b/tutor/app/views/constrains/_create_method_constrains.rb deleted file mode 100644 index fba9edb5..00000000 --- a/tutor/app/views/constrains/_create_method_constrains.rb +++ /dev/null @@ -1 +0,0 @@ -_create_method_constrains.rb \ No newline at end of file diff --git a/tutor/app/views/constrains/_create_method_params.rb b/tutor/app/views/constrains/_create_method_params.rb deleted file mode 100644 index 2654fd39..00000000 --- a/tutor/app/views/constrains/_create_method_params.rb +++ /dev/null @@ -1 +0,0 @@ -_create_method_params.rb \ No newline at end of file diff --git a/tutor/app/views/constrains/_create_variable_constrains.rb b/tutor/app/views/constrains/_create_variable_constrains.rb deleted file mode 100644 index 55c68389..00000000 --- a/tutor/app/views/constrains/_create_variable_constrains.rb +++ /dev/null @@ -1 +0,0 @@ -_create_variable_constrains.rb \ No newline at end of file diff --git a/tutor/test/controllers/constrains_controller_test.rb b/tutor/test/controllers/method_constrains_controller_test.rb similarity index 53% rename from tutor/test/controllers/constrains_controller_test.rb rename to tutor/test/controllers/method_constrains_controller_test.rb index ce77c2d0..34732c3f 100644 --- a/tutor/test/controllers/constrains_controller_test.rb +++ b/tutor/test/controllers/method_constrains_controller_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class ConstrainsControllerTest < ActionController::TestCase +class MethodConstrainsControllerTest < ActionController::TestCase # test "the truth" do # assert true # end diff --git a/tutor/test/controllers/variable_constrains_controller_test.rb b/tutor/test/controllers/variable_constrains_controller_test.rb new file mode 100644 index 00000000..61b3b5b1 --- /dev/null +++ b/tutor/test/controllers/variable_constrains_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class VariableConstrainsControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/tutor/test/helpers/constrains_helper_test.rb b/tutor/test/helpers/constrains_helper_test.rb deleted file mode 100644 index fefd1aee..00000000 --- a/tutor/test/helpers/constrains_helper_test.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'test_helper' - -class ConstrainsHelperTest < ActionView::TestCase -end diff --git a/tutor/test/helpers/method_constrains_helper_test.rb b/tutor/test/helpers/method_constrains_helper_test.rb new file mode 100644 index 00000000..a3a77235 --- /dev/null +++ b/tutor/test/helpers/method_constrains_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class MethodConstrainsHelperTest < ActionView::TestCase +end diff --git a/tutor/test/helpers/variable_constrains_helper_test.rb b/tutor/test/helpers/variable_constrains_helper_test.rb new file mode 100644 index 00000000..39f5ec76 --- /dev/null +++ b/tutor/test/helpers/variable_constrains_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class VariableConstrainsHelperTest < ActionView::TestCase +end From defa267a4e0efcca99188559fea22b90d4ac7510 Mon Sep 17 00:00:00 2001 From: ahmed93 Date: Sun, 20 Apr 2014 22:35:33 +0200 Subject: [PATCH 03/55] fixing controllars again --- ...trains.js.coffee => solutions_constrains.js.coffee} | 0 .../assets/javascripts/variable_constrains.js.coffee | 3 --- ...nstrains.css.scss => solutions_constrains.css.scss} | 2 +- .../assets/stylesheets/variable_constrains.css.scss | 3 --- tutor/app/controllers/method_constrains_controller.rb | 10 ---------- .../app/controllers/solutions_constrains_controller.rb | 2 ++ .../app/controllers/variable_constrains_controller.rb | 6 ------ tutor/app/helpers/method_constrains_helper.rb | 2 -- tutor/app/helpers/solutions_constrains_helper.rb | 2 ++ tutor/app/helpers/variable_constrains_helper.rb | 2 -- ...test.rb => solutions_constrains_controller_test.rb} | 2 +- .../controllers/variable_constrains_controller_test.rb | 7 ------- tutor/test/helpers/method_constrains_helper_test.rb | 4 ---- tutor/test/helpers/solutions_constrains_helper_test.rb | 4 ++++ tutor/test/helpers/variable_constrains_helper_test.rb | 4 ---- 15 files changed, 10 insertions(+), 43 deletions(-) rename tutor/app/assets/javascripts/{method_constrains.js.coffee => solutions_constrains.js.coffee} (100%) delete mode 100644 tutor/app/assets/javascripts/variable_constrains.js.coffee rename tutor/app/assets/stylesheets/{method_constrains.css.scss => solutions_constrains.css.scss} (60%) delete mode 100644 tutor/app/assets/stylesheets/variable_constrains.css.scss delete mode 100644 tutor/app/controllers/method_constrains_controller.rb create mode 100644 tutor/app/controllers/solutions_constrains_controller.rb delete mode 100644 tutor/app/controllers/variable_constrains_controller.rb delete mode 100644 tutor/app/helpers/method_constrains_helper.rb create mode 100644 tutor/app/helpers/solutions_constrains_helper.rb delete mode 100644 tutor/app/helpers/variable_constrains_helper.rb rename tutor/test/controllers/{method_constrains_controller_test.rb => solutions_constrains_controller_test.rb} (52%) delete mode 100644 tutor/test/controllers/variable_constrains_controller_test.rb delete mode 100644 tutor/test/helpers/method_constrains_helper_test.rb create mode 100644 tutor/test/helpers/solutions_constrains_helper_test.rb delete mode 100644 tutor/test/helpers/variable_constrains_helper_test.rb diff --git a/tutor/app/assets/javascripts/method_constrains.js.coffee b/tutor/app/assets/javascripts/solutions_constrains.js.coffee similarity index 100% rename from tutor/app/assets/javascripts/method_constrains.js.coffee rename to tutor/app/assets/javascripts/solutions_constrains.js.coffee diff --git a/tutor/app/assets/javascripts/variable_constrains.js.coffee b/tutor/app/assets/javascripts/variable_constrains.js.coffee deleted file mode 100644 index 24f83d18..00000000 --- a/tutor/app/assets/javascripts/variable_constrains.js.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/tutor/app/assets/stylesheets/method_constrains.css.scss b/tutor/app/assets/stylesheets/solutions_constrains.css.scss similarity index 60% rename from tutor/app/assets/stylesheets/method_constrains.css.scss rename to tutor/app/assets/stylesheets/solutions_constrains.css.scss index 199c2d3b..223576c8 100644 --- a/tutor/app/assets/stylesheets/method_constrains.css.scss +++ b/tutor/app/assets/stylesheets/solutions_constrains.css.scss @@ -1,3 +1,3 @@ -// Place all the styles related to the methodConstrains controller here. +// Place all the styles related to the solutionsConstrains controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/tutor/app/assets/stylesheets/variable_constrains.css.scss b/tutor/app/assets/stylesheets/variable_constrains.css.scss deleted file mode 100644 index 8f921aad..00000000 --- a/tutor/app/assets/stylesheets/variable_constrains.css.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the variableConstrains controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/tutor/app/controllers/method_constrains_controller.rb b/tutor/app/controllers/method_constrains_controller.rb deleted file mode 100644 index 932b5107..00000000 --- a/tutor/app/controllers/method_constrains_controller.rb +++ /dev/null @@ -1,10 +0,0 @@ -class MethodConstrainsController < ApplicationController - - def create - @method = MethodConstrain.new() - end - - - - -end diff --git a/tutor/app/controllers/solutions_constrains_controller.rb b/tutor/app/controllers/solutions_constrains_controller.rb new file mode 100644 index 00000000..f416e5b2 --- /dev/null +++ b/tutor/app/controllers/solutions_constrains_controller.rb @@ -0,0 +1,2 @@ +class SolutionsConstrainsController < ApplicationController +end diff --git a/tutor/app/controllers/variable_constrains_controller.rb b/tutor/app/controllers/variable_constrains_controller.rb deleted file mode 100644 index c077b135..00000000 --- a/tutor/app/controllers/variable_constrains_controller.rb +++ /dev/null @@ -1,6 +0,0 @@ -class VariableConstrainsController < ApplicationController - - def create - - end -end diff --git a/tutor/app/helpers/method_constrains_helper.rb b/tutor/app/helpers/method_constrains_helper.rb deleted file mode 100644 index f31d7a41..00000000 --- a/tutor/app/helpers/method_constrains_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module MethodConstrainsHelper -end diff --git a/tutor/app/helpers/solutions_constrains_helper.rb b/tutor/app/helpers/solutions_constrains_helper.rb new file mode 100644 index 00000000..136bdf29 --- /dev/null +++ b/tutor/app/helpers/solutions_constrains_helper.rb @@ -0,0 +1,2 @@ +module SolutionsConstrainsHelper +end diff --git a/tutor/app/helpers/variable_constrains_helper.rb b/tutor/app/helpers/variable_constrains_helper.rb deleted file mode 100644 index 7fdf77fe..00000000 --- a/tutor/app/helpers/variable_constrains_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module VariableConstrainsHelper -end diff --git a/tutor/test/controllers/method_constrains_controller_test.rb b/tutor/test/controllers/solutions_constrains_controller_test.rb similarity index 52% rename from tutor/test/controllers/method_constrains_controller_test.rb rename to tutor/test/controllers/solutions_constrains_controller_test.rb index 34732c3f..e90234ef 100644 --- a/tutor/test/controllers/method_constrains_controller_test.rb +++ b/tutor/test/controllers/solutions_constrains_controller_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class MethodConstrainsControllerTest < ActionController::TestCase +class SolutionsConstrainsControllerTest < ActionController::TestCase # test "the truth" do # assert true # end diff --git a/tutor/test/controllers/variable_constrains_controller_test.rb b/tutor/test/controllers/variable_constrains_controller_test.rb deleted file mode 100644 index 61b3b5b1..00000000 --- a/tutor/test/controllers/variable_constrains_controller_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class VariableConstrainsControllerTest < ActionController::TestCase - # test "the truth" do - # assert true - # end -end diff --git a/tutor/test/helpers/method_constrains_helper_test.rb b/tutor/test/helpers/method_constrains_helper_test.rb deleted file mode 100644 index a3a77235..00000000 --- a/tutor/test/helpers/method_constrains_helper_test.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'test_helper' - -class MethodConstrainsHelperTest < ActionView::TestCase -end diff --git a/tutor/test/helpers/solutions_constrains_helper_test.rb b/tutor/test/helpers/solutions_constrains_helper_test.rb new file mode 100644 index 00000000..9f468216 --- /dev/null +++ b/tutor/test/helpers/solutions_constrains_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class SolutionsConstrainsHelperTest < ActionView::TestCase +end diff --git a/tutor/test/helpers/variable_constrains_helper_test.rb b/tutor/test/helpers/variable_constrains_helper_test.rb deleted file mode 100644 index 39f5ec76..00000000 --- a/tutor/test/helpers/variable_constrains_helper_test.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'test_helper' - -class VariableConstrainsHelperTest < ActionView::TestCase -end From 76daeb5ec3a4ea3b3748a445d20404f6397cc1bc Mon Sep 17 00:00:00 2001 From: ahmed93 Date: Mon, 21 Apr 2014 10:51:13 +0200 Subject: [PATCH 04/55] configure controller --- tutor/app/controllers/solutions_constrains_controller.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tutor/app/controllers/solutions_constrains_controller.rb b/tutor/app/controllers/solutions_constrains_controller.rb index f416e5b2..d5355390 100644 --- a/tutor/app/controllers/solutions_constrains_controller.rb +++ b/tutor/app/controllers/solutions_constrains_controller.rb @@ -1,2 +1,11 @@ class SolutionsConstrainsController < ApplicationController + + def create + + end + + def new + + end + end From 93164c7ebce0bc34ab34a33c22a27637914287ff Mon Sep 17 00:00:00 2001 From: ahmed93 Date: Mon, 21 Apr 2014 13:45:05 +0200 Subject: [PATCH 05/55] Issue #188 Finally fixed Controllers + creating form started --- tutor/app/assets/images/add_buttom.png | Bin 0 -> 4009 bytes tutor/app/assets/images/add_button.png | Bin 0 -> 17815 bytes tutor/app/assets/images/delete_button.png | Bin 0 -> 14804 bytes ...coffee => solutions_constraints.js.coffee} | 0 ...ss.scss => solutions_constraints.css.scss} | 2 +- .../solutions_constrains_controller.rb | 11 --- .../solutions_constraints_controller.rb | 65 ++++++++++++++++++ .../helpers/solutions_constrains_helper.rb | 2 - .../helpers/solutions_constraints_helper.rb | 2 + .../solutions_constraints/_form.html.erb | 44 ++++++++++++ .../solutions_constraints/_show_data.html.erb | 0 .../solutions_constraints/delete.html.erb | 7 ++ .../views/solutions_constraints/edit.html.erb | 3 + .../solutions_constraints/index.html.erb | 10 +++ .../views/solutions_constraints/show.html.erb | 27 ++++++++ tutor/config/routes.rb | 1 + tutor/db/development.sqlite3 | Bin 200704 -> 196608 bytes ... solutions_constraints_controller_test.rb} | 2 +- .../solutions_constrains_helper_test.rb | 4 -- .../solutions_constraints_helper_test.rb | 4 ++ 20 files changed, 165 insertions(+), 19 deletions(-) create mode 100644 tutor/app/assets/images/add_buttom.png create mode 100644 tutor/app/assets/images/add_button.png create mode 100644 tutor/app/assets/images/delete_button.png rename tutor/app/assets/javascripts/{solutions_constrains.js.coffee => solutions_constraints.js.coffee} (100%) rename tutor/app/assets/stylesheets/{solutions_constrains.css.scss => solutions_constraints.css.scss} (59%) delete mode 100644 tutor/app/controllers/solutions_constrains_controller.rb create mode 100644 tutor/app/controllers/solutions_constraints_controller.rb delete mode 100644 tutor/app/helpers/solutions_constrains_helper.rb create mode 100644 tutor/app/helpers/solutions_constraints_helper.rb create mode 100644 tutor/app/views/solutions_constraints/_form.html.erb create mode 100644 tutor/app/views/solutions_constraints/_show_data.html.erb create mode 100644 tutor/app/views/solutions_constraints/delete.html.erb create mode 100644 tutor/app/views/solutions_constraints/edit.html.erb create mode 100644 tutor/app/views/solutions_constraints/index.html.erb create mode 100644 tutor/app/views/solutions_constraints/show.html.erb rename tutor/test/controllers/{solutions_constrains_controller_test.rb => solutions_constraints_controller_test.rb} (52%) delete mode 100644 tutor/test/helpers/solutions_constrains_helper_test.rb create mode 100644 tutor/test/helpers/solutions_constraints_helper_test.rb diff --git a/tutor/app/assets/images/add_buttom.png b/tutor/app/assets/images/add_buttom.png new file mode 100644 index 0000000000000000000000000000000000000000..699f98f2c746514eab402244a42ecd761e15151f GIT binary patch literal 4009 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 ZOP~LH1&qCdH*f_ASt%vST5;ph{{izxZt(yB literal 0 HcmV?d00001 diff --git a/tutor/app/assets/javascripts/solutions_constrains.js.coffee b/tutor/app/assets/javascripts/solutions_constraints.js.coffee similarity index 100% rename from tutor/app/assets/javascripts/solutions_constrains.js.coffee rename to tutor/app/assets/javascripts/solutions_constraints.js.coffee diff --git a/tutor/app/assets/stylesheets/solutions_constrains.css.scss b/tutor/app/assets/stylesheets/solutions_constraints.css.scss similarity index 59% rename from tutor/app/assets/stylesheets/solutions_constrains.css.scss rename to tutor/app/assets/stylesheets/solutions_constraints.css.scss index 223576c8..95649de1 100644 --- a/tutor/app/assets/stylesheets/solutions_constrains.css.scss +++ b/tutor/app/assets/stylesheets/solutions_constraints.css.scss @@ -1,3 +1,3 @@ -// Place all the styles related to the solutionsConstrains controller here. +// Place all the styles related to the solutionsConstraints controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/tutor/app/controllers/solutions_constrains_controller.rb b/tutor/app/controllers/solutions_constrains_controller.rb deleted file mode 100644 index d5355390..00000000 --- a/tutor/app/controllers/solutions_constrains_controller.rb +++ /dev/null @@ -1,11 +0,0 @@ -class SolutionsConstrainsController < ApplicationController - - def create - - end - - def new - - end - -end diff --git a/tutor/app/controllers/solutions_constraints_controller.rb b/tutor/app/controllers/solutions_constraints_controller.rb new file mode 100644 index 00000000..53ab7261 --- /dev/null +++ b/tutor/app/controllers/solutions_constraints_controller.rb @@ -0,0 +1,65 @@ +class SolutionsConstraintsController < ApplicationController + def index + @parameters = MethodParameter.all + @variables = VariableConstraint.all + #@methods = MethodConstraints.all + end + + def create + + end + + def show_params + @data = MethodParameter.all + render "show_data" + end + + def show_variables + @data = VariableConstraint.all + render "show_data" + end + + def show + @parameters = MethodParameter.find_by_id(params[:id]) + @variables = VariableConstraint.find_by_id(params[:id]) + #@methods = MethodConstraints.find_by_id(params[:id]) + if @parameters.nil? + redirect_to :action => 'index' + end + end + + def edit + if lecturer_signed_in? || teaching_assistant_signed_in? + @parameters = MethodParameter.find_by_id(params[:id]) + @variables = VariableConstraint.find_by_id(params[:id]) + #@methods = MethodConstraints.find_by_id(params[:id]) + end + end + + def update + @parameters = MethodParameter.find_by_id(params[:id]) + @variables = VariableConstraint.find_by_id(params[:id]) + if @parameters.update_attributes(constraint_params) && @variables.update_attributes(constraint_params) + redirect_to :action => 'show' + else + redirect_to :action => 'index' + end + end + + def delete + @parameters = MethodParameter.find_by_id(params[:id]) + @variables = VariableConstraint.find_by_id(params[:id]) + end + + def destroy + @parameters = MethodParameter.find_by_id(params[:id]).destroy + @variables = VariableConstraint.find_by_id(params[:id]).destroy + flash[:success_deletion] = "Constraints deleted." + end + + private + def constraint_params + params.require(:parameter).permit(:parameters, :variables) + end + +end diff --git a/tutor/app/helpers/solutions_constrains_helper.rb b/tutor/app/helpers/solutions_constrains_helper.rb deleted file mode 100644 index 136bdf29..00000000 --- a/tutor/app/helpers/solutions_constrains_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module SolutionsConstrainsHelper -end diff --git a/tutor/app/helpers/solutions_constraints_helper.rb b/tutor/app/helpers/solutions_constraints_helper.rb new file mode 100644 index 00000000..e620299b --- /dev/null +++ b/tutor/app/helpers/solutions_constraints_helper.rb @@ -0,0 +1,2 @@ +module SolutionsConstraintsHelper +end diff --git a/tutor/app/views/solutions_constraints/_form.html.erb b/tutor/app/views/solutions_constraints/_form.html.erb new file mode 100644 index 00000000..ee9d0fe9 --- /dev/null +++ b/tutor/app/views/solutions_constraints/_form.html.erb @@ -0,0 +1,44 @@ +<%= form_for :constrain do |f| %> + + + + + + + +
+ + + + <%= form_for :patient do |u| %> + + + + + + + + <% end %> + + + + <%= form_for :patient do |u| %> + + + + + + + + <% end %> + +
Method Constrains<%= f.text_field :parameter, placeholder: "Return Type"%><%= f.text_field :parameter, placeholder: "Method Name" %>
Method Parameter<%= u.text_field :parameter, placeholder: "Variable Type" %><%= u.text_field :parameter, placeholder: "Variable Name" %><%= image_submit_tag "add_buttom.png", id:"params", style: "width:15%;height:15%;margin_top:10px;"%>
Variable Constraints<%= u.text_field :variable_name, placeholder: "Variable Type" %><%= u.text_field :variable_name, placeholder: "Variable Name" %><%= image_submit_tag "add_buttom.png", id:"variables", style: "width:15%;height:15%;margin_top:10px;"%>
+
+ <% render action: "show_params"%> +
+
+ <% render action: "show_variables"%> +
+
+ <%= f.submit "Save Changes", class: "btn btn-success"%> +<% end %> \ No newline at end of file diff --git a/tutor/app/views/solutions_constraints/_show_data.html.erb b/tutor/app/views/solutions_constraints/_show_data.html.erb new file mode 100644 index 00000000..e69de29b diff --git a/tutor/app/views/solutions_constraints/delete.html.erb b/tutor/app/views/solutions_constraints/delete.html.erb new file mode 100644 index 00000000..ea29441b --- /dev/null +++ b/tutor/app/views/solutions_constraints/delete.html.erb @@ -0,0 +1,7 @@ + +

Delete Constraints

+ <%= form_for :parameter, url: solutions_constraints_delete_path do |delete| %> +

Are you sure you want to delete this constraint

+ <%= @parameters.parameter %> + <%= delete.submit %> + <% end %> \ No newline at end of file diff --git a/tutor/app/views/solutions_constraints/edit.html.erb b/tutor/app/views/solutions_constraints/edit.html.erb new file mode 100644 index 00000000..cc1a9a5e --- /dev/null +++ b/tutor/app/views/solutions_constraints/edit.html.erb @@ -0,0 +1,3 @@ +<%= link_to "<< Back to list", :controller => 'solutions_constraints', :action => 'index' %> +

Edit Constraints

+<%= render "form" %> \ No newline at end of file diff --git a/tutor/app/views/solutions_constraints/index.html.erb b/tutor/app/views/solutions_constraints/index.html.erb new file mode 100644 index 00000000..617589f8 --- /dev/null +++ b/tutor/app/views/solutions_constraints/index.html.erb @@ -0,0 +1,10 @@ +

Solutions' Constraints

+ + + <% @parameters.each do |params| %> + + + <% end %> + + +
<%= link_to params.parameter, :controller => 'solutions_constraints', :action => 'show', :id => params.id %>
\ No newline at end of file diff --git a/tutor/app/views/solutions_constraints/show.html.erb b/tutor/app/views/solutions_constraints/show.html.erb new file mode 100644 index 00000000..ff0fbc2e --- /dev/null +++ b/tutor/app/views/solutions_constraints/show.html.erb @@ -0,0 +1,27 @@ + <%= link_to "<< Back to list", :controller => 'solutions_constraints', :action => 'index' %> + + + + + + + + + + + + + +
Constraints
<%= @parameters.parameter %>
<%= @variables.variable_name %>
+ <%= link_to "Edit", :controller => 'solutions_constraints', :action => 'edit' %> + +
+ + + + + + + + + \ No newline at end of file diff --git a/tutor/config/routes.rb b/tutor/config/routes.rb index e9d7079c..480589ae 100644 --- a/tutor/config/routes.rb +++ b/tutor/config/routes.rb @@ -29,6 +29,7 @@ resources :solutions resources :problems resources :topics + resources :solutions_constraints # Example resource route with options: # resources :products do diff --git a/tutor/db/development.sqlite3 b/tutor/db/development.sqlite3 index b42221be85b6afcfba8479cf19d57ea13ba01df1..d19c0b1d72718ca09796e9cf12d0309b4ca00b82 100644 GIT binary patch literal 196608 zcmeI5e{36Pn%`$gNfae*XjyR-%aSZhiS1mLp~#Um zHh;*Rp=DjRy`}9G#T~9)918TV1@3zNwMBa^+G~qDYq0j&&)gTT)s4KSh}=ct5*t^ zq;OG==egGa|uMe)btk4C>c z@*l$s!?!})LvIZ(4J-#o0|VUmxc}Zy$%B#)+<8(A#f~56?**;GT3NU1h2jmUE~f+S%$YuUOX$mR`yiNO6h2Sw=;t0vlWQ53e|WXFv$W zPM+lNzT;pqYvqPz)T(CZi|B>Zkspdru~s5;E&aAd_LTMNhPB!4r)d?ehS@E#P4E6~ zT8)xkwR|kL>NTp;icfkV4Cf-D*!Vbq?_CE&OQG5R6uc1H;zKd$(?)c&SU0w8_8mY* zwOFfcQClShYqeTgFI4wvH$*C5HY$dQ~u5XnM-E4h~c|C1O59MF6MxBV=YqWMGqq5P{=WNwX|6cMC>;2A4BcWI< z#@|!i-G>S{Z41m%uh)+3P(HKw8kXmNI(_PZOuI(($3CmIU9PFP;|NnyGuC0k@W6x$T@_3Sakeq9jVOr=djne zw)o+AM+c~NqfC8SrLfVMIv z(JPcQes?SwiYW^J;ZHj{Exl0Oq~@P5&@hQwYt^D1q(?O1(LKS~;w0-@Mzr}^e-gZlp4R2Wrm-YjnFl|sH^ki~8^ z+f(LRJ&1oK0jjRn0_Cwj@e2Eo;eSG828aOQIwaayB~NC6QHCQ=(t! zNK&$v(9~@7M3+QW)0!H6rX$hhES0H6k9SEj2{|E0k9A4XN;)Y=V;zZ-R1`8c`t+_u zmQ_W`M4#%GC@He%Nv}jrMUQ$VN-Fw+0Tarl2sc66>p|%j^JrY$;jZo{9BEN3O|KAk

G|za;({@yntizAes( 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 Date: Mon, 21 Apr 2014 20:20:18 +0200 Subject: [PATCH 06/55] Issue #188 adding some javascript without any ajax --- ...nts.js.coffee => solutions_constraints.js} | 0 .../solutions_constraints_controller.rb | 13 +-- .../solutions_constraints/_form.html.erb | 100 ++++++++++++++++-- .../views/solutions_constraints/create.js.erb | 1 + .../solutions_constraints/index.html.erb | 4 +- .../views/solutions_constraints/new.html.erb | 3 + tutor/config/routes.rb | 9 +- tutor/db/development.sqlite3 | Bin 196608 -> 196608 bytes tutor/db/schema.rb | 2 + tutor/db/seeds.rb | 6 +- 10 files changed, 116 insertions(+), 22 deletions(-) rename tutor/app/assets/javascripts/{solutions_constraints.js.coffee => solutions_constraints.js} (100%) create mode 100644 tutor/app/views/solutions_constraints/create.js.erb create mode 100644 tutor/app/views/solutions_constraints/new.html.erb diff --git a/tutor/app/assets/javascripts/solutions_constraints.js.coffee b/tutor/app/assets/javascripts/solutions_constraints.js similarity index 100% rename from tutor/app/assets/javascripts/solutions_constraints.js.coffee rename to tutor/app/assets/javascripts/solutions_constraints.js diff --git a/tutor/app/controllers/solutions_constraints_controller.rb b/tutor/app/controllers/solutions_constraints_controller.rb index 53ab7261..d15ec3d7 100644 --- a/tutor/app/controllers/solutions_constraints_controller.rb +++ b/tutor/app/controllers/solutions_constraints_controller.rb @@ -6,17 +6,12 @@ def index end def create - + redirect_to action: "index" end - def show_params - @data = MethodParameter.all - render "show_data" - end - - def show_variables - @data = VariableConstraint.all - render "show_data" + def new + @constrain = MethodConstraint.new() + @params = MethodParameter.new() end def show diff --git a/tutor/app/views/solutions_constraints/_form.html.erb b/tutor/app/views/solutions_constraints/_form.html.erb index ee9d0fe9..2270cfa3 100644 --- a/tutor/app/views/solutions_constraints/_form.html.erb +++ b/tutor/app/views/solutions_constraints/_form.html.erb @@ -1,4 +1,85 @@ -<%= form_for :constrain do |f| %> + + +<%= form_for :@constrain do |f| %> @@ -10,14 +91,14 @@ - <%= form_for :patient do |u| %> + <%= form_for :@params do |u| %> - + - + - + <% end %> @@ -34,11 +115,14 @@
Method Constrains
Method Parameter <%= u.text_field :parameter, placeholder: "Variable Type" %><%= u.text_field :parameaaater, placeholder: "Variable Type", id:"params_type" %> <%= u.text_field :parameter, placeholder: "Variable Name" %><%= u.text_field :asd, placeholder: "Variable Name", id:"params_name" %> <%= image_submit_tag "add_buttom.png", id:"params", style: "width:15%;height:15%;margin_top:10px;"%><%= image_tag "add_buttom.png", id:"params", style: "width:15%;height:15%;margin_top:10px;cursor:pointer", onclick: "add_params(this);"%>
- <% render action: "show_params"%> +

Paramter

+ No paramter +
- <% render action: "show_variables"%> +

- <%= f.submit "Save Changes", class: "btn btn-success"%> + <%= f.submit "Save Changes", class: "btn btn-default"%> + <% end %> \ No newline at end of file diff --git a/tutor/app/views/solutions_constraints/create.js.erb b/tutor/app/views/solutions_constraints/create.js.erb new file mode 100644 index 00000000..df2ca465 --- /dev/null +++ b/tutor/app/views/solutions_constraints/create.js.erb @@ -0,0 +1 @@ +$('body').append('<%= @comment.text %>'); \ No newline at end of file diff --git a/tutor/app/views/solutions_constraints/index.html.erb b/tutor/app/views/solutions_constraints/index.html.erb index 617589f8..f8e2cd77 100644 --- a/tutor/app/views/solutions_constraints/index.html.erb +++ b/tutor/app/views/solutions_constraints/index.html.erb @@ -7,4 +7,6 @@ <% end %> - \ No newline at end of file + + + <%= link_to "Create new Constraint", solutions_constraints_path %> \ No newline at end of file diff --git a/tutor/app/views/solutions_constraints/new.html.erb b/tutor/app/views/solutions_constraints/new.html.erb new file mode 100644 index 00000000..b4dd62db --- /dev/null +++ b/tutor/app/views/solutions_constraints/new.html.erb @@ -0,0 +1,3 @@ +

New mooo

+ +<%= render 'form' %> \ No newline at end of file diff --git a/tutor/config/routes.rb b/tutor/config/routes.rb index 480589ae..f4005e4d 100644 --- a/tutor/config/routes.rb +++ b/tutor/config/routes.rb @@ -29,7 +29,7 @@ resources :solutions resources :problems resources :topics - resources :solutions_constraints + # Example resource route with options: # resources :products do @@ -55,6 +55,13 @@ resources :model_answers do post "model_answers/new" end + resources :solutions_constraints do + collection do + post "new" + end + end + + # Example resource route with sub-resources: # resources :products do # resources :comments, :sales diff --git a/tutor/db/development.sqlite3 b/tutor/db/development.sqlite3 index d19c0b1d72718ca09796e9cf12d0309b4ca00b82..16f9168c6518c0aa49ad1fcc1826ba2aa4fd9b2e 100644 GIT binary patch delta 4675 zcmbVQZERat8NSDMlBP}K?xTbuN+Q%%ZK__MbI*4-v^ZYtv}qG3aheZMz8W`QPMpMc zl0}2KQYH9<*tk+ILWnX1;tyL_M@lB7vHn0H_yN--v_H_X-w4KpplDJX&UHrawS6KG zk@LsTbKmoRJn#FS>q4QSP-uAblW=XbVHi&yEgpYlZX$63vI`WNRB~bw3nFqJlJgd7 ztwh>$6XuP~!YOOw6oRL6OPvWiNUkT7Oy*+qD+3#o@tM@%bYEgaOs-x{<)-^PRx=~! z#Ly)ep=dFhj7DO&o&ujWo>GUG{-V*7x9pc+XkPG6!U!Uy^`V5Iav$bm@puPJr}?#> zd_1{4czwBRIG)N5MAKcDr!!dO2J%DKX3)g)4cI@hK0kls#(Kmow%2{(?7@i^g&b?5 zW+ovR3u4336Eka_BmLczaAWw&)tfh2)*R`bnIGwyyS6;k6Hj)p%c0nGv@>hvv)#G$ zCH`XnTy%2Dtd7F9iMU{gBKGT}?QI9HVT3T$kfHf0Vx!Tg>0C5BJQM96q4~MBx%qf( zHkXWKQ(|r;zZglUiA*QD7p|w##lelvz7caMhE_MGV)pph`Tw2+Xzpjn%>n(ta!?#^ z37D{`hvX~UZsVjpUJv~>4*19YnH&=3t$(voX*Ui-O`dWInV|A%BwQ+gz z67OBQYGU(NEBKsoQi(mR{_VNVQ=Si42qL-8hkXQTd`Nb!!r6@&pXj=R%&Dox$(P_l z%v>4TSi9KG2lI(ozGG-0-?6$ron2fS=}z#n+YLw1ypQ{2`uc_%Gs1bS)C5WMwBvH{6W6S zXPZDwG|6*4;erVJ`){1|Qq2ex6j$3;QYs-Y29K%KxHHj+MiZHA?hr0jhw81kh?Eec>(-d)g-$S=27v9rQ=xephW#ML{4%sQBjBe4=GkouX|BDI~RMtft<0 zW^M-bZhgXjEgA|TYs770Wlv7Hav{cOvU8o!loRR%1IfBJ>5 zvDG(JYT8e+k-LxWzx);Z5-2FqvmvsGv^ziYEfjGm8L6QGk^SS3ET7v##jRBdlngRl z{M%c8w<+aVpAu;aj_nU0x12s`48f$pnjlpvnY2&uwffvRgsKDu1)<2!l(Pw=T0vQm zGK<@9?X~!_#~|mLDdE~y>v4N;@7s-@C!9)3v;H8OHOw~JO>c*9HvX#VyWuYbX)GACufE!{`}J1P5U>+9pV)n&$J@t(aj+YC7DR&e zktgb!BN1@B(V0F2wrZCqRwfp*&b_C>XPm@2uvX8WtZPOH+-`QhdKP@IA(flSOpUFi za`}}-=Y@0N8@u0X1HTPzK~Q@nWQ2bj9twxHpD6sZX|pd_Zy@)cAB|osJ(X}xr*f&4 zY%88!%vGmCX&(|yHHG^R(ib?~rd4j!Tm1rBoatMwg!F;KjiPd+UNxoU`g=JqA&tgv zpdCb7Jdvq;klPPc^;e;lkluiEcMN>qSs(L@Oduw8BglQqMV!~iK%1vYfe6vB+kIqb z9DL{-S*rD=(9e8?)J@DengM4$>s*a$q#5I?T}z1bl?pmit3Veq7cSzwQBFV987L&; za%Tyg2z&YDP^}KV^%CMX?WWtboBn*NqA6=ypGt^xXA=lt#1J#xno|*%kevbuy<2+% zgpA;db0iV?Vr}5PKn)1ly~p3%{Yh^i6L3Z&;D@^>l7ZXjrVrF3q}qns!MKk+59$n1 zUmuMIbe;-z{eqftr8H4Ob_#*_U-n{N}c-^boX^Y>kK0Zi>=3Hu3J)VaXnjI9E8(eL04}C znj$D)sJih`r%*x1MEA3VOIMnL&ix8HV*2fXD8@u=?UlO@A=k)K87J!Qi=FmzIufd} jw2=}^y~{a;3c9*a>DM+^X~)j}3OZ7+*IMfssVe;&FxWn2 delta 4570 zcmbVPYfM|$9lyus5yImpO&ii`8K}#mlq%+&d)~BDF-}5&1Ptcgl}Ess7>p^HIi9NF zD4#d2yAoHLrlnOkbzj<~MuKXuM%uJ#`?7qiCT;2ZZR)hO(=+1bqcx)tLM*(R$#vF#@wtN&p@pCVxy@iY5Uhw@xVrcu8{7;QfwiV zVME=E8%x&pkx18-**57Nb;a8Mqx+ow*_ z|0@K!nHIBn43-E|r1Qr`?CvBf<^>CBVSP2ai2Z{k_Oclvdeb703%exNTfFcmoKDZfnG5pGrftv)Ff-a z5E>25T7#=}Vv=;d%gEo+)ZTsuUR41*3o4E1Xm+l|@Zn)_k1 z0ul>KG(p}+a^HUXfQe(u>)PA#sO*xhtB{(33 zI+f+#*l6Mqnr;DLh9tx~2jskMQU#~*btp1E(Fq~XZX?#@vSWt3} zKl_OKdde`a1J_DVs@3ke!_9*hBS=Cf?ChN}uNV3M>Aet2a_;UoJVi?|WKs>J!{eD# z!7LoAt}~u4_%IY*UC!vGVo8N2aLNf6300LEA@-x6*B3jOUSq~w^2-2D$5i_v5VQ~l7AOi*a={qe=35T$`rZRiV# zJ^$c;Vk;d|Li;xlf*#w5G3Ab?v?NDJU>kq*f|rd{q_k{C8Ns&mQKyFu8PsnTYS|#f z%Khn=p2lXBBYj8&#|&fpuYbdy08+u_q2h28F9<~T>{eHN7~;7P3En+;aAyF&LrP(vE(G*k|`zJu)g%WqxvFJ6X!c zglG+`C<(=Wf3L+8J)){zpGU6BczbW}JB>vp6jPkvhYpV)!7!!V`Eer`^W3oNy<2>P<$@3(+NZa1v0CkZ;pL1s#e8IUfT~Y%=s*6GUm5Vsax^J|r%(GXp;MOcd2T zyh4RBsdgOaXc9cjO0O(Nb3X1=F3OX8_MQA0|X1s8E{Zvx@*SZ!k!a_k~ISx|Mq>Phgn;T#S7o~`z8 z_) z@59%M;?>wC>J6vyRjp@4%B@GfW-nW%MB8VQFtrsrouzcBZbkhqK-8?GPPUBBp+1mO zJ;jCP+$*C~HAc14F=7yJJuZeIfVQP1 Date: Tue, 22 Apr 2014 11:52:43 +0200 Subject: [PATCH 07/55] Issue #188 adding some ajax to send arrays to controller --- .../javascripts/solutions_constraints.js | 173 +++++++++++++++++- .../solutions_constraints_controller.rb | 28 ++- .../_edit_method.html.erb | 47 +++++ .../_edit_variable.html.erb | 19 ++ .../solutions_constraints/_form.html.erb | 114 ++---------- .../views/solutions_constraints/create.js.erb | 1 - .../views/solutions_constraints/edit.html.erb | 2 +- .../views/solutions_constraints/new.html.erb | 2 +- 8 files changed, 274 insertions(+), 112 deletions(-) create mode 100644 tutor/app/views/solutions_constraints/_edit_method.html.erb create mode 100644 tutor/app/views/solutions_constraints/_edit_variable.html.erb delete mode 100644 tutor/app/views/solutions_constraints/create.js.erb diff --git a/tutor/app/assets/javascripts/solutions_constraints.js b/tutor/app/assets/javascripts/solutions_constraints.js index 24f83d18..838fddd8 100644 --- a/tutor/app/assets/javascripts/solutions_constraints.js +++ b/tutor/app/assets/javascripts/solutions_constraints.js @@ -1,3 +1,170 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ +// # Place all the behaviors and hooks related to the matching controller here. +// # All this logic will automatically be available in application.js. +// # You can use CoffeeScript in this file: http://coffeescript.org/ + +var type = new Array(); +var param_name = new Array(); + +function add_params(field) +{ + var tmp_type = document.getElementById("params_type").value; + var tmp_name = document.getElementById("params_name").value; + + if (tmp_name != "" && tmp_type != "") { + document.getElementById("params_type").style.border= ""; + document.getElementById("params_name").style.border= ""; + type[type.length] = tmp_type; + document.getElementById("params_type").value = ""; + param_name[param_name.length] = tmp_name; + document.getElementById("params_name").value = ""; + + document.getElementById("parameter").innerHTML = "

Paramters Constraints

"; + for (var i = 0; i < type.length; i++) { + $('#parameter').append(""); + $('#parameter').append(""); + $('#parameter').append(""); + $('#parameter').append(""); + $('#parameter').append(""); + $('#parameter').append(""); + $('#parameter').append(""); + $('#parameter').append(""); + } + $('#parameter').append("
\"delete
"); + }else { + if (tmp_name == "" && tmp_type == ""){ + document.getElementById("params_type").style.border= "red 1px solid"; + document.getElementById("params_name").style.border= "red 1px solid"; + }else if(tmp_name == ""){ + document.getElementById("params_type").style.border= ""; + document.getElementById("params_name").style.border= "red 1px solid"; + }else{ + document.getElementById("params_type").style.border= "red 1px solid"; + document.getElementById("params_name").style.border= ""; + } + } +} +function remove_params(field) +{ + var index = field.id.split("_")[1]; + type.splice(index,1); + param_name.splice(index,1); + document.getElementById("parameter").innerHTML = "

Paramters Constraints

"; + if(type.length == 0) + { + $('#parameter').append("No paramter"); + } + for (var i = 0; i < type.length; i++) { + $('#parameter').append(""); + $('#parameter').append(""); + $('#parameter').append(""); + $('#parameter').append(""); + $('#parameter').append(""); + $('#parameter').append(""); + $('#parameter').append(""); + $('#parameter').append(""); + } + $('#parameter').append("
\"delete
"); +} + +var var_type = new Array(); +var var_name = new Array(); + +function add_variable(field) +{ + var tmp_type = document.getElementById("variable_type").value; + var tmp_name = document.getElementById("variable_name").value; + + if (tmp_name != "" && tmp_type != "") { + document.getElementById("variable_type").style.border= ""; + document.getElementById("variable_name").style.border= ""; + var_type[var_type.length] = tmp_type; + document.getElementById("variable_type").value = ""; + var_name[var_name.length] = tmp_name; + document.getElementById("variable_name").value = ""; + + document.getElementById("variable").innerHTML = "

Variables Constraints

"; + for (var i = 0; i < var_type.length; i++) { + $('#variable').append(""); + $('#variable').append(""); + $('#variable').append(""); + $('#variable').append(""); + $('#variable').append(""); + $('#variable').append(""); + $('#variable').append(""); + $('#variable').append(""); + } + $('#variable').append("
\"delete
"); + }else { + if (tmp_name == "" && tmp_type == ""){ + document.getElementById("variable_type").style.border= "red 1px solid"; + document.getElementById("variable_name").style.border= "red 1px solid"; + }else if(tmp_name == ""){ + document.getElementById("variable_type").style.border= ""; + document.getElementById("variable_name").style.border= "red 1px solid"; + }else{ + document.getElementById("variable_type").style.border= "red 1px solid"; + document.getElementById("variable_name").style.border= ""; + } + } +} +function remove_variable(field) +{ + var index = field.id.split("_")[1]; + var_type.splice(index,1); + var_name.splice(index,1); + document.getElementById("variable").innerHTML = "

Variables Constraints

"; + if(var_type.length == 0) + { + $('#variable').append("No Variables"); + } + for (var i = 0; i < var_type.length; i++) { + $('#variable').append(""); + $('#variable').append(""); + $('#variable').append(""); + $('#variable').append(""); + $('#variable').append(""); + $('#variable').append(""); + $('#variable').append(""); + $('#variable').append(""); + } + $('#variable').append("
\"delete
"); +} + +function submitParams() +{ hash = {} + for (var i = 0; i < type.length; i++) { + hash += {params_name[i]:type[i]} + }; + method = $('#_constrain_method_return').val() + name = $('#_constrain_method_name').val() + $.ajax({ + type: "POST", + url: "/solutions_constraints", + data:{ p_type: JSON.stringify(type), + p_hash: JSON.stringify(hash), + p_name: JSON.stringify(param_name), + v_type: JSON.stringify(var_type), + v_name: JSON.stringify(var_name), + method_return: JSON.stringify(method), + method_name: JSON.stringify(name), + }, + datatype: "JSON", + success: function(){}, + error: function(){alert("failed");}, + }); +} + + +// function sendparams(){ +// alert("doog"); +// $.ajax({ +// data: { depart: type.toString(), return_date: param_name}, +// type: 'post', +// url: "/payment/create", +// }); +// } +// $('#account_settings').on('ajax:error', function(event, xhr, status) { +// // insert the failure message inside the "#account_settings" element +// $(this).append(xhr.responseText) +// $ajax:beforeSend() +// }); \ No newline at end of file diff --git a/tutor/app/controllers/solutions_constraints_controller.rb b/tutor/app/controllers/solutions_constraints_controller.rb index d15ec3d7..f3800fc9 100644 --- a/tutor/app/controllers/solutions_constraints_controller.rb +++ b/tutor/app/controllers/solutions_constraints_controller.rb @@ -6,12 +6,29 @@ def index end def create - redirect_to action: "index" + param_type = params[:p_type] + param_name = params[:p_name] + var_type = params[:v_type] + var_name = params[:v_type] + method_return = params[:method_return] + method_name = params[:method_name] + + myhash = {} + param_name.each_with_index do |k,i| + myhash[k] = param_type[i] + end + + myhash.each do |key, value| + puts(key + value) + end + + end def new - @constrain = MethodConstraint.new() - @params = MethodParameter.new() + @constrain = MethodConstraint.new + @params = MethodParameter.new + @variables = VariableConstraint.new end def show @@ -52,9 +69,4 @@ def destroy flash[:success_deletion] = "Constraints deleted." end - private - def constraint_params - params.require(:parameter).permit(:parameters, :variables) - end - end diff --git a/tutor/app/views/solutions_constraints/_edit_method.html.erb b/tutor/app/views/solutions_constraints/_edit_method.html.erb new file mode 100644 index 00000000..0351b8cb --- /dev/null +++ b/tutor/app/views/solutions_constraints/_edit_method.html.erb @@ -0,0 +1,47 @@ + + +<%= form_for :@constrain do |f| %> + + + + + + + +
+ + + + <%= fields_for :@params do |u| %> + + + + + + + + <% end %> + +
Method Constrains<%= f.text_field :method_return, placeholder: "Return Type"%><%= f.text_field :method_name, placeholder: "Method Name" %>
Method Parameter<%= u.text_field :params_type, placeholder: "Variable Type", id:"params_type" %><%= u.text_field :parameter, placeholder: "Variable Name", id:"params_name" %><%= image_tag "add_buttom.png", id:"params", style: "width:15%;height:15%;margin_top:10px;cursor:pointer", onclick: "add_params(this);"%>
+
+

Paramter

+ No paramters +
+
+ <%= f.submit "Save Changes", class: "btn btn-default", onclick:"submitParams();"%> + +<% end %> \ No newline at end of file diff --git a/tutor/app/views/solutions_constraints/_edit_variable.html.erb b/tutor/app/views/solutions_constraints/_edit_variable.html.erb new file mode 100644 index 00000000..47464e84 --- /dev/null +++ b/tutor/app/views/solutions_constraints/_edit_variable.html.erb @@ -0,0 +1,19 @@ +<%= form_for :@constrain do |f| %> + + + + + + + + + + +
Variable Constraints<%= u.text_field :variable_name, placeholder: "Variable Type" %><%= u.text_field :variable_name, placeholder: "Variable Name" %><%= image_tag "add_buttom.png", id:"params", style: "width:15%;height:15%;margin_top:10px;cursor:pointer", onclick: "add_params(this);"%>
+
+

Variables

+ No Variables +
+
+ <%= f.submit "Save Changes", class: "btn btn-default"%> +<% end %> \ No newline at end of file diff --git a/tutor/app/views/solutions_constraints/_form.html.erb b/tutor/app/views/solutions_constraints/_form.html.erb index 2270cfa3..ea049415 100644 --- a/tutor/app/views/solutions_constraints/_form.html.erb +++ b/tutor/app/views/solutions_constraints/_form.html.erb @@ -1,128 +1,46 @@ - - -<%= form_for :@constrain do |f| %> +<%= form_for :@constrain, url:{action:"create"} do |f| %> - + - +
- <%= form_for :@params do |u| %> + <%= fields_for :@params do |u| %> - + - + - + <% end %> - <%= form_for :patient do |u| %> + <%= fields_for :@variables do |u| %> - + - + - + <% end %>
Method Constrains <%= f.text_field :parameter, placeholder: "Return Type"%><%= f.text_field :method_return, placeholder: "Return Type"%> <%= f.text_field :parameter, placeholder: "Method Name" %><%= f.text_field :method_name, placeholder: "Method Name" %>
Method Parameter <%= u.text_field :parameaaater, placeholder: "Variable Type", id:"params_type" %><%= u.text_field :params_type, placeholder: "Variable Type", id:"params_type" %> <%= u.text_field :asd, placeholder: "Variable Name", id:"params_name" %><%= u.text_field :parameter, placeholder: "Variable Name", id:"params_name" %> <%= image_tag "add_buttom.png", id:"params", style: "width:15%;height:15%;margin_top:10px;cursor:pointer", onclick: "add_params(this);"%><%= image_tag "add_buttom.png", style: "width:15%;height:15%;margin_top:10px;cursor:pointer", onclick: "add_params(this);"%>
Variable Constraints <%= u.text_field :variable_name, placeholder: "Variable Type" %><%= u.text_field :variable_type, placeholder: "Variable Type", id:"variable_type" %> <%= u.text_field :variable_name, placeholder: "Variable Name" %><%= u.text_field :variable_name, placeholder: "Variable Name", id:"variable_name" %> <%= image_submit_tag "add_buttom.png", id:"variables", style: "width:15%;height:15%;margin_top:10px;"%><%= image_tag "add_buttom.png", style: "width:15%;height:15%;margin_top:10px;cursor:pointer", onclick: "add_variable(this);"%>
-

Paramter

- No paramter - +

Paramters Constraints

+ No paramters
- +

Variables Constraints

+ No variables

- <%= f.submit "Save Changes", class: "btn btn-default"%> - + <%= button_tag "Save Changes", type: "button", class: "btn btn-large btn-success", onclick:"submitParams();"%> <% end %> \ No newline at end of file diff --git a/tutor/app/views/solutions_constraints/create.js.erb b/tutor/app/views/solutions_constraints/create.js.erb deleted file mode 100644 index df2ca465..00000000 --- a/tutor/app/views/solutions_constraints/create.js.erb +++ /dev/null @@ -1 +0,0 @@ -$('body').append('<%= @comment.text %>'); \ No newline at end of file diff --git a/tutor/app/views/solutions_constraints/edit.html.erb b/tutor/app/views/solutions_constraints/edit.html.erb index cc1a9a5e..eb8f486a 100644 --- a/tutor/app/views/solutions_constraints/edit.html.erb +++ b/tutor/app/views/solutions_constraints/edit.html.erb @@ -1,3 +1,3 @@ <%= link_to "<< Back to list", :controller => 'solutions_constraints', :action => 'index' %>

Edit Constraints

-<%= render "form" %> \ No newline at end of file +<%= render "edit_method" %> \ No newline at end of file diff --git a/tutor/app/views/solutions_constraints/new.html.erb b/tutor/app/views/solutions_constraints/new.html.erb index b4dd62db..a0932b48 100644 --- a/tutor/app/views/solutions_constraints/new.html.erb +++ b/tutor/app/views/solutions_constraints/new.html.erb @@ -1,3 +1,3 @@ -

New mooo

+

New Method/Variable Constraints

<%= render 'form' %> \ No newline at end of file From 2ab81a1b1a5a3ecb351f584ea9624cc5fba8063b Mon Sep 17 00:00:00 2001 From: ahmed93 Date: Tue, 22 Apr 2014 13:03:07 +0200 Subject: [PATCH 08/55] Issue #188 commiting to go database --- .../javascripts/solutions_constraints.js | 41 ++++++++---------- .../solutions_constraints_controller.rb | 17 +------- tutor/db/development.sqlite3 | Bin 196608 -> 200704 bytes tutor/db/schema.rb | 18 ++++++-- 4 files changed, 32 insertions(+), 44 deletions(-) diff --git a/tutor/app/assets/javascripts/solutions_constraints.js b/tutor/app/assets/javascripts/solutions_constraints.js index 838fddd8..9f5db2d6 100644 --- a/tutor/app/assets/javascripts/solutions_constraints.js +++ b/tutor/app/assets/javascripts/solutions_constraints.js @@ -43,6 +43,7 @@ function add_params(field) } } } + function remove_params(field) { var index = field.id.split("_")[1]; @@ -107,6 +108,7 @@ function add_variable(field) } } } + function remove_variable(field) { var index = field.id.split("_")[1]; @@ -131,40 +133,31 @@ function remove_variable(field) } function submitParams() -{ hash = {} +{ var hash_p = [] + var hash_v = [] + for (var i = 0; i < type.length; i++) { + hash_p.push({ + type: type[i] , + name: param_name[i] + }); + }; for (var i = 0; i < type.length; i++) { - hash += {params_name[i]:type[i]} + hash_v.push({ + type: var_type[i] , + name: var_name[i] + }); }; method = $('#_constrain_method_return').val() name = $('#_constrain_method_name').val() $.ajax({ type: "POST", url: "/solutions_constraints", - data:{ p_type: JSON.stringify(type), - p_hash: JSON.stringify(hash), - p_name: JSON.stringify(param_name), - v_type: JSON.stringify(var_type), - v_name: JSON.stringify(var_name), + data:{ parameter_constraint: JSON.stringify(hash_p), + variable_constraint: JSON.stringify(hash_v), method_return: JSON.stringify(method), method_name: JSON.stringify(name), }, - datatype: "JSON", success: function(){}, error: function(){alert("failed");}, }); -} - - -// function sendparams(){ -// alert("doog"); -// $.ajax({ -// data: { depart: type.toString(), return_date: param_name}, -// type: 'post', -// url: "/payment/create", -// }); -// } -// $('#account_settings').on('ajax:error', function(event, xhr, status) { -// // insert the failure message inside the "#account_settings" element -// $(this).append(xhr.responseText) -// $ajax:beforeSend() -// }); \ No newline at end of file +} \ No newline at end of file diff --git a/tutor/app/controllers/solutions_constraints_controller.rb b/tutor/app/controllers/solutions_constraints_controller.rb index f3800fc9..319bda4d 100644 --- a/tutor/app/controllers/solutions_constraints_controller.rb +++ b/tutor/app/controllers/solutions_constraints_controller.rb @@ -6,22 +6,7 @@ def index end def create - param_type = params[:p_type] - param_name = params[:p_name] - var_type = params[:v_type] - var_name = params[:v_type] - method_return = params[:method_return] - method_name = params[:method_name] - - myhash = {} - param_name.each_with_index do |k,i| - myhash[k] = param_type[i] - end - - myhash.each do |key, value| - puts(key + value) - end - + @method_cons = params[:paramter_constraint] end diff --git a/tutor/db/development.sqlite3 b/tutor/db/development.sqlite3 index 16f9168c6518c0aa49ad1fcc1826ba2aa4fd9b2e..5a2a8685fe775231f963209454ea5e30f6e0be6e 100644 GIT binary patch delta 5239 zcmbVQYitzP6`s2bUe@;R*f?NH;$jD@1%u7pJ9A%d6Yu(k9}9kijasl_*RaOkHTD`m z6v;*<%AYi87^x#wYA8yB`lFa)S9aAZA#J5d=|hRsR%)dR+CNoWsfDUS^dW`bomtS# z?5r$xWn1!o=broBbG~!#V`Zgupz4($=&?JNn2 zzcry%Jx~_)g;v-5%HpA&Wi`HoNP(K7Ap{liLF*q>wfg)up*QqEwXl0b*tLc#cKQzj zr(MnZjrvpN%cvSEjR-bk-ar%;L6)_uSG0PRk3=$K4d>ERwP>ssDz!)ZW2Y9DE~h&B z6G!7}Y=%zK#bXVZdKX6~c)GJ;3Y{EA3zxbsjl~v|OCv|(BWKgYC$Ch1JyONfB}SwA zQd6a!16Dc3suu?ffldw!$qU_=PPI+9_jaL%!B~{1;ZPzmJ2-uu&Mys(4<6}A!sAn2 z<5T@hsrlB+ZSxm9P9?K(tO$Q3$&che$-kBFu9rm~RUNV|7hxj8;3AAv!$$96rg|*g#wB+>w+vw!o9^BdELc*xacj zsoC-L)I@t??sBrPtAD63hRzT7cK4pRm|R$F&_~Z4+Aq=-+nR6E14ROWPuvinccWm#|%j8d0%=yzFyGWHvJw zPoy%og3w}pxFs>kV@H%?>P4oJt*SnC*!VUg$oXO14aN z#yfhhRD-=zl~ANC=@*u3?Hp9j81bwH3xOUSjvwPo9ckQfbfCEhw#Ud+iuI24^mNSk zPc~1rcCqQ^c5+djrz5FzGv|j;n=&0=Xvr1?kl&NU&w9zq&*VCr+908b60bm*$oi8v z_c#;DnL^xZMvaQnfK-htP;b7jITFb=%H4_2*(($y{l<08&POCmf$pGK_K<6E{mJ!A z*x_Fzn&@lJ#9Q{F=%}i{z52X8=tOiM;^t!s(L`GPB_djt;#Z1Bd(*QSx9^-SRP$!F zA!77tNlF6KOQ+6m({fwPiN+CD^_AO0&Xr`p^!9XomE8wElQ1MVmUqNIoVA-g@(xC*%|yQaOESLFTLJ?=2ah^TJ%rWlxs z=<$1vTiRRh#k`85e{`?OX|HhPO@|BiNLTMW`Dhg86-bW0rV^?f_g{AS*HD2nh74jw zUHijN9A(eU?ZGoVP!;0W|MquiZ!3&*g}KvZ@=;*6Yjr$84mt(RArc*g>F+*Joc0i@ z?pm~#EBq5}?cs)#KGAT2E~=;sqxv5|tvX<<8%9NR-1M#VQceHdlg~QHco~~y5JU(w zJ?*v^&CKoGvRAmqRQ(4}9LFa{nAkA9Vvm$;Px?N1(;;PwIcDxk&ILy!7#cqe0b)-U zC75#e0CTkh87(sIg+U!7eiwtM2Khs+xe!7c9o=q@Cb+<8RjAG7*BT8eQkn7lFrf9e zyik%oPTUn@|6A`X``zY0%7M?n-n;!%|K{ULAn!Qv zn&f-U|LV41Z2wi!UjzRM9xi^h3P^$z?q~B+(Hi5kii5XpS%2}yY$j})<8)AI72^_SmkSQXCo+l#{*?iIj zlzk3{2vQ*vuNh3F&u82|175(M%4RUTYkLkh5#!bwaKJ7hCZ@`(Dr-F^vM~zoJ9-Xf zFdIWBy_~oe%(zjU2A{XjK$$pjxqH4jgM}Dh${TaZz?e5B6Uo-wa<<-&wZi%mvbGg*0$ox7My&rc@e=Mz)nLNV+9AGY+jMF-oe z2cylgw(1w{u)Y%HMN^5{*|GD+==0z?V`nX>Fy0>W?bh%6>Vq|h1C>=(;OZ_T+~@mw z$y`cY-lr!MnM8c^$9=vvu(^BCcjZvh)<(E!FXAP^sR1(%7ViD{^D_U*U~#CX7N4L#v_5P+jStOK*zDimRo|kx)E2I;~DQrsJKuh#Nl6qksVumPzkZ;d^!6fWUWJ7%Q=k%wswIO>@GXY zgLq2eFjBO&2L(T^r{!mlPdOJ*97`hNwvy9Cp-3Q6`tA;CdC;)9N=L+1WeZgy@vy?s zvQz#!7YbHM#Q)4iK@u9_?hB0NLCqdpBEDxH3P~G{A}wzt%DE7a4@v|)b5V!{O%$XOQk-vX;dMqwhBG7j-?s) zt{l~WlIJ_;-0z%8wg5cjQPdkq59iz_G=Z!)#__ z!WuAZunUoQbFOQb%xIcDl8b_p_6|y+UQv7q9d!oN2i*+JC;gb3vY&J3g8{ z-_txdHDrwp9Kns8Os0BMjp=JU(R0SmP3EbTyKt~N#DNk_h?YYhAz=>V>6VseJTc*% z=$LKkz1)BDa@%0b=uBT~qV4GUDJrvlvjZnCkde!0aZlg;#fxXp&No_qdUht>HOxom zU(7$4_gA(zJ*wFk*sjg7Lp6yI7Gso3=HgS&X0Eml^|YVC3xmgwkBx~LYpCnO#i5Sz z6PE`%T6){()j;}us&&SmooUZb9B~fyjHk{_TZJ3*V-iP-;)r|a)GPY~>?k1=YwWT0 zDdLh-pX1}HnZXOG_8~qyes%m}OFEP7ZJZgE<3qEPjS~}0O?0+jIypfO_b;?|4_O0g zGPiIp?GB&b_gNBwt&J4Axm|I%J&L@T2L4Pm!jX?CiPG$!wq@?8A`IUO6~=tbd`SMZ1g|P^4+N7jkt$4pd5}936)Z zglIVQw$0(pLfRQ=J4UQ?=O)j*iZ7+DD+3Ex54Su0vz_VL=7GN1=DGRvGn3Op?VVkN zN4qnALm=~Q1AbO27k^{c2h>IcC|;|!JhJlS`g7qzDqAs4A&F&!JOy)`msqHfQc7JR z!QK{~P0aes;7I_5dz7piD?`STmQy^LQ-u=1|HLaC@4k|@Cr_1Xq z)Cj_M9I2t^3kha|d-lC>c$+JwS3n+dm*0CaM8}t-W;+lbo=UO&{)h3Py`+K@t*(h= zM9J?wP+@bW?1G&5yOq>O+;a~Od=`6R5vhc9+;<-w4BJC$G~4y<9fGk-A3nv0NsM)3 zCX#T>T<>8r9N)H;hCjrIs!+N7r(cEI9-eWfX-%*v{u%E6?e8QwR;1)iZ;y!$I&J;P z4$&!UPN0sMxIg*`hwUK;TJc~du%OHTSPj$X+@bpPC|f$z{qrX^djowVg_2aWT_~?m z?iZhYAw;H#F-Q$d#)&)iv^^7CD>WN)Xbbn}PeRuxDX`;crimXP4psRxbUh?xhbwrh z)dIGmR^Bh-NCb=J2pC_QGX`6L43~Ki5~yB^Xko;>fz}mtVPl2KaB1FK@FL!nI@%^B z#Bm(#{V{=@hCp2$L732{j$nsNc{<|VGEu!ZZla1{i5%{K7jA%97=+E3w`3yG5?qKg z3PZi%z5)&qhZ6sYuRtFg=C{l!`Z#f~s;uHs>~U;QS#8Nb;f>%!wDx#AibPkAm6b%- z9#tR*-~tE+po+2RY|HcaX0a{ITn8>ant-VQpP1CbK}My@4x+# z-D^#?=&Q(UegPf!8ec-~ZfEJg-R_c4Rw|<{Xzh1(Xr!cEJQJ%X1ifDEiI>suT^uX( za6LL%&UePDIY+O@z3cVp2i~o{=$mWr>_gv;u42?+1~V!#qg+!0PKc z6GSN8pzxi2#QVubCIFnSmoEzp`u>L)cJaI^9%rqD~l6&x6^L^FD! znevGDl>!F>BV3mNNBW3&=V^zcl(1C9QLEEvXGjDNhM})tA&>ZNmGj#w_f%V90TH## z@`$&TLn5?yOoi^4g1zUF)kReLekm$3qF20aosk#HA|FKHU$<-f2Nl=8wm()~Q-i+I z;l0rn`R&?k-I1HfJJpE3zxHfzw~f%cUO4ma&Y+d#gAVg@QNPo*L{@)B-RSTkin zGz}MKok%>}XmL2;>;t+i5bo8K6iBh=k#yO(C=4O*I+W k^e;kyz{OB|+c*NB9Kb7Q5^V-3Mu5O)3|az|!0Xcg0P0_9761SM diff --git a/tutor/db/schema.rb b/tutor/db/schema.rb index d98ab000..9fb5eef9 100644 --- a/tutor/db/schema.rb +++ b/tutor/db/schema.rb @@ -11,7 +11,15 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140419085448) do +ActiveRecord::Schema.define(version: 20140422100002) do + + create_table "acknowledgements", force: true do |t| + t.string "message" + t.integer "course_id" + t.integer "student_id" + t.datetime "created_at" + t.datetime "updated_at" + end create_table "admins", force: true do |t| t.string "name" @@ -25,8 +33,9 @@ create_table "attempts", force: true do |t| t.integer "student_id" t.integer "problem_id" - t.boolean "failure", default: false - t.boolean "success", default: false + t.boolean "failure", default: false + t.boolean "success", default: false + t.boolean "uncompleted", default: false t.datetime "created_at" t.datetime "updated_at" end @@ -134,6 +143,7 @@ t.string "method_name" t.string "method_return" t.integer "model_answer_id" + t.integer "method_constraint_id" t.integer "owner_id" t.string "owner_type" t.datetime "created_at" @@ -324,7 +334,7 @@ create_table "variable_constraints", force: true do |t| t.string "variable_name" - t.string "type" + t.string "variable_type" t.integer "model_answer_id" t.integer "owner_id" t.string "owner_type" From 7b765c72eb845a8ccb14f2f66a04c9bceec22bf1 Mon Sep 17 00:00:00 2001 From: ahmed93 Date: Tue, 22 Apr 2014 14:39:14 +0200 Subject: [PATCH 09/55] Issue #188 part of the saving to db works --- .../javascripts/solutions_constraints.js | 25 +++++++++++++---- .../solutions_constraints_controller.rb | 28 +++++++++++++------ 2 files changed, 38 insertions(+), 15 deletions(-) diff --git a/tutor/app/assets/javascripts/solutions_constraints.js b/tutor/app/assets/javascripts/solutions_constraints.js index 0a04af9f..b8b072c7 100644 --- a/tutor/app/assets/javascripts/solutions_constraints.js +++ b/tutor/app/assets/javascripts/solutions_constraints.js @@ -152,18 +152,31 @@ function submitParams() $.ajax({ type: "POST", url: "/solutions_constraints", - data:{ parameter_constraint: JSON.stringify(hash_p), - variable_constraint: JSON.stringify(hash_v), - method_return: JSON.stringify(method), - method_name: JSON.stringify(name) + data:{ parameter_constraint: hash_p, + variable_constraint: hash_v, + method_return: method, + method_name: name }, success: function(data){ - alert("Data have been Added successfully"); - window.location = window.location + if (data) { + alert("Data have been Added successfully"); + window.location = window.location + }else{ + alert("Data messigin/incorrect !"); + validate(method,name); + } }, datatype: "JSON", error: function(){ alert("failed"); } }); +} + +function validate(method, name) +{ + if ( (method == "" || name == "") && type.length > 0) + { + + }; } \ No newline at end of file diff --git a/tutor/app/controllers/solutions_constraints_controller.rb b/tutor/app/controllers/solutions_constraints_controller.rb index b3d7051d..ae97f2f5 100644 --- a/tutor/app/controllers/solutions_constraints_controller.rb +++ b/tutor/app/controllers/solutions_constraints_controller.rb @@ -6,18 +6,28 @@ def index end def create - @method_cons = params[:parameter_constraint] + method_cons = params[:parameter_constraint] @var_cons = params[:variable_constraint] - - @method = params[:method_name] - @method_returned = params[:method_return] - @constarint = MethodConstraint.new - @Constraint.method_name = @method - @Constraint.method_return = @method_returned - @Constraint.save + method = params[:method_name] + method_returned = params[:method_return] - redirect_to action:"index" + unless method == "" + @constarint = MethodConstraint.new + @constarint.method_name = method + @constarint.method_return = @method_returned + + unless method_cons.blank? + method_cons.each do |cons| + @parameters = MethodParameter.new + @parameters.parameter = method_cons[:cons][:name] + @parameters.params_type = method_cons[:cons][:type] + # @constrain.parameters << @parameters + @parameters.save + end + end + @constarint.save + end end def new From f92b5248384db913858a048a0b75994565a0c2fc Mon Sep 17 00:00:00 2001 From: Ahmed Atef Date: Tue, 22 Apr 2014 16:16:59 +0200 Subject: [PATCH 10/55] Added destroy method in the problems controller and added documentation --- tutor/app/controllers/problems_controller.rb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tutor/app/controllers/problems_controller.rb b/tutor/app/controllers/problems_controller.rb index fbe1a307..c21c4c06 100644 --- a/tutor/app/controllers/problems_controller.rb +++ b/tutor/app/controllers/problems_controller.rb @@ -81,4 +81,21 @@ def new render ('public/404') end end + + # [Remove Problem - Story 4.18] + # This action takes the problem id, remove it from the database + # and then redirects the user to the show page of the track that had the problem + # with a "Problem successfully Deleted" message. + # Parameters: + # params[:id]: The current problem's id + # Returns: + # flash[:notice]: A message indicating the success of the deletion + # Author: Ahmed Atef + def destroy + @track = Problem.find_by_id(params[:id]).track_id + if Problem.find_by_id(params[:id]).destroy + flash[:notice] = "Problem successfully Deleted" + redirect_to(:controller => 'track' , :action => 'show' ,:id => @track.id) + end + end end \ No newline at end of file From 1335bf2547626f74533cfb0f2b08cc01eacf86d9 Mon Sep 17 00:00:00 2001 From: Ahmed Atef Date: Tue, 22 Apr 2014 16:20:50 +0200 Subject: [PATCH 11/55] Added button delete problem in the Edit view of the problem --- tutor/app/views/problems/edit.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tutor/app/views/problems/edit.html.erb b/tutor/app/views/problems/edit.html.erb index 61b4f592..db828153 100644 --- a/tutor/app/views/problems/edit.html.erb +++ b/tutor/app/views/problems/edit.html.erb @@ -8,4 +8,5 @@ and a paragraph to view the problem description of the instance variable @proble <% if flash[:notice] %>
<%= flash[:notice] %>
-<% end %> \ No newline at end of file +<% end %> + <%= button_to "Delete Problem", {:action => 'destroy'}, method: :delete,class: 'btn btn-primary',:id => params[:id] , :confirm => "Are you sure you want to delete this problem ??" %> \ No newline at end of file From a20386d20c3c910a53339f28127d0003ff431bb4 Mon Sep 17 00:00:00 2001 From: Ahmed Atef Date: Tue, 22 Apr 2014 16:21:25 +0200 Subject: [PATCH 12/55] Fixed a minor mistake in id passed of the track --- tutor/app/controllers/problems_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutor/app/controllers/problems_controller.rb b/tutor/app/controllers/problems_controller.rb index c21c4c06..1e68f2cf 100644 --- a/tutor/app/controllers/problems_controller.rb +++ b/tutor/app/controllers/problems_controller.rb @@ -95,7 +95,7 @@ def destroy @track = Problem.find_by_id(params[:id]).track_id if Problem.find_by_id(params[:id]).destroy flash[:notice] = "Problem successfully Deleted" - redirect_to(:controller => 'track' , :action => 'show' ,:id => @track.id) + redirect_to(:controller => 'track' , :action => 'show' ,:id => @track) end end end \ No newline at end of file From c22e158f3212399108cc1eb3994f275f5acde1b3 Mon Sep 17 00:00:00 2001 From: Ahmed Atef Date: Tue, 22 Apr 2014 16:29:26 +0200 Subject: [PATCH 13/55] typo in track' controller s name in redirect --- tutor/app/controllers/problems_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutor/app/controllers/problems_controller.rb b/tutor/app/controllers/problems_controller.rb index 1e68f2cf..929994d1 100644 --- a/tutor/app/controllers/problems_controller.rb +++ b/tutor/app/controllers/problems_controller.rb @@ -95,7 +95,7 @@ def destroy @track = Problem.find_by_id(params[:id]).track_id if Problem.find_by_id(params[:id]).destroy flash[:notice] = "Problem successfully Deleted" - redirect_to(:controller => 'track' , :action => 'show' ,:id => @track) + redirect_to(:controller => 'tracks' , :action => 'show' ,:id => @track) end end end \ No newline at end of file From f35c6b0fadd6ca151156c171f435b224cad08cfd Mon Sep 17 00:00:00 2001 From: ahmed93 Date: Tue, 22 Apr 2014 20:32:24 +0200 Subject: [PATCH 14/55] Issue #188 saves empty records --- .../solutions_constraints_controller.rb | 53 ++----------------- .../solutions_constraints/_show_data.html.erb | 0 .../solutions_constraints/delete.html.erb | 7 --- .../views/solutions_constraints/edit.html.erb | 3 -- .../solutions_constraints/index.html.erb | 12 ----- .../views/solutions_constraints/show.html.erb | 27 ---------- 6 files changed, 5 insertions(+), 97 deletions(-) delete mode 100644 tutor/app/views/solutions_constraints/_show_data.html.erb delete mode 100644 tutor/app/views/solutions_constraints/delete.html.erb delete mode 100644 tutor/app/views/solutions_constraints/edit.html.erb delete mode 100644 tutor/app/views/solutions_constraints/index.html.erb delete mode 100644 tutor/app/views/solutions_constraints/show.html.erb diff --git a/tutor/app/controllers/solutions_constraints_controller.rb b/tutor/app/controllers/solutions_constraints_controller.rb index ae97f2f5..2af0007f 100644 --- a/tutor/app/controllers/solutions_constraints_controller.rb +++ b/tutor/app/controllers/solutions_constraints_controller.rb @@ -1,10 +1,4 @@ class SolutionsConstraintsController < ApplicationController - def index - @parameters = MethodParameter.all - @variables = VariableConstraint.all - #@methods = MethodConstraints.all - end - def create method_cons = params[:parameter_constraint] @var_cons = params[:variable_constraint] @@ -17,59 +11,22 @@ def create @constarint.method_name = method @constarint.method_return = @method_returned - unless method_cons.blank? + if method_cons.present? method_cons.each do |cons| @parameters = MethodParameter.new - @parameters.parameter = method_cons[:cons][:name] - @parameters.params_type = method_cons[:cons][:type] + puts "#{method_cons[0]} here" + @parameters.parameter = method_cons[:name] + @parameters.params_type = method_cons[:type] # @constrain.parameters << @parameters @parameters.save end end @constarint.save end + render json: true end def new @constrain = MethodConstraint.new end - - def show - @parameters = MethodParameter.find_by_id(params[:id]) - @variables = VariableConstraint.find_by_id(params[:id]) - #@methods = MethodConstraints.find_by_id(params[:id]) - if @parameters.nil? - redirect_to :action => 'index' - end - end - - def edit - if lecturer_signed_in? || teaching_assistant_signed_in? - @parameters = MethodParameter.find_by_id(params[:id]) - @variables = VariableConstraint.find_by_id(params[:id]) - #@methods = MethodConstraints.find_by_id(params[:id]) - end - end - - def update - @parameters = MethodParameter.find_by_id(params[:id]) - @variables = VariableConstraint.find_by_id(params[:id]) - if @parameters.update_attributes(constraint_params) && @variables.update_attributes(constraint_params) - redirect_to :action => 'show' - else - redirect_to :action => 'index' - end - end - - def delete - @parameters = MethodParameter.find_by_id(params[:id]) - @variables = VariableConstraint.find_by_id(params[:id]) - end - - def destroy - @parameters = MethodParameter.find_by_id(params[:id]).destroy - @variables = VariableConstraint.find_by_id(params[:id]).destroy - flash[:success_deletion] = "Constraints deleted." - end - end diff --git a/tutor/app/views/solutions_constraints/_show_data.html.erb b/tutor/app/views/solutions_constraints/_show_data.html.erb deleted file mode 100644 index e69de29b..00000000 diff --git a/tutor/app/views/solutions_constraints/delete.html.erb b/tutor/app/views/solutions_constraints/delete.html.erb deleted file mode 100644 index ea29441b..00000000 --- a/tutor/app/views/solutions_constraints/delete.html.erb +++ /dev/null @@ -1,7 +0,0 @@ - -

Delete Constraints

- <%= form_for :parameter, url: solutions_constraints_delete_path do |delete| %> -

Are you sure you want to delete this constraint

- <%= @parameters.parameter %> - <%= delete.submit %> - <% end %> \ No newline at end of file diff --git a/tutor/app/views/solutions_constraints/edit.html.erb b/tutor/app/views/solutions_constraints/edit.html.erb deleted file mode 100644 index eb8f486a..00000000 --- a/tutor/app/views/solutions_constraints/edit.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -<%= link_to "<< Back to list", :controller => 'solutions_constraints', :action => 'index' %> -

Edit Constraints

-<%= render "edit_method" %> \ No newline at end of file diff --git a/tutor/app/views/solutions_constraints/index.html.erb b/tutor/app/views/solutions_constraints/index.html.erb deleted file mode 100644 index f8e2cd77..00000000 --- a/tutor/app/views/solutions_constraints/index.html.erb +++ /dev/null @@ -1,12 +0,0 @@ -

Solutions' Constraints

- - - <% @parameters.each do |params| %> - - - <% end %> - - -
<%= link_to params.parameter, :controller => 'solutions_constraints', :action => 'show', :id => params.id %>
- - <%= link_to "Create new Constraint", solutions_constraints_path %> \ No newline at end of file diff --git a/tutor/app/views/solutions_constraints/show.html.erb b/tutor/app/views/solutions_constraints/show.html.erb deleted file mode 100644 index ff0fbc2e..00000000 --- a/tutor/app/views/solutions_constraints/show.html.erb +++ /dev/null @@ -1,27 +0,0 @@ - <%= link_to "<< Back to list", :controller => 'solutions_constraints', :action => 'index' %> - - - - - - - - - - - - - -
Constraints
<%= @parameters.parameter %>
<%= @variables.variable_name %>
- <%= link_to "Edit", :controller => 'solutions_constraints', :action => 'edit' %> - -
- - - - - - - - - \ No newline at end of file From 5eccd5d2ccfe1ce0a920aa260cb9faac92f46468 Mon Sep 17 00:00:00 2001 From: ahmed93 Date: Tue, 22 Apr 2014 22:59:57 +0200 Subject: [PATCH 15/55] Issue #188 still configuring --- .../solutions_constraints_controller.rb | 10 +++++++--- .../solutions_constraints/_edit_method.html.erb | 16 ---------------- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/tutor/app/controllers/solutions_constraints_controller.rb b/tutor/app/controllers/solutions_constraints_controller.rb index 2af0007f..4512a7a0 100644 --- a/tutor/app/controllers/solutions_constraints_controller.rb +++ b/tutor/app/controllers/solutions_constraints_controller.rb @@ -14,16 +14,20 @@ def create if method_cons.present? method_cons.each do |cons| @parameters = MethodParameter.new - puts "#{method_cons[0]} here" + puts(method_cons[0]) @parameters.parameter = method_cons[:name] @parameters.params_type = method_cons[:type] # @constrain.parameters << @parameters @parameters.save end + render json: true + @constarint.save + else + render json: false end - @constarint.save + end - render json: true + end def new diff --git a/tutor/app/views/solutions_constraints/_edit_method.html.erb b/tutor/app/views/solutions_constraints/_edit_method.html.erb index 0351b8cb..6f78afd7 100644 --- a/tutor/app/views/solutions_constraints/_edit_method.html.erb +++ b/tutor/app/views/solutions_constraints/_edit_method.html.erb @@ -1,19 +1,3 @@ - - <%= form_for :@constrain do |f| %> From 660e0bfa1350bfc55756422c1fd911d34c503588 Mon Sep 17 00:00:00 2001 From: ahmed93 Date: Wed, 23 Apr 2014 02:11:10 +0200 Subject: [PATCH 16/55] Issue #188 adding documentations --- .../javascripts/solutions_constraints.js | 25 ++++++++++-- .../solutions_constraints_controller.rb | 39 ++++++++++++------- 2 files changed, 47 insertions(+), 17 deletions(-) diff --git a/tutor/app/assets/javascripts/solutions_constraints.js b/tutor/app/assets/javascripts/solutions_constraints.js index b8b072c7..e0bfed78 100644 --- a/tutor/app/assets/javascripts/solutions_constraints.js +++ b/tutor/app/assets/javascripts/solutions_constraints.js @@ -4,7 +4,13 @@ var type = new Array(); var param_name = new Array(); +var var_type = new Array(); +var var_name = new Array(); +// # Description: Adds the parameters from the text_fields to array +// # Parameters:none +// # Returns: none +// # Author: Ahmed Mohamed Magdi function add_params(field) { var tmp_type = document.getElementById("params_type").value; @@ -44,6 +50,10 @@ function add_params(field) } } +// # Description: removes selected variable from method Contraints +// # Parameters:none +// # Returns: none +// # Author: Ahmed Mohamed Magdi function remove_params(field) { var index = field.id.split("_")[1]; @@ -67,9 +77,10 @@ function remove_params(field) $('#parameter').append("
"); } -var var_type = new Array(); -var var_name = new Array(); - +// # Description: Adds the parameters from the text_fields to array +// # Parameters:none +// # Returns: none +// # Author: Ahmed Mohamed Magdi function add_variable(field) { var tmp_type = document.getElementById("variable_type").value; @@ -109,6 +120,10 @@ function add_variable(field) } } +// # Description: removes selected variable from Variable Contraints +// # Parameters:none +// # Returns: none +// # Author: Ahmed Mohamed Magdi function remove_variable(field) { var index = field.id.split("_")[1]; @@ -132,6 +147,10 @@ function remove_variable(field) $('#variable').append(""); } +// # Description: submits via ajax to the controller +// # Parameters:none +// # Returns: none +// # Author: Ahmed Mohamed Magdi function submitParams() { var hash_p = [] var hash_v = [] diff --git a/tutor/app/controllers/solutions_constraints_controller.rb b/tutor/app/controllers/solutions_constraints_controller.rb index 50914a19..fa1ef12c 100644 --- a/tutor/app/controllers/solutions_constraints_controller.rb +++ b/tutor/app/controllers/solutions_constraints_controller.rb @@ -1,35 +1,46 @@ class SolutionsConstraintsController < ApplicationController + + # Description: Creates New record for either Method or vairable constraints + # Parameters: + # method_cons: Hash containting the Method parameters + # var_cons: Hash containting the Variables Constraints + # method: value of the method name. + # method_returned: value of the method return type + # Returns: none + # Author: Ahmed Mohamed Magdi def create method_cons = params[:parameter_constraint] - @var_cons = params[:variable_constraint] - + var_cons = params[:variable_constraint] method = params[:method_name] method_returned = params[:method_return] unless method == "" - @constarint = MethodConstraint.new - @constarint.method_name = method - @constarint.method_return = @method_returned + constarint = MethodConstraint.new + constarint.method_name = method + constarint.method_return = method_returned if method_cons.present? method_cons.each do |cons| - @parameters = MethodParameter.new - @parameters.parameter = method_cons[:name] - @parameters.params_type = method_cons[:type] - # @constrain.parameters << @parameters - @parameters.save + parameters = MethodParameter.new + parameters.parameter = method_cons[:name] + parameters.params_type = method_cons[:type] + # constarint.parameters << parameters + parameters.save end render json: true - @constarint.save + constarint.save else render json: false end - end - end + # Description: init New record + # Parameters: none + # Returns: none + # Author: Ahmed Mohamed Magdi def new - @constrain = MethodConstraint.new + constrain = MethodConstraint.new + parameters = MethodParameter.new end end From 3cab10d91fb2baa6a6a3ee91ebad3e7c34af0c0c Mon Sep 17 00:00:00 2001 From: ahmed93 Date: Wed, 23 Apr 2014 15:23:18 +0200 Subject: [PATCH 17/55] Issue #188 fixing view --- tutor/app/assets/images/delete_button.png | Bin 14804 -> 14624 bytes .../javascripts/solutions_constraints.js | 46 ++++++++++++++++-- .../solutions_constraints/_form.html.erb | 9 ++++ .../views/solutions_constraints/new.html.erb | 10 +++- 4 files changed, 59 insertions(+), 6 deletions(-) diff --git a/tutor/app/assets/images/delete_button.png b/tutor/app/assets/images/delete_button.png index 11bc5190c797f4cfc1bbbf4d924cf1f30101155d..67ca61605b384449e0cab4038e5e43753bfd48e4 100644 GIT binary patch literal 14624 zcmZ8oc|26__rG%u#uCP4%Q6h1C=%JtD1#PDE3!tS>`C@nWLK6{v@p|0i%Pca+YBm- zP=u^AC1f4h2DAL8@1H;a@OpXfxzBT!=bZC?pPS}rZ?j8yk1zlLyN=shodEy{?@tH- z6X5-FyIy<+0E}jiTUnlq8d)q5x~E|CaHi;W!y8vW*SWJ6m#fu8Tq^^YE>RWQmwtsU zG(9}jc?KK*P-s#iV3-!bUB}2>)QDbiGp3-@=7y$z1pIT+q)jzIpF%hH!$u~ z!+}@d&v?!qi$526e#qL&_p*&O@5jp80;D0DP}ZFi zrN0z|05h#bmZvz=)aijAL^H9e|AL@a!TT21ch>UDF~UF9Hiyo8@DrAHuX#NCJbS(2 z?1R=5DJv#D7X#!)%%Y_%83tI7t|x!poR#Icf*H-0b;t%*RLEWG7eb zKhI~k1AFaKTrxh)65E?!^v%o1$Cs5I;Ru9xb)Cf@I2tiQJ@C_y`}>Eualyf0RGAh^xL$&21|x`bvLYiQ zDAH}7pqC+t?}(ig8Qdk7aP2vGjgd4lV{J`km~Rpu`gAZ-9L~SNuhUmnmfO&I#WLfU zEDF|Z#P1qZpNV=RespwFET*(sTHDT!h-JP$sO`m^PXaZo zYTGm3g7y=!I>k@WSyr_AvQu`=zld8~hsv+J|F(u!Y6IUGy(H5VQ=!%@)2+cTnO)8*Np9JuYr?y9< zQ}mPxwXhu_*7qMSj!8<8;tQ?YL8Ik{7%Q&|4|LSbz`!o?BW956?m4Y{-=VUxkW?u8 z#DI1y6SWm{5rf>W`h}4&Qq)ZLsW`E8O3{Uuo-2c(~U}w_N#x8nDtj zGD6*cQ?`*t%~RJ18EY&jm=XV}9ICvBg+T0L&Yv1><5s`|$FE_@1_vZr_kVR*HlJBR z?oQ5khJOA%mX3JZf!}_#*|Dk55ZJ#RQEMrtIuBmL_V$Fy0KrJ5-(%jb`eQLM!es+M~~EccnNNM6u8cZK4f?(_1_y@43I4D(K{>`;^bRxIAmsm$iEhv zBbtgC1G7z;X}l9w`SRgDtwVyJyErKGp(I`cQ_?u^3sAkQEA3^lnlrx-tAk-em?gS~ zwUyVNbZWU2v5IHF3<-|!9vp%kpum?wH5k&jqP6Taq57hVZM{(vDZn!kO3x#J__R0j z?t8KnQQuAkw|4O;18F*)GOjkVPac9e<$-szb^3^qB#{ z6u$R}a+E~gt5)Ri(iS7-EIn)#mz|cxcbcEj!#yq8j^Qb`!F#B=V zE#<+7(g@wgu_ki}364|5O-@^zPLEt2om$~@0m@QO=4Nqh&A!XPaXw^?C*h1lzJUd5 zL2j<0*=_|fSlK=)i00FwtnHo6R($DcTrfVjtrypV3DQA0P}6}?tF+d#U9r}PbY9H2 zGZ?P)D+9V!8jj%}IZ*QKg46cRkYy4%b8cZtK&SbSdeiAm8`DRMxJph_pgE)_%{$3c zE{cz=F@79-0-8A)tK+1Hu*#`cZK$w`KJQ)FA_Znw*gwu z_Ri8$p8LpPjm#a6&Q7-<6-(F^FA}o6Ebp;t;sh*_NL*T856K1{VJ8CA zKj^F?ciiLm8h>!WYczI(Z@TA6Ye8ZY;j@Si^<=g5uvg_9*6p^k%Bmr+CY@Eq11NBs zo`s0&&wgy?LFKbcFDM|--!Hq&5179e76Rl2tRx9H*S7I&_Sxc4K~V_xub#6kQt$W`JyW z{B(DhB_Hl0&>4u)7YABCPcF~zT=aVy+HN8%;P&^0Au$@p0oS0^g+Q-k9|~6-zAg?G z99O=xREqFF2+vNy!`mpbP%bMjH1}J)iqC1k%)801-%NDsp(PVFyPk|R%5-A{YyzrD z>>u^vc)li3!WgQ29HRy-;=g~dW;gWon3spLUl=w)ZY&N%t~}kL*k0IiVIIr!WU%I^ zprv*HxmfWsrcGw34{q;lL|K6vM*Pj=%Zeu3J1etj{vYxq6r}rZnHCG36rbQQB9fC z4Cqn%a>N);oHcbxNtE@i?@hATX-fxV73UW;^y;ur-9p-l->W2fBt=A@tN}WPd8{=< zE`pd?h%a-Fc_MN%_FzCjqv9gL%FA4#bvheH?Fp(njc6^?{UURN1uiq!l5Ar^%|mq| z$b&sOu;SL`Q>))+Q=+MnK7BU)7DX<2C03S>b{u^=Ee%N&U|9iCCljh=!1@B=J)baY zV1eh{5^m^0P0eVZJzp8#d;^*dJLm5}cA*W~ZG^euuA5ExnH6GiR+uk~e)JSobWFaD z+H3?d3%-`{G`p?2eRmt>kvKQYl5c~5I;j*vcmsM)j}x8ZsW+j~@e7xEL%#sg*#ax}-GQ(9H;6Z|PtG2?3UqEZ2x1J+{L(V~00@?A{Ld=%flu%Wzp%pEnjL&_vwy}_xilDfOCjDPR zmod-*ADlFYjI~I9>I7P#X3q$D^Uur5I*09uD^Ptwrm8z%g9HBq1aYXPhAyOFzQ0fr z7W{+Cb%o%(<>16nX5_L*+SXMje?}Z5dJn;4PZZYqR%uGzb$-QxPV{bzzcx#;<4A!t zb@0*IYg+g#P)_+N%H^izpm8vgau16+K$j7qbo+-0#~i1{YoX8D3aIZwTR41an9Bg} zBVhX9A1A9>bl{FSFc3w4g2~AE-FbVJ!D*Vf{GuI3C+xQKr6Ey4H>N`&^jOs>+CoX5 z#T-+8^12d6PD!IhfD5}XIrDv{_U;6Nj1>D-Ie;`!-!l#UDFZpouz{lYuNAfoC7FLr z^t#CSwUO!^xfd>rDa7Q%@~^XV6DPfzkOQ49exggm6)2D)>kQo^o}?c^>}*FHe4tba z?qwwqGT_^`)cI2y)<*WxUgU~49eyU?d})|yG`w!fq<4W({`H~)PC9N=c2)rOQ|O5i zeI44Jin+nOb%B}Iqwo#z9aT=Xoocqi?(hyx5ykp3NlhC!X9P_vGv3)3{-uFB`R$@=S+SykrbC= zYD!iT%Wj`*4*^)3eSYw$kzlu8fc~_PeyI_ zVyPOyXNF+Oq65e(Ip(1KhS3-#Tl8uMS`!qI3WOA3-nI9->J|a$3i}h#9%u%@u9Cg{ z0k0$*wY=@Ug8Yhp%0OClbKhEE8LF0~)3mFq8F4*+61cHMp(^4dSktt@ohJaVYZ0T6 zah0^j8Sx8d#N(e4p*YJ8Uhh4xDNVrdk&TLUs$h!GhJbilf2=X1D*W0QhsWARs0E0g9*|0W#e8b&w}8fknAmF$=J71ZANZ9BdN1n%m~HcWBRRY#m9$G>fSDjoht?L zZnT$>_;bT6Hm@kAwl&CBl4UI^c1h@A1FYN_(lcA8KcqvLG`}Lscx=D%b%%fO(^V0} zL$+yD`iBpX)05i%)@*FJ_HkjjrSKg&=6R}9+VT&%$3}M=VYXiTq0>UR+5?hD;^DBU zCg*#9T1r}xQF%|>ihEsyY?Tfg<2hzg^gPO1oVFxuzbdZJ_`PV0Fk}Dw3WI|)qPPiT zHQzZ@dBmG}AzloWNJ0koJoaE;TM%+1n?Z^grX7sM#}Q29gA{+{lu*fNJwn^94oLr9 zDZ#;hs%Eju{iH9ifB4 zKfu?Hup4xlk6Q^6U+yJYdW!FqtjX{%FFu^>l4E^dl<-kZL@_9{q0|-Vl}m2vSnAXb zPbIp{7ZaGYoC=%=7Th}j*zlIO-%DAJD6veW`Nl4A?(^e)%8}~@el*Hn4Te_rNpRf} z0nyN)#!nd?I?H(HE7Vpdwfttxsc%qVaA9JXYn{R_jwbEo#9q0otRrhrwm;bm9pPi0 z3Az{RK4k^m9HTCCmQHx<&Q1`4Ay1>B$)k+MNj@xDw4M0;=~HUs_On(EUjgg*Uwwxo zz7=poq?yM?wVrRMV#zQ4J|HC0FbZVCy5B{msINPcQ8Uk#hr62W2E^IctJ zv37}{ufA(KBnJAR_p-viD$}G&cmT@L`UTEp*r&Zw>b^1Fps4wl+QBX@RzuKTtAhX1 zFcUPxf`wdy=S};`#Kz?|k;yzQDYxW8Wl_iIx5->F)(z)VN|lsBekDdh0SqU5(5`hp zklCl=_P~!>J*x3E=1&^6K74}jVJFiMf=klI4_k~BwE%I@BLWJUozQC-f=nu3oEP~J)ApkH}vD3%Pwrq zTmo3mWG7bOySB2i;C$}^KVFP8y%JUS516EgMub-Q~ zDq|m;S`*%T*b6Vmh zm-?lqGMt{*o4VynnoXj|+~Fq;`lhTCiw}u0uhRe_K}UP#KhHcL&{Iagre=Caurj^; z+@gZn`ZjEj@dLCgf)LaMIai0xCw zzoC|mc(@!kfHMmwS7N|U(M(Q7+j6(Javz-GU*)NO_WF|32R{73X;0IS;wEDFgIkU-d2nFwC0exvWLO{w|COC4{0&N1z7Zzs1J8jPe=+iA7yj3&F( z`lGTj-yEcH`q&if7%0U*y)+DF&O|7#7bS$q#(2LKLkGX9((+=Mt+hjP!zk)3W|~=U zu9r|tYAn+CvP{rW61t1lb=0A|ZMn*IL`paA;MaCYwgRj3xlNH-=DeR@b42RT!48RK z`4seCMoxrV%svmgVf04e$@Z*KokijIp%ytvO` z|6b~VS~OC`adnFA=p%!78NZI4Xao-xIu*m}9OTtep|jce0w8FQ9R7xB%>4#tz%gHl{ zE>nGeM9P+7wr&RT@b0Up_MsF-EpD&OYcqRrE=06J9$JM_FN7As7gwhP+2Q9UiR-R4 z1mm^KDpBySAmMIw#_Z;r1he|l;Jpijbf-P71~zOXs?8O8UhM@*;Cjn-6rfXLR~Cg; zJ!JbuOnLS+j?g_h-{Tk1`}-x7^651CAS1_x`Mu;jl`K!TcW4QgiIalDlv<9^L)AJ4rK4kpkDlp@K>-z|H*S@=1QB{*C(MH zTp<3=`f%I6^(=net(BHPr_setr~G!rmEQYG<09UH<=!zU#^_{%u)J8G;1^@o{*{(j zIp%@#1&in)de-F&KoigSqcxY{v}q_Nyp1$noF!`BeXEWw&6(v8isH(Ayg9M*v4N2qlDu10s}XE)dv}Ab7Fp zE`H>>h;xB~Yk6s(9|lDyk_zTrMd;||B<_(Op5r^|YXROO2%?xKX!s3PURu`cY)=rx zJ4T;jJifl=ySX=D$C$yDXJl@d%!knPbhQBbM+EUE4F<$TOpNr0w@dy0`^A5zaB=j` z6g06Y4rIJEpHuzSO2Oke8?GH4cwrW!A0z}1morZCwryO5B}74Nq2)l|Q|e%C^R62~ z6QcI`%|)o#-fvDhl>mLcdIg(w%H6L3mV{6MRNHC_at>H^6&ya=Sq z^sU@)Y1woe8@wqv0%@IW4%cud$Si0l;@6fMR}cxeKd|rCuBr1=uI7^@5#mr<^(2dX2ZfPsg| zzc<8-_e{Q-pyukbPH#wkuZUau;AOBEOr3qHb-$O>`}Hdl)B}P&sT4-$wu)!quk_?OErWyTgOLz?X%wVtI;gZmdy?oZOa0xeB3% zXEZ~esY!wY6O`kwQ*8G`uymv|1JYwjS{w>N&tqPDA#pzguorEUuf^u%7Rhg zd7gZ64P)y(bkmCWLR^0`{u2@J!q53=jjwOLjUQpyxI}AS%)Biv{C1?ei^qlJJ+N3$ z3!iZ`^1@=;N`R;XdstZ(!Vh%ZXh>(@HN*UsJfikhW>GSva0g1(C{K?9do40}=w|0* zDS}j&0PF5=y)gU>TAtLt?+qr##P69Jj07pj-gjVM`4l~b=hhuLYh5T7+&X>&H_Stk z$vjrkI}wQ-E1wV9|0_fi_xrNvy+-l9*TG-5(86c|9&#(;`bLDH|3C0tjHNkRrXMjl ztn5^CT^S#p_{{SzLq2?KFUgJvOKO4F2S0<^VyruNIDhkha-Pxh_}yQex;Y>o=UtvF ztAGywn2t%Uehp~0W{q+72;$<%iPm@oLvTJ=Y!!rH^Evjh%SX!bKk+#9h68j3m zZ_@le-+9j#ruo-zoz9JaQdwMNQI@&*_=rIp?}fy{YoM1XF0S0jh70}4(QYpjv2aZ` zBYrP;=tzZ8gF0kn-omnLc%pakn6?Nls?(M1SiA?VyOXdl>uvdhhTTYe2DIn({b<-!E@;M z5QH?rqZk6CWEJq+SKTJ&P<;y^S)7|Ba&2?;Y6evZ|@}p&LGzvD%}0 zm3hAPWtN?l*A0J|!gDKHE)To>q6Sp7W{E3V0*NvQ&X?+M%U@@o*WIoy=1S?uC<%92+{a~~d!IAm3)AK3ahNcRk@suNb8n|J@HIl?1Z*{<1 z8;m05a34;43dC)%zDM}qgm)GJv#rZ4e?f6xXt#etpDn`gFU32LpGojM4wIsa&-rPC zod~1&hO1cR5Kx()vI95>aOA2wHGcl}@Q6NBM7cUN88wC!WSOXB2WJw_PFVkjilKQ; zM1VTHGZ%OdqAfzfvv?OJcJ7Jo4`O&I1IxCv0;0h$>R>b+xXN7NGjm~XF7g@3?qqmd zjQ=gqF!ZN9v%$L$p%Dz5(5?0ny9=U^&O`qy|Ic8B)B)0;ujrijB=0fO5mp${0hu99 zJZ6UiU1SKM%u6ZSw{Jt+v&L`}u#+vynNy@s(cF?oj!J)gMO)dSy~Sz^PfTjWMZMrg zLu#mOUkIapa+2Fp{rs*BPXDii-6iH9((DVmxXD+wyLcCQ_MHZfa5$UysPUYZ`THcj zpF&>nsGmY^51jrHxeU6EDtbYdcZeKGCAL(Tp5b=K!nOtkuT4ArJE#w#X-I@!J`GIK zXIS37{CjY5`di3O$9-9QxBQ~kWP*-Sic$i3Oza<%%lsV8gOr}d4-1jmK~_*}`vS0c z<{Y$A9cX17laCu6y-l4Qey01)#*X6~xMssBtKYuH+8pb5@PX5CehOg}OD1-)NVvtn zO6Go1C^_!;eVUs+R{10-A%vUS*qPos{D9TfHtRq`<2ST9cs_*>Zg7d)rIkhaL3*Ct z%J~mGgD5&ed!`+sl_+4E-eGg+D?2NnB_hxM;bSGo{xsv2|&``N*=0LD0OrF zuN(@^AG^S9U4h%wUh|xi2JWF#>?ES&%`wh#VGetBwYI%>TkFEx?SM6|Z+StQ21Y~R z*LC)D@`Ev*O!+70{sL>84>aLMJak)*$5rxUgm4?jEe@~c#?{&MmhFUGUt6wQJA-5i zN=pYf`UWn{FnWJKj)|FI-RU(J)U!Y7i%caQ}LY)ardY$Zc*(fdSPys=~@;4PW2zQu5Z@;Hm_

OVf25Z_d8qOi>nEU>8${HzlEMiqx6-HnfSX&FeBO!keK0b7J||$<%qB zKPpy9=>1I8A+K6hxW5f5^zUVLtnzUPqm_FA#@%zCDStrQ0>Za~_ZY_;(gjDuI>piT z!~1zKy0TWQ)9Bmyczjc}TMNIG7rc(?UCv955@P?=%WDCu;dQacqR$qNO} z)tfmE5}^Yd7ecw%9~=p$3;!MsjdJ>w~?_c)b3bN@}-(i>9exXkSs%Lw7m8zMB%(1}mjWGK}R zyvu=P0_33}Hrr6FrWOwgx{M|8AKqsNahU7*0%Px|{I;gS|Q~s@j+m>`V*K{_KWWriY!oEJ%1XRF`3Nhb530d7_ zN95w*G^duJVX_RNWMDE2OFQ-XAN?w$KqCa@+sUSv~pR?(mX83Bbb}r8^ML7!>A{-WPDIwToBWvk7fO%+#7k`=Lj(O-#(1_$NqbCbN>!mAQRJi%$wmHPphe zJww}w{hGX1fm~a}w?KMmiDD>9ED430o_Si|Fxv%>7fe?s%y9}@6a4kkp6G{+6+Pwj=5VB)9h)Qm;zcINQJtI}ZHZUZ>~F0L$Ls1c@FOBg zk?zp(?6-J^;C05~JMHYB_xylwCxE;8_?XLTS&V)=mEAUbaX^w5Jf2yK;{tbKf*0E!Fp*=$)>|w*F zGRj&&-Pz@ls;gpB9_*KRVc~Mg)p9-;=1XN(mkML2#i$n~=K#-ml^Rz!-p8SZ_R_)K z14{1b?^uDJ%Hli?qo7#C0H~-s-;c~GA#k4-Z?^F>R)%Pf-jU;Q6*U|@geIqnn++;M z88rZ{!z#Y0YMYw>Z?2%6+x~MgYDMhmCb#WtksC8! za923jc*nMb+q2;e#Y74yt3hlvSdU=12A6wQWTcp;rb03QTiJWE>&oI7W$5CNyP#72vV}Gv-ra*^EIUDgB=CkT<}R_NM^X+>*f5QW@h};l;CSscM0jb5 zLZ(xaF}}Qk7JED5!xSZ93;!pFfu0R3sB)X=|LO%B>qm09hG^aiCy$E`IvOd%1&Tj% z_**NiNb7Od`g7r>XU}RuTvS3y^qMeLP4@_?y5*N>{?$Ga?#kMlDaG7)3+fC9ZkQi1 zF7pQo9^8hj{rwD5*TLvt@|IWEujxkqRm(@;6g@}NVvy~O_&eW_YylHj5nRK=XIL-6 z6{w?k_Frh5b>QMx^!xSABoWEO5Ive;Q0^yAY$EyXu6r~C14yfl5^uECg0*z^B@U@i zd&y5t6(pE0J!Z3!+yVI>}^`c63JHck#+?$u^ z(~oVeIa2ymLuoKuO?m4>ekRvcHx%#sv|J z+50e(s}8m5tQ-Bs8N71nTF(L|8z_bm1C@y5=ulT`7_iLE4sgq7`FwbK4%{oqNx`pc z>F#Q0Z2kV-zKo9F9w&z#fJ4Z+1OxIz=rhw@+{**57s{5{x$E=G*K~H@tU2ZYWB})s zQQ%umfOv?KL<-j9Vbm)b6)?3@jkT<0l(+g#2bllqZmIugryRkn~a zhJ$g>#PWpZ^k!vphK}9;EX%Xs5sn`oYVB<3(E-;1A_pn1%?-=P=7+cv>D2QjFrWkB zC9lFb`L0etxox*{rM)ocodj-R?tmzIJn#fcmxp%?FHx3eb<%etXhX*Z1k}08tPk#u zj82M7E06gka@!?1LgkfUb|(94h7!A)pOA`aT%C&=e|#VF^r3Sh=1iqoHc6lu>web!DCt0I4D|S3yD(2zfGobQ~A*K zFFG^oIG5LK1TRjdh+!5gjwfOdZz4`jn(7jI3i>H9lwk#sANF>!V-hFwc z1`Z>lIMEA2otfKH1&ZtKSKz~6(f$uBVYvHpnuBpFklR}#n$sE#Q&sL4RaK<I}l25*?WCCmNB*T^*3+Bak3HK|10t7kx{)*}J{6$Z~QePj)J zh+NTT>G3dUooFFx$du3kS)A$`I>~dv~jBii95o zq&c=P)IcYc1CUOYM2OM&getj~s&zLOkoSzvC3>m}C=E@@ZJn;+4sA}z%d?&>nJ8Lk z0E%LX>6i(A!i2o}$F4Tyk9$}k7IcI@co<6Hj8^R+^|!mIp0LJD$oDPHX{QuY#Ljb? z%y*4Id^CKx{_NEPLKVQ6rWx-#xc}GvF5al;WbwW<>iPEwqZ_I6V%ZcdsQil~VlJ5W z$Er8%f-v&{?LCXXQzU^)oMrGy+yeSYUnL>bY3OxLpuoPZw=HB~z>4-*60retDIFLWDK!=CT&jD)VT=Fnl6n9$IF_PwKrOMU8LDUfmBqy2gJ*edvRQ6#= zIYYynj?&eotw4{2nejkXhnkAzh9!L8EOPd|ZUj}p2S=-8Z)%95-Ct@JU?+}YfpP4x zO$OjsfVsd=xV+=1%{rd{0M=KCxd$b`-tm-(7XOd`sM>VOa_kubX`su>FJ}`2XKMZy zO0`nX0C}a7G{?&BIP@k8UdOsVgwVYYoQvQ_pG`Moib%v{>#?THPDMyZJ0T!fDjWx) zUiXvGc4ra9yygHWqGNwb?Uv z2rN-KX=0a-puuN^Esr%a!`DBNV;(R1_?@>OPv{v5Kw;H1l1IWE_WO(q71|B?DfCPl zbW}y#Gku}BZ)DzlM0B1s(WC%j>kN$L<8KVKk=)Np65r%#l>3VG2n{?f{>7*E5PCxr zcOJx__<=j^^Ksl|%KRMkbHE_M;;$oI4IJ2gX$-_@uyk3WkCV{v{)H;ucnCoiOb^>r zjv4=+_YsBsk$mbup6@tA(?4i+{X-hdLr9E+N6&(^TgVaOi4Se0pnhrI=4iLxS4*VE zBzs<p|6}raEgUfz7ku9*2i`9~1x@Qxc8ev7kKmy)ehwex3&E*XU z(A$HJ$fgJY=nx?*{YqMz>D6OBTe-WW{kK#NwB$X3a6Ha*_d@X8#_Ulg%q?B=mc0>K z4?$Z(ly|0>)lO2|%>Y|k!-7>w`PKcBp!Zvc<_pfwgsw!a`+S%~?Ce(>d%uGXY4}|rs z;#-wJ%JJ<95yE4}J4S5+Rub~H=!02305jiC3x;w%{H8h>S((!y?wjM)$1Sjh(HW8= zz)B<~QGTB~4lT8$1Co&4V$c#qsQBD_7E`0a)a1Gd+L)xBUkK~|vgIcTXwU`e6ih3Z z+14f#T$s-kDrXorVx=L$2Z4IF|5POIKhrWsooFmeIsYW(=mWA*iIM{J4NasKEkL(<8%Pgv z>6avKGjyFT!UYCoq|0Hu8yhW!%>AfxTQ3U|Nvm4TGnPFxja|70JP$r1dn+PjRKR4Y z%+nZHDB*oEq;CHN2uC357BGA`lj)cEGoRWfS-h*8o#zIY#;jztUNh>f6C@0Mhpq`1 z#;u*!6%B?WW@6(GiPp9-405N?uhLc7BNaU15%Hry;bAgzV#6c3&1R7?r%8K@kdLpAEVkuPuBs{?rP#{-DEz|{+xRuKe`q(`+eKvvu6T61 z=W%xtkR7vX2G%^eaH%Hz`qREa$-~SZul+;}dMY`SqeGz`9nSN%p@c!e2 zlGP6yO8;sDmNTt|XU(VZ0fSK&U|SR=Mr3J;3zYiEAYc!V`u_i44K8x|4jgGSMmqgX RnS?(XjHK@!~E32uuMba8iw;O;I#Z-4jh{yQ^!as;j^H`j?853@Q>45(ESUs_ZvORd8AT-+=%J{yt=vSpgR?R$_``5D@k8 z$ZsaF;B!bfRT*)J+9~1_@CmuuH&sOl2wz$Vh~O{?h!^l*!N(8~9&8X0r^XNv{234s z_|7@)-vz-J;7sLZB*7*4^G~892wWgKf75XTm*4*9Aw6m*3<1GADk~|b?!9)=<>ODR zm3sWywV3@FP;b5(N3xz|Z?#2Y6+#`h;)>Oj`|7rY9R8p+1rkJ&JC1@|4+{c*2T-h!ezFe{% zt(OSLF1Q(FTL4K9=}!>c4mr(?P6Cfb03j2?U<|>FNGvlGTlD1^i>(`6y?f=!v_h6t zdz)@q^Vfj7OR+dNv=-ztG>fQ^%HVlOPTfEV`!=&PjyEbVIY#d0ZUv`TmvAlKt07BE zr$flbM(5uuM28ab4TMhYHezk~6qd*4)d6&ONciu9@fdZCg-T8$YxsKS$a*L~dXTSs z9#vc$EMHPpTcN!mc%akS$WSZQZwIU2R7I>D>o6!E`u#t`cq9H@V_hTT^vJalwDoi; zcc(tNupc-;o^LKih?nSVLF$D7jD=KqtI(M&Kp8NqZTbj`(25dn9WJB_orEyDFjAa4RPA^NgCh}w;d^^rlI&6#TS1=C48=A95PreU`c_o$ z6(n`lX0QOdbabf1lKTr~OXti4JkKFhMJoC2ViyK7P!FqX$1_qyg&ikiu+^0{k)VQo zKz+8g1$SHY&)=F9z3)J&AB8|g?$;dlh&M4|Y>`Z#WJKi891?O4Hqr7cuALCh0qMwJ zaVW_Mkx59p6k!0pVE7Ot=q=SK{8q2WSk}ibBlOTq<$>0IdgPeinh!q$_ zc~NpmXJ6=bTJvsW)79E*Gea#BA{)ba8MB zaMQOLS^6~$L&_@QYC4Iz@P9e~1j~dC|HRo6MD|e}`71V-Vvk)SdK$$E<{9vxEbGK+Bh1qTorq!-5zX$@5#E*lG))N~`MhgiMxKPQ$^X?36jCeiTF zW9+?epVTkv5V)~LyX-R_DGFlgFyH0+{S#z4`=F{SSQdvjMQr*R8N{p+;=ki%9pe0pNPUEgB69dpXyy_c50v#rf^RK$2Dj0(am$8Yg?G`daoXM7NCVx zkHc6q=C;$gt4e{}=RoX8nSWH{_&1n<1(pJ=oAtJwP;R>$0J98|*!DB~)W>caO3yP> zX?q7sjX>il8;U>vb9zf$H&yie#32dEpwM*dtWEyTQN)@zmmv|3Ojt>%dv!Btrx zfU6;HE_M$g9ofqQw_Br%!FD68wJ`DcnLvW|BZ|{6-{N*88*EcYQC!5ZADG_lHN{t< zT-aZEjq`PkSpEClSVH5C!^(*-)M;ogi%ctPJ3?^L&kJ6LvTty3DTar>#h_5U2bz_q zV`ZRCWODr`)U+UcoD7%;>c&|Jp2>%?qoa_B=5DCv(zS@Y4w6bxQ9ThfI43c3pt6!CNeUyu;6BU5^&7Lro&xmP^BBv9PIERWWhmycLiW!t^sCkDcfx> z@Fk<=EqH{DhnKbF?T**}-XF6oCSlcui$vouu8cGetKAOmG=Xb?&RiavF86y!jniq?U=!tMrxB z^nmKBxUC*BV4wL{ub4S~hC@8#mlUP7x&3cCui6)yb8D>Yi4AMT9LSH%oCAjoI!!)f z6!LsQX?6-($a32ib!Gl{EGZk#ob{uKzIiWj0V4hpD=RDRYnqU(5c!}BpFbDZqcjeb zZHGZW!;{Hsj4p?0JfVzwM~WKyDslP_ie6r_t>4F$fwzS+*9fuCqkG2^Kgz8a;0iX1 zTl;KCUO2Bgkn2QhG$#97H+nhj)aIKrAX~F=TL95`N;a1Z(?j@L`8nh(ff>eD0UMm{G?e1w zQ)-Gg6Jy(c{nPv{K3TE-B>(+~Ayzs&$?q`ZH|M~$HHWN~%bY=(h)n)_xcVK6%Gxc3ej$ef8yF>GiFiqlQC`9dC`ZgJ zyr8Dq-EFo0WO)vJFIlLLG7l+kxd5zZ`560;80ut|F&=&CGo!#z4fHF?=)s@){Bgp< zaHFeqG7cvYQH`;-$TAi7jbeN@RyN@R$j+}-id9+tMklMB(W@rSJ~dMY4MH2r6lUyw zW$lQ>{J|Z+Q-=J=irfQ`d(}1uq$6TqZD3moRwz>#H+2j?UTVL8CdrrTxPmTibm~zS zwxB-=sj5V%dszSLFiSZ zi|rXjs=;p~72BA~n$z-%g$a$G4AV)&0Xr*AuFx03YssZ%hVYK2819}=c&^V;qirSz z3YQ{eK0p$hnnlxw0+2r}xxxN>RVG{4e5#PWRsX4Zc9z5Hg0o1jO#;bjgS8&#O1sXh zZamALi}=PcVhdT3c>q)FlTg@<&xjOopqomgB~$8MIHkst)m7;vCFqpG>S8uGldi^meXj<#z`qgmZ}MXES3>E z{T8U7w2c(pP1%JDx#Aj`J^lPP#?kZq0}d>QVbI4FAG3)RZ}5iwYP!<%67ec3tudoi zk>3;)S1)uS?V-{{Gz}it4T|NV*JvQm^U`o13c5jDz_eO}>4^A%tRXK4DKxYM-i;qo zQi`;qfND*Zve^XBFH00Zop>P6v0*)5mpGaPq!1ev&|XvQ4+S;Vs9wE}x|gc!)sxz8 zd`R4-D0#y_W8X)t!-k#&6>Qv?K8j_2#>TD{E(W6_oRZeCykDrvg9NqRjh~tT8qh)T zo#^n|<2(jarOE+uS!a&avu;QM1!Sq;ctNN8=BpCll-RW!0o-=_@SJ^bG|mlLBvZ*G za}Bm07L6gf6DSt*_m2ei$=Fss-Ri1}j9X$uMGDP5vhL2o7VDSAr)yuX$%MqskE^kp zvSEr&XS3$g^N0|cE2&z_L6;7OhA_Lyph&hf`7$X6sRLZC`V+PM;vx^Ko4w(g$m!4p z7NRNp;Th0Uc7s3N;3>@a94QS<~c zbT}T9e^K$>;7KK55ATiSLNXHW0#E~|Pm8f;wphY?MTE+%J7PB*ywTM?`=j(7Q~G!; z2~_m^_ia?w>itPivHyiH^wKP56=y0pG8aj;D^ZOtva-$uRGD??4>~9K4M_16Z00%V z1mbRtvA>RRQ;tV+XMWOwH40W#5BIFzB_&e<8N8TgJXRl_dMp+?SC` z%z<6KL>`#ta9W^o0nFkq=Qb~8mgoRaS52!;nR;mbfoWY?QGnwqY}l3=t(FR7U*%;~ zy`}w5h7yE_9O{)t*>?lIif$KVaInXp32(SBviFaq;P4jcHSln6C-9xEq8`w`vC zt``)5x{)91D9b21oAVrATVjmjXbfY%`Xj4Oe|>gLyl3U{l*8`8^BvO+n@wwyu)X+Af-+ol@Ovs ze0rSm-jYbEwzE8M)|&aD=9%3>)O#vpHx~GB;pbM+EL4YA|E+lV^Ou+d=1hSCoV*5C z-H*3A>$bZMYNb3;5rJ)lRE<}QG9=3`R>e9_K6OAg_PiCz#c;Km;!`6bEwr#-_Iq0z zLG4_*=|y_*j-t;T3=;-5!!OPXqE zZ9=LIQSUXct62b~qP$aOYE}QB@(IXk5CR z7@Xdm0^cDg_^MeMd(E3wxN-w-=*(1(w*;$zqg!bEtMoZHQ`dm zAkt<1U9xQCR^yKVxDCyXxQt~wHOz`Rmv(ancq{g_VSK`;##_1$>J~pZ5i|4HPQ9gy zN4~)bVM)h_#Vk7`2w{oQo-vP5mvac^mYtPRZ z$@8p7)$Ika)DsOVRpLb=?$z7sFVw2s1!PHeEC`V7)ZD0 za=9&f{&Mdc&D?%NMmor3Aq8C;-Bk+FVq+SqebfY0;%u}qQZiFUAAqxK7sADhJ{$2y5yGL~$){%L zGwD=Pq@XfU7v$@d&n*3lYDy$N&zXT*eR5Qi!M`LnT4HBo?}v^ZiH>zD;J|}=3h{nZ z*vx6otUXngsP%oGlD*HT4**+Fins&;1%-5hD zMQA{ZV`S$PoK+c>?pE6Ux&J{%JF_V3??2&4bgn|QHLShRM&4jd6#01+N2$@A>CA9N^@0Q`EX`g zp}%{hzm?x06I1LI(VSNSY_0z0Vb9OJzbb+g%~?F4>FBf-CES%v6kCuLsrb3VRHIS_ zNa=*xrv`f8J&omqcV+Cx18*0g_>7TDO;UFqw++$&3=DRT76);|-?8_oUzEPU&Zfv_ z=W)W$tS$cqT)+f3kSj1mJM~NWu3)JjiBz$4_%D;CS1UNnEMv+QK-Pu-utO9kpU0dk#>wV@)y9Tp) zRtM5fv^&b2$Q~OdG?W4?C__--e#N3-e<7u0XOD}KisjZ>>D4Emv~^SyPe6bLBQK4+ zg)%e#!qP@QquzmpH;^S@H<-W9o%AXdv-XCb$b#jpzs%0SG-?9Gf{;4P) zC0XforY1OHjDAkdArpw)u7I{R3NR?u8Y?a2e9uEm(i1jA+S6`GPrAw+GcHBOIh!Mz zR|o)P&PCE3X8!v!cLX5gA)*lm$ThV_UZ1E93`-~0BUlorBULkU7iRbySrZl4bxM9V zPS3PG7&6wjahx3M>;qK1zQXA7!FxKnsb#WhqMJWrs32*XU^0>Z4QT}?c(<}=r)CaM ziKfBY-HKTiG_^3Ob>Nm#f17g`G{~}T$TH?2TSlvtUDxGuMbfl^okz4!3b5dk^Eb}` ziy-;(`ty}8Rv2KMhE;vI_d}dvrue&3;NBUvxR|E!J$-Gcc(v9y%}Vc$S7j+kbCeHTmmkZfFxFCs6?wR&u_=M(4pyyZqMV` zr{B%zew7>kv4@lcbCnvCRN*?vXS4M6JB?w=9@u>IRycBLSQu##3*it|VzEQ}vsCv1 zpB)Pup75z!h7K`lntyOh07qGMIZz#~e@5ZY2RfHiRokMYtlK|L1Pxj1)izopotB&* zcNWcg_-*Iyfw>W$ch@n5TxD**Lz0*F%6e1F!~WgLUSz_FV3+f7ogyTvZAiku%u0y$ z=PA)v8vF#7uKms{I1<>R1n~7n!EZ)a0cV6WRp3tRyI7by|ClqEff#!aR_hFXlOGE6f!Z>J}f)tzRPD%nE}YovpB{Nn+qmX`vw@Cb|z(%w98ekmz_f zI@JI5yTTYCf<+s92~jl)^X(l~Zh5v0O7cYs`$Q;K_<)BJX|yb$9+cHCTyb{)vF$hF zodcfiDfD&3%HUFbpYqaD`SzHt;FCi6w+-*uQ&Vv2bQL#huE^PE;)U5A2|v`PzR@BX zKV6eh!YFyx92~_&aLJIL4+HwaA*gx8dl;&XoD%ixa4qmJUs(BzYAcP_uJ$>OAN@9KMQX^8iI`9kDZNG1bpmiLKimqw_M6r zrMYx>*B63PQK*`YfMz=v(ZCgLh{7!`GF}k^1YjL_`J~mwIn#|bfBv+ zaIKau9Y}=p=h}}>|p)~Op;S?7-s?HTmu&G}k{&s7DxlW~bO%g_gOX=E|I!Lq{W zsr;{}M}pD8N9yGJ>)Zyr$&h!OB1p^lEk|kI3{(agIbAM~Lu3jPOHj&*+aZFOsq5TK zWis|COtxTkrdBv9BIotnG`(SSR+9WO-=KM&YX|pHF5|Ssp%WH;R*0pa*}>xS?xVMC z4vF*6iY&7VU(Ya5uQ^D#$^z+9-VbFt2ikb42`_TYoHoO9wSl- zqE)E60#HJ*@x;iHSa5oJ1|)?HwhY(iG5YJ8i0%iglKJlpCohQuJP#0^o0oTzsj;&lN=KXLkgvk3w-p5sLQAVlKC2 zz(516hli47ug5fiXOaot&k%%^PCrP`DfSm6k=Vs+2V@>9`Q1o-<&8ZrBBi6TM0;8TML1MGQ?k{Yec0HJ21ms5++Mb;9rmZEZD z*7;v|Ut`_qtU3x4xwh}rrJ<73_lX%u+GG*`LX@FpPIbCjOr%0E6q?9rG11hzXW5TR z#1M#O^J*rRBMg4jQ|RdG3zLS#FjKvC+hA zkwwF%BVS(wXd3j?L<+DS%P@=$b3pIE2bG0TJuq*z07Jj`8+-q($V*OXc9gvHjXiiJ ztbo&muA9bf`v>KRSegneC)cULjROD>${Y73HmR9KaI2L_@d?PLaT{2Yr%uAP)cSJg zGgVQmXy!uLoRlfU{>&wjjF+xPXMGnx500huO>#`%dJdY*(k=1+89o7P6rBJAPZmJH9YV0DDMJF^LdSv*EO$F{~IR z7R5|J4z6D7UQGp!Ag{5}sqabN15=m7u+nhGj|oC;3VP5CFilTQr4>cl1#z~%ej=x# z|JLT9z=fo$?Dr0U%lf3oOXZ`s#+tOwf_Dmwd){w}Y|bd-q`fQLRJe?HnY-L3h_CE8 zk&Wc@o<`}d$7me2dX)8-Y80r#k*h8~wB47s@#@UButI#h1{N<2UGGGp@DIJcE~KhV zJ~59m^stFfdy!)%eef6*35=AMet1WN?N|I9{A}heUsk%0_nyL|`R6EYI9 zm$Iii#BHU?7%Or&DaGq@luwM#M{}qcqH6`xks2Z!_ff90B{Z{~vxG*+1qTr|$Ne~0tI^OZ zNaHa{Ns9_v&s^{VLk-AB!6OP!;-9@?mm^B2`s?^p51@2UzrJaILLpijYKthj>hKAX^p4(1o-lx+IT~z}Ch^Q+8GQPw>3?L=Ov0&w*x2Co>}3(9-`iMh z?^KStFi7`Ys|2M^txdmNdqVxY9>1-MosYalroQvn`LAO8ilO?^W8Br!Y-y6zG0uNt zz5l2x=><>89zxqMF@D=|4Jj=_?y|6-U0A3VF98g(3FrdA&=hKtWw2v;07Z|=HsEIL9k!T8euB#qwv$~flz$iSOCZgkFslA}pT|4J<}rhws-Y}`vN17u7BX{r|t z7d@728bb*1Esy800`Z`whIXk-ORw>8lfPo_!yL!h)tnRYnavZ)v)m3Gs!o6opfuS4 zg?Ad7i3rcR_A9(UfBiAM^4FYB8USKhb1o~lV9f(u}HD$b(rzV^0Y{cp<*v80+YRo-p(m<|;3~G-X*OwP9 ziN?#O!yF3igjZH%(KRtSlou+_ESP%mn)nB||CUiYjkJDs$Jg%qOoNH!dYb7(rRK-J z5249sxg(#(v-60Had{;_e4seTis81&>jM@a6Nj#mXc`R*J@R^C=}W?iEL+K+v|yVt z?$muDheE)-s{;e!hln!g%`WR~RJ0gFf6C8c4xY7>h$%LIo%P)H^ZKpox$86laoylw z$In2%W-9}&)1y_*L#6z!e`{tRvY}Ql%no-Ei=x4E@=N4q-zod8E-;~jljWlLuEYea zj9bYrqAzW1_#JISwIINLJqCVG9Kho+`* zMXrL<3Q50}U&i`ELd(yAqKgNlJJd~vILv=@MM6lf{-ETFJw8S#{4gBL)}-_oHm5d~ zo0$yTDBi=1pa!dcn}&xm1B zhp1sMzF_`DR#kU``5=HXKYyaNz=a1eEI(ul!@uUT%-XM^8==6js3Y}PRiHkD$#A`e zi6ebjK?WDA^eGub&*}Kz=9_&@iGr;gK$mIp)LxTUcmU`Q3(m1%?ps3ZG zWri-=Aph(Z{*3j>>1@a&uO7=n9Z2ew+V-%q z2bP$goA&z1Ox%@OYNop+A800=;b0{_roGpvLax}pG*m+Jd5P|(x4hM8^2FLamdR2{ zMxq1{i96s|MD17^rHu!kUDpo6thc1zpZ zwy2$SL-Nb~CcBlNqJlkLcGvom{AK&rZszsqye98d?$Sm9ga;4bT^~F~aS;%yzS^zR zs;!wQinI}fD%Cepc=KO9@_X zk2orrIFgb#60aRb#)gXr#+sd)l+xy{<9~g&?WN$ANt=;dFfQz76o;l$4_VOB_qSY` zT-)dFavUp5w>CFfrQnUVSu*HAG?>YY8`0q2{P&DLk4YSd&WUn_M2c`~DeIL?{7ISPWlUbFYwdd{*SbWWyeoV) zCd)HLf)YD^mUQ_Mjs&Zq@;`7q3-ql4qjBuU%_J=7XM!e*fu**4w3^*#q*EWaM=*YV z=eVsjz%LXL(|bTpxv5|WyQ}#SGP7}(1mDmQvUiLF7c~#%FLI*oriP?TgmnQ7{YV9W z461#c;lH+Kb56g{*m(3ph`+Vf>@^8aODG3T>645+{}`m$PCo=tz$BAg#B{!WsRUDp zcCwo1k0AFQz~B_Kg?1_$?j%d~pDQtGL*EcltH^ov^E+{uV?lJG;(eTz3zDwy#`uTg zh~fp25?~xp!1@4pq4THVdQVw)SP2)7WKlI2#IVO}4ap{wvGDTEW#nwNVzB9$GdckUZv}$Af z;I19$pr2s$bn{9mmh{(32TX`l6UhbY#0}28+*F9-m~x0w_Ls0y_CRM5Xpv1t#dSaW zjz?*#PN~zwN$0!de!opi1Ank0Q1u*59^TPiEUy|BI{!r^dj^Qn2MQ0XP0%Al+3U${ z5nOxNOZAvD51lv#MQb}p4WS1Tcv+-!8wJ}KTeJYG9&V;!>?*BDmsX=yRaEpQErRZ? zjz46Tf{yf*#*N=V%dH-dvC}tPoMYlP+F^wjLAEyYTu=tN_ks_oV?0}O7w_mgNpnZA zOiIqw@n&}N4-@^qdDH6F)j|6%M6G|Nr)xji8X6j!&y=}n0s-;!V7cJVTjGR8uBSmd zuYT{-!u=~B%i15k=->agGh|*TMK1aa$)kdec@kF(c+wv-XdLOR_q@1Zf8A6Q~f-X4<_^RSg7a1SC<<4Xyc=4;yg2swe9x! z!#KIHZy0?N)!(p}QD2nd?jHQhIn{3{&@;OtLOcdz@4mt7!R_iD7@;E|!m#zp+ek7h zFmnGHyF6;QM1#N-Tv~sFE<6!|{$`~V_-;h#?bxbT$0HWt?kBUA<9U)-!~AS`*&+Q# z1#Zd|l$+7ok(gA0JxuT5Sn`nvfN~-wpIbLmr;_y??QeeuG9r#Ub>x1@f1})cH7o%q zXgss15g>!W#H}9kM94?kbg5JGGBq`q&r|dMx7nwUJ zD?u9Ddt)M>2rThE`IkYjL|xN@4k=Sj2gnG|ZR3N=J=}tIF9eNgttcx7RDquA=^nOV zuvd3ZV;<(1|0B-Rzxjbns55!x7(q>DQ$gfSu)5R>k4Q6yMVqJdQ^e)L$Ui59OlbV( z^Ph&uM zwkwK0A-YWdKxXu+f4Qv?ni%>od68{9jrmr)AmO;c8(A<9Rmt=04&i3DrMSy&v(EVI zZ5k9Z&~D&rOGj-9_AipU)n)Q`_Mxp=rN!puM*FjXu=aTD(@WQ%!~~xQCX?*dNSY4o zQ-`en;nqg1GI?)y;_qGH7TLFz*Z5!7++5b~5?hJ2gJl?_U&BjL&3H`)D?BM+W@j| zY$vy8l@1>4O4(4UcXe$iwiIz2;dSYzJbv<-b(!T|&4N=``b@=tGwi%FJ-S`(Bt)#n zlfA`wdUq6(lFPG`@R0ed37vLX@HFK@5cqi?*{_cO8!3VS4|#=^tm>=KPYfv#>Y*K` zIGD9D0=~D>>92Ty%PW}MfFU?*5o|Ws;-h^;ffOch_R#g@c8C9o$;UpGo&Q0QEQ7|^ zO9cNROaE}t68FL9RLO3n!(|NV84I@?zm#@~|5JAxX#$&29D`2)w4W%UZs;d8zIA5^ zega_D)OW<(1yVI|)3kC#zgAeTUIQHcZ=)q&UwPj$KO;WNi!Bu)KI68Xz)HnuuD1X* zl!Ko;Hx`13rrL`D#(1z|MuB1`{2shvnfZpVrr@nG2GnPEWWubq?>fYGXxJj!p#qT6 zLf}YHQuaD6)paocgKzn5kuFmZ82?BoA_Zo<(rJ5a>w$*X`Cp`ud`^AFi=e?ep~mp9 zZa?=zNHaTswFm(K0ApYmwOvzbd0^I~+}i;6b`kljtQ7GMIHj8sHm6b5_A#&Au=5@S z0>uY@8y4}8o5}1xF%BSFkO8+lJ+M66rxJ8|b~Nn7w+7{yA_v+3LJ|_BnR*`L3~>j6L7`GD%(S zwrR_`++ZFIy8J@VHxG z#`?2p-?-aZyF%?|7hxYdCuS{Y8G-!6A zS`N77w14RrF}(#_o8Z6Ym@B_UAbNudD%2;nO1|USv5|ZB;#YYz?O+3{kn6og8de4h zD9~aCExxM2vs7dxfzLlFbFRMISF+Nb4Tll!7_cKcPIT5??{+X*jJ2RW*&%J}yMLfZxk4#({Uy7Q=6Ph=JFCpZq6tSI~V0gh(AW9nMtbA$VFMy%B3nY;BP+n9w-Cphy%w|##1yi{oN_0q)lsn8X zd^In;b0Yj&u+g7S0uF7Ig05_!=;FRCJ|xkG-y|XvYo<1-8H7f8OjfVo5ZG;XU>n&W zT0MRw%x`_rs%?zESB38tqd|N^`WMy|*FCZLB;2JS!)XU^u#88;n8HinN;RsH(a>Zq z%O9jJ18;Y77dBl5W)n?b9^Znyt@3-fd{QK-P1V=3P2MwbCurcR4Z-7TI1Gu@ z3E299qoKw5w#&-*zF`p4Q%^=1uUw`9$sgQHZ|Q8Kk7NAxD>Y9`b7nw*5H$;wX(CN%*|#c7O39T>Sck`J_x_H^PN)`Ig35 zEeFqaotm!Zb%9#leFdqx*|oTWvX`2E9B{ZEL*k7pM4X4Xz;-R6Via?F^N#L`%3^~J z`if5sWLTYVC?Z}!+g4_`9Bz(RzXa2A2xhBkKwrjT1HF&)5NF~%+!}6n9%?plyVqXL< zOZVpd3(3qDMH~6LtVjc15-ITp~lU#Auc9C<;yi@K8z`C6cn5I{+hw-8wQ3O zZbTu3h@=oj5vYcu8T5yUjTQScUyg47T&JacSJ9JLj8I%KbQAJe)>mGPh;8dMq_lb= z3xAq@9;Na3m}xKH9vF=|g6L(ML4b0@jn zHT^k^;O@ckF$6jE)H4Jg@9v%%p^V(b^KlBD7Wu-8^HdFSwN_Gm+jp6L_@quM*J6kIGq z3QU=6=ir?qg9%{KcqQFeGJYYW-(#N&D4IJ5ACIts1DJbf+CDD%Z@uM2&rHVn;(qlP z$0xrAyPuG0@VUXgHx?FRoU|jg!CONwK}$8hIQwSskmF@VIR7F4cgjc)GSCn0C@0vt zDf+X4(7OI?O&Ovqy#-=NmKo8miTj6<;tqp{aT;NmRO5mMxQI3y^sc1kpPg6S~&< zr}o_i3X!EYTR>R{pIm9kPByYXFp6{t`P!DDYea>l>(QtE9$cz z)UBA=xUWH(qsX?JwiMLp)j!T{baoQuG^|5CKw0}e%>)OjMC?Uq!YBzs!P#zG^5OL_ zTzPN!gFln=AeEqoLmUhA#PG|1U68!v`~T%yPJ;JLYiMn*P+>q~H|=O9z>Fj+fa;H- z9}He09Ze^2hGUC(Ld2jdfMdrh?Wf1IIXmw%#!~tJ*#`K(?#1tTGde{*s|qNq0&kv# zpmCSdb~iV1x8OH(wE!0o9Bk|yENq-C?0o8MJp7!T{9NoTY~1{8Y$n|VqW?z)2PbnI ZOP~LH1&qCdH*f_ASt%vST5;ph{{izxZt(yB diff --git a/tutor/app/assets/javascripts/solutions_constraints.js b/tutor/app/assets/javascripts/solutions_constraints.js index e0bfed78..eb3c4169 100644 --- a/tutor/app/assets/javascripts/solutions_constraints.js +++ b/tutor/app/assets/javascripts/solutions_constraints.js @@ -32,7 +32,7 @@ function add_params(field) $('#parameter').append(""); $('#parameter').append(""); $('#parameter').append(""); - $('#parameter').append("\"delete"); + $('#parameter').append("\"delete"); $('#parameter').append(""); } $('#parameter').append(""); @@ -71,7 +71,7 @@ function remove_params(field) $('#parameter').append(""); $('#parameter').append(""); $('#parameter').append(""); - $('#parameter').append("\"delete"); + $('#parameter').append("\"delete"); $('#parameter').append(""); } $('#parameter').append(""); @@ -102,7 +102,7 @@ function add_variable(field) $('#variable').append(""); $('#variable').append(""); $('#variable').append(""); - $('#variable').append("\"delete"); + $('#variable').append("\"delete"); $('#variable').append(""); } $('#variable').append(""); @@ -141,18 +141,54 @@ function remove_variable(field) $('#variable').append(""); $('#variable').append(""); $('#variable').append(""); - $('#variable').append("\"delete"); + $('#variable').append("\"delete"); $('#variable').append(""); } $('#variable').append(""); } +function showErrorMessage(arrayOfErrors){ + for (var i = 0; i < arrayOfErrors.length; i++) { + $("#errors").append("

"+arrayOfErrors[i]+"
"); + }; +} + +function testingValidation(errorArray){ + method = $('#_constrain_method_return').val() + name = $('#_constrain_method_name').val() + if ( type.length > 0) { + if ( method == "" && name == ""){ + document.getElementById("_constrain_method_return").style.border= "red 1px solid"; + document.getElementById("_constrain_method_name").style.border= "red 1px solid"; + errorArray.push("Enter method name and return type .."); + return false; + }else if(method == ""){ + document.getElementById("_constrain_method_name").style.border= ""; + document.getElementById("_constrain_method_return").style.border= "red 1px solid"; + errorArray.push("Enter method return type .."); + return false; + }else if(name == ""){ + document.getElementById("_constrain_method_name").style.border= "red 1px solid"; + document.getElementById("_constrain_method_return").style.border= ""; + errorArray.push("Enter method name .."); + return false; + } + }; +} + // # Description: submits via ajax to the controller // # Parameters:none // # Returns: none // # Author: Ahmed Mohamed Magdi function submitParams() -{ var hash_p = [] +{ + $("#errors").html(""); + errorArray = [] + if (!testingValidation(errorArray)) { + showErrorMessage(errorArray); + return; + }; + var hash_p = [] var hash_v = [] for (var i = 0; i < type.length; i++) { hash_p.push({ diff --git a/tutor/app/views/solutions_constraints/_form.html.erb b/tutor/app/views/solutions_constraints/_form.html.erb index ea049415..337e853a 100644 --- a/tutor/app/views/solutions_constraints/_form.html.erb +++ b/tutor/app/views/solutions_constraints/_form.html.erb @@ -21,6 +21,15 @@ <% end %> + +

Add Variable Constraints

+
+ <%= fields_for :@variables do |u| %> Variable Constraints diff --git a/tutor/app/views/solutions_constraints/new.html.erb b/tutor/app/views/solutions_constraints/new.html.erb index a0932b48..f15c0d6f 100644 --- a/tutor/app/views/solutions_constraints/new.html.erb +++ b/tutor/app/views/solutions_constraints/new.html.erb @@ -1,3 +1,11 @@ -

New Method/Variable Constraints

+
+
+

Add Method Constraints

+
<%= render 'form' %> \ No newline at end of file From 4469ac016048a2fcb481958662ab42bea449148c Mon Sep 17 00:00:00 2001 From: Ahmed Atef Date: Wed, 23 Apr 2014 19:22:43 +0200 Subject: [PATCH 18/55] Fixed indentation in the method destroy --- tutor/app/controllers/problems_controller.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tutor/app/controllers/problems_controller.rb b/tutor/app/controllers/problems_controller.rb index 929994d1..edd45a7e 100644 --- a/tutor/app/controllers/problems_controller.rb +++ b/tutor/app/controllers/problems_controller.rb @@ -92,10 +92,11 @@ def new # flash[:notice]: A message indicating the success of the deletion # Author: Ahmed Atef def destroy - @track = Problem.find_by_id(params[:id]).track_id - if Problem.find_by_id(params[:id]).destroy - flash[:notice] = "Problem successfully Deleted" - redirect_to(:controller => 'tracks' , :action => 'show' ,:id => @track) - end + @track = Problem.find_by_id(params[:id]).track_id + if Problem.find_by_id(params[:id]).destroy + flash[:notice] = "Problem successfully Deleted" + redirect_to(:controller => 'tracks' , :action => 'show' ,:id => @track) + end end + end \ No newline at end of file From ac21979a6116b205db0062d7d037476f3eb77a03 Mon Sep 17 00:00:00 2001 From: Ahmed Atef Date: Wed, 23 Apr 2014 23:21:26 +0200 Subject: [PATCH 19/55] break down long lines --- tutor/app/controllers/problems_controller.rb | 3 ++- tutor/app/views/problems/edit.html.erb | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tutor/app/controllers/problems_controller.rb b/tutor/app/controllers/problems_controller.rb index edd45a7e..75080d9d 100644 --- a/tutor/app/controllers/problems_controller.rb +++ b/tutor/app/controllers/problems_controller.rb @@ -95,7 +95,8 @@ def destroy @track = Problem.find_by_id(params[:id]).track_id if Problem.find_by_id(params[:id]).destroy flash[:notice] = "Problem successfully Deleted" - redirect_to(:controller => 'tracks' , :action => 'show' ,:id => @track) + redirect_to(:controller => 'tracks', + :action => 'show' ,:id => @track) end end diff --git a/tutor/app/views/problems/edit.html.erb b/tutor/app/views/problems/edit.html.erb index db828153..88abb8a7 100644 --- a/tutor/app/views/problems/edit.html.erb +++ b/tutor/app/views/problems/edit.html.erb @@ -9,4 +9,6 @@ and a paragraph to view the problem description of the instance variable @proble <% if flash[:notice] %>
<%= flash[:notice] %>
<% end %> - <%= button_to "Delete Problem", {:action => 'destroy'}, method: :delete,class: 'btn btn-primary',:id => params[:id] , :confirm => "Are you sure you want to delete this problem ??" %> \ No newline at end of file + <%= button_to "Delete Problem", {:action => 'destroy'}, method: :delete, + class: 'btn btn-primary',:id => params[:id] , + :confirm => "Are you sure you want to delete this problem ??" %> \ No newline at end of file From 7313ec110f8afea54646e21e1245dde9b3e72c11 Mon Sep 17 00:00:00 2001 From: Ahmed Atef Date: Wed, 23 Apr 2014 23:40:10 +0200 Subject: [PATCH 20/55] Fixed commas as Mamdou7's comment --- tutor/app/views/problems/edit.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutor/app/views/problems/edit.html.erb b/tutor/app/views/problems/edit.html.erb index 88abb8a7..d96726d8 100644 --- a/tutor/app/views/problems/edit.html.erb +++ b/tutor/app/views/problems/edit.html.erb @@ -10,5 +10,5 @@ and a paragraph to view the problem description of the instance variable @proble
<%= flash[:notice] %>
<% end %> <%= button_to "Delete Problem", {:action => 'destroy'}, method: :delete, - class: 'btn btn-primary',:id => params[:id] , + class: 'btn btn-primary', :id =>params[:id] , :confirm => "Are you sure you want to delete this problem ??" %> \ No newline at end of file From 2d09e3e064f3d8db967be510c0bfc1d9dd63c832 Mon Sep 17 00:00:00 2001 From: Ahmed Atef Date: Wed, 23 Apr 2014 23:46:48 +0200 Subject: [PATCH 21/55] added a space --- tutor/app/views/problems/edit.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutor/app/views/problems/edit.html.erb b/tutor/app/views/problems/edit.html.erb index d96726d8..4fa1c94b 100644 --- a/tutor/app/views/problems/edit.html.erb +++ b/tutor/app/views/problems/edit.html.erb @@ -10,5 +10,5 @@ and a paragraph to view the problem description of the instance variable @proble
<%= flash[:notice] %>
<% end %> <%= button_to "Delete Problem", {:action => 'destroy'}, method: :delete, - class: 'btn btn-primary', :id =>params[:id] , + class: 'btn btn-primary', :id => params[:id], :confirm => "Are you sure you want to delete this problem ??" %> \ No newline at end of file From 368032cdb85d78695080ed08eaab94580eef9f72 Mon Sep 17 00:00:00 2001 From: Ahmed Atef Date: Wed, 23 Apr 2014 23:51:51 +0200 Subject: [PATCH 22/55] fixing tab --- tutor/app/views/problems/edit.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutor/app/views/problems/edit.html.erb b/tutor/app/views/problems/edit.html.erb index 4fa1c94b..b1838fec 100644 --- a/tutor/app/views/problems/edit.html.erb +++ b/tutor/app/views/problems/edit.html.erb @@ -10,5 +10,5 @@ and a paragraph to view the problem description of the instance variable @proble
<%= flash[:notice] %>
<% end %> <%= button_to "Delete Problem", {:action => 'destroy'}, method: :delete, - class: 'btn btn-primary', :id => params[:id], - :confirm => "Are you sure you want to delete this problem ??" %> \ No newline at end of file + class: 'btn btn-primary', :id => params[:id], + :confirm => "Are you sure you want to delete this problem ??" %> \ No newline at end of file From ac80085f777e14ba24b703c8f77ee38e579463d1 Mon Sep 17 00:00:00 2001 From: ahmed93 Date: Wed, 23 Apr 2014 23:58:44 +0200 Subject: [PATCH 23/55] Issue #188 finally create workng --- .../javascripts/solutions_constraints.js | 64 +++++++++++-------- .../solutions_constraints_controller.rb | 27 ++++---- tutor/app/views/students/new.html.erb | 8 +++ 3 files changed, 60 insertions(+), 39 deletions(-) create mode 100644 tutor/app/views/students/new.html.erb diff --git a/tutor/app/assets/javascripts/solutions_constraints.js b/tutor/app/assets/javascripts/solutions_constraints.js index eb3c4169..78e1d948 100644 --- a/tutor/app/assets/javascripts/solutions_constraints.js +++ b/tutor/app/assets/javascripts/solutions_constraints.js @@ -147,33 +147,48 @@ function remove_variable(field) $('#variable').append(""); } +// # Description: TO show the error massages +// # Parameters: +// # errorArray: array of Error, for multi error massage show +// # Returns: none +// # Author: Ahmed Mohamed Magdi function showErrorMessage(arrayOfErrors){ for (var i = 0; i < arrayOfErrors.length; i++) { $("#errors").append("
"+arrayOfErrors[i]+"
"); }; } -function testingValidation(errorArray){ - method = $('#_constrain_method_return').val() - name = $('#_constrain_method_name').val() +// # Description: Validates Data before sending it to the Server side +// # Parameters: +// # errorArray: array of Error, for multi error massage show +// # Returns: none +// # Author: Ahmed Mohamed Magdi +function testingValidation(errorArray,method,name){ + if (type.length == 0 && + var_type.length == 0 && + method == 0 && + name == 0 ) + { + errorArray.push("Can not submit an empty Data, Try filling either Method Constraint for Variable Constraint"); + return false; + }; if ( type.length > 0) { if ( method == "" && name == ""){ document.getElementById("_constrain_method_return").style.border= "red 1px solid"; document.getElementById("_constrain_method_name").style.border= "red 1px solid"; errorArray.push("Enter method name and return type .."); - return false; - }else if(method == ""){ - document.getElementById("_constrain_method_name").style.border= ""; - document.getElementById("_constrain_method_return").style.border= "red 1px solid"; - errorArray.push("Enter method return type .."); - return false; - }else if(name == ""){ - document.getElementById("_constrain_method_name").style.border= "red 1px solid"; - document.getElementById("_constrain_method_return").style.border= ""; - errorArray.push("Enter method name .."); - return false; } }; + if(method == ""){ + document.getElementById("_constrain_method_name").style.border= ""; + document.getElementById("_constrain_method_return").style.border= "red 1px solid"; + errorArray.push("Enter method return type .."); + }else if(name == ""){ + document.getElementById("_constrain_method_name").style.border= "red 1px solid"; + document.getElementById("_constrain_method_return").style.border= ""; + errorArray.push("Enter method name .."); + } + return errorArray.length == 0; } // # Description: submits via ajax to the controller @@ -183,11 +198,15 @@ function testingValidation(errorArray){ function submitParams() { $("#errors").html(""); - errorArray = [] - if (!testingValidation(errorArray)) { + errorArray = new Array(); + + method = $('#_constrain_method_return').val() + name = $('#_constrain_method_name').val() + if (!testingValidation(errorArray,method,name)) { showErrorMessage(errorArray); return; }; + var hash_p = [] var hash_v = [] for (var i = 0; i < type.length; i++) { @@ -202,8 +221,6 @@ function submitParams() name: var_name[i] }); }; - method = $('#_constrain_method_return').val() - name = $('#_constrain_method_name').val() $.ajax({ type: "POST", url: "/solutions_constraints", @@ -218,20 +235,11 @@ function submitParams() window.location = window.location }else{ alert("Data messigin/incorrect !"); - validate(method,name); } }, datatype: "JSON", error: function(){ - alert("failed"); + alert("Failed to Add Constraints, Check again"); } }); -} - -function validate(method, name) -{ - if ( (method == "" || name == "") && type.length > 0) - { - - }; } \ No newline at end of file diff --git a/tutor/app/controllers/solutions_constraints_controller.rb b/tutor/app/controllers/solutions_constraints_controller.rb index fa1ef12c..4dd0bdf9 100644 --- a/tutor/app/controllers/solutions_constraints_controller.rb +++ b/tutor/app/controllers/solutions_constraints_controller.rb @@ -1,6 +1,6 @@ class SolutionsConstraintsController < ApplicationController - # Description: Creates New record for either Method or vairable constraints + # Description: Creates New record for either Method or variable constraints # Parameters: # method_cons: Hash containting the Method parameters # var_cons: Hash containting the Variables Constraints @@ -18,21 +18,27 @@ def create constarint = MethodConstraint.new constarint.method_name = method constarint.method_return = method_returned - if method_cons.present? - method_cons.each do |cons| + method_cons.each do |index,value| parameters = MethodParameter.new - parameters.parameter = method_cons[:name] - parameters.params_type = method_cons[:type] - # constarint.parameters << parameters + parameters.parameter = value[:name] + parameters.params_type = value[:type] parameters.save + constarint.method_parameter << parameters end - render json: true - constarint.save - else - render json: false end + constarint.save end + if var_cons.present? + var_cons.each do |index,value| + variable = VariableConstraint.new + variable.variable_name = value[:name] + variable.variable_type = value[:type] + variable.save + end + end + + render json: true end # Description: init New record @@ -41,6 +47,5 @@ def create # Author: Ahmed Mohamed Magdi def new constrain = MethodConstraint.new - parameters = MethodParameter.new end end diff --git a/tutor/app/views/students/new.html.erb b/tutor/app/views/students/new.html.erb new file mode 100644 index 00000000..25280b0a --- /dev/null +++ b/tutor/app/views/students/new.html.erb @@ -0,0 +1,8 @@ +<%= @solved.each do |c| + + + c.problem_id + + + +end %> \ No newline at end of file From 68b9ed6c61cae124718303b9aaa8309a3eae1647 Mon Sep 17 00:00:00 2001 From: ahmed93 Date: Thu, 24 Apr 2014 02:20:43 +0200 Subject: [PATCH 24/55] Issue #188 fixing condiftions --- tutor/app/assets/javascripts/solutions_constraints.js | 4 ++-- .../controllers/solutions_constraints_controller.rb | 8 ++++---- .../solutions_constraints/_edit_variable.html.erb | 11 +++-------- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/tutor/app/assets/javascripts/solutions_constraints.js b/tutor/app/assets/javascripts/solutions_constraints.js index 78e1d948..f1040a3e 100644 --- a/tutor/app/assets/javascripts/solutions_constraints.js +++ b/tutor/app/assets/javascripts/solutions_constraints.js @@ -179,11 +179,11 @@ function testingValidation(errorArray,method,name){ errorArray.push("Enter method name and return type .."); } }; - if(method == ""){ + if(method == "" && name != ""){ document.getElementById("_constrain_method_name").style.border= ""; document.getElementById("_constrain_method_return").style.border= "red 1px solid"; errorArray.push("Enter method return type .."); - }else if(name == ""){ + }else if(name == "" && method != ""){ document.getElementById("_constrain_method_name").style.border= "red 1px solid"; document.getElementById("_constrain_method_return").style.border= ""; errorArray.push("Enter method name .."); diff --git a/tutor/app/controllers/solutions_constraints_controller.rb b/tutor/app/controllers/solutions_constraints_controller.rb index 4dd0bdf9..f7835de9 100644 --- a/tutor/app/controllers/solutions_constraints_controller.rb +++ b/tutor/app/controllers/solutions_constraints_controller.rb @@ -24,20 +24,20 @@ def create parameters.parameter = value[:name] parameters.params_type = value[:type] parameters.save - constarint.method_parameter << parameters + constarint.parameters << parameters end end constarint.save end + if var_cons.present? var_cons.each do |index,value| variable = VariableConstraint.new - variable.variable_name = value[:name] - variable.variable_type = value[:type] + variable.variable_name = var_cons[index][:name] + variable.variable_type = var_cons[index][:type] variable.save end end - render json: true end diff --git a/tutor/app/views/solutions_constraints/_edit_variable.html.erb b/tutor/app/views/solutions_constraints/_edit_variable.html.erb index 47464e84..ca27359c 100644 --- a/tutor/app/views/solutions_constraints/_edit_variable.html.erb +++ b/tutor/app/views/solutions_constraints/_edit_variable.html.erb @@ -1,19 +1,14 @@ -<%= form_for :@constrain do |f| %> +<%= form_for :@variables do |f| %> - + - + -
Variable Constraints <%= u.text_field :variable_name, placeholder: "Variable Type" %><%= f.text_field :variable_type, placeholder: "Variable Type" %> <%= u.text_field :variable_name, placeholder: "Variable Name" %><%= f.text_field :variable_name, placeholder: "Variable Name" %> <%= image_tag "add_buttom.png", id:"params", style: "width:15%;height:15%;margin_top:10px;cursor:pointer", onclick: "add_params(this);"%>
-
-

Variables

- No Variables -

<%= f.submit "Save Changes", class: "btn btn-default"%> <% end %> \ No newline at end of file From e1f194c24c499e0b04032eb581d776b9cc31d0f5 Mon Sep 17 00:00:00 2001 From: ahmed93 Date: Thu, 24 Apr 2014 15:59:18 +0200 Subject: [PATCH 25/55] Issue #188 fixing conventions --- .../javascripts/solutions_constraints.js | 44 ++++++++++--------- .../_edit_method.html.erb | 8 ++-- .../solutions_constraints/_form.html.erb | 21 +++++---- .../views/solutions_constraints/new.html.erb | 14 +++--- tutor/app/views/students/new.html.erb | 8 ---- 5 files changed, 48 insertions(+), 47 deletions(-) delete mode 100644 tutor/app/views/students/new.html.erb diff --git a/tutor/app/assets/javascripts/solutions_constraints.js b/tutor/app/assets/javascripts/solutions_constraints.js index f1040a3e..9d727740 100644 --- a/tutor/app/assets/javascripts/solutions_constraints.js +++ b/tutor/app/assets/javascripts/solutions_constraints.js @@ -36,11 +36,12 @@ function add_params(field) $('#parameter').append(""); } $('#parameter').append(""); - }else { - if (tmp_name == "" && tmp_type == ""){ + } + else { + if (tmp_name == "" && tmp_type == "") { document.getElementById("params_type").style.border= "red 1px solid"; document.getElementById("params_name").style.border= "red 1px solid"; - }else if(tmp_name == ""){ + }else if(tmp_name == "") { document.getElementById("params_type").style.border= ""; document.getElementById("params_name").style.border= "red 1px solid"; }else{ @@ -107,10 +108,10 @@ function add_variable(field) } $('#variable').append(""); }else { - if (tmp_name == "" && tmp_type == ""){ + if (tmp_name == "" && tmp_type == "") { document.getElementById("variable_type").style.border= "red 1px solid"; document.getElementById("variable_name").style.border= "red 1px solid"; - }else if(tmp_name == ""){ + }else if(tmp_name == "") { document.getElementById("variable_type").style.border= ""; document.getElementById("variable_name").style.border= "red 1px solid"; }else{ @@ -152,7 +153,7 @@ function remove_variable(field) // # errorArray: array of Error, for multi error massage show // # Returns: none // # Author: Ahmed Mohamed Magdi -function showErrorMessage(arrayOfErrors){ +function showErrorMessage(arrayOfErrors) { for (var i = 0; i < arrayOfErrors.length; i++) { $("#errors").append("
"+arrayOfErrors[i]+"
"); }; @@ -163,27 +164,27 @@ function showErrorMessage(arrayOfErrors){ // # errorArray: array of Error, for multi error massage show // # Returns: none // # Author: Ahmed Mohamed Magdi -function testingValidation(errorArray,method,name){ +function testingValidation(errorArray,method,name) { if (type.length == 0 && var_type.length == 0 && method == 0 && - name == 0 ) + name == 0) { errorArray.push("Can not submit an empty Data, Try filling either Method Constraint for Variable Constraint"); return false; }; - if ( type.length > 0) { - if ( method == "" && name == ""){ + if (type.length > 0) { + if (method == "" && name == "") { document.getElementById("_constrain_method_return").style.border= "red 1px solid"; document.getElementById("_constrain_method_name").style.border= "red 1px solid"; errorArray.push("Enter method name and return type .."); } }; - if(method == "" && name != ""){ + if(method == "" && name != "") { document.getElementById("_constrain_method_name").style.border= ""; document.getElementById("_constrain_method_return").style.border= "red 1px solid"; errorArray.push("Enter method return type .."); - }else if(name == "" && method != ""){ + }else if(name == "" && method != "") { document.getElementById("_constrain_method_name").style.border= "red 1px solid"; document.getElementById("_constrain_method_return").style.border= ""; errorArray.push("Enter method name .."); @@ -224,21 +225,24 @@ function submitParams() $.ajax({ type: "POST", url: "/solutions_constraints", - data:{ parameter_constraint: hash_p, - variable_constraint: hash_v, - method_return: method, - method_name: name - }, - success: function(data){ + data:{ + parameter_constraint: hash_p, + variable_constraint: hash_v, + method_return: method, + method_name: name + }, + success: function(data) + { if (data) { alert("Data have been Added successfully"); window.location = window.location - }else{ + } + else{ alert("Data messigin/incorrect !"); } }, datatype: "JSON", - error: function(){ + error: function() { alert("Failed to Add Constraints, Check again"); } }); diff --git a/tutor/app/views/solutions_constraints/_edit_method.html.erb b/tutor/app/views/solutions_constraints/_edit_method.html.erb index 6f78afd7..94aa0aac 100644 --- a/tutor/app/views/solutions_constraints/_edit_method.html.erb +++ b/tutor/app/views/solutions_constraints/_edit_method.html.erb @@ -3,7 +3,7 @@ Method Constrains - <%= f.text_field :method_return, placeholder: "Return Type"%> + <%= f.text_field :method_return, placeholder: "Return Type" %> <%= f.text_field :method_name, placeholder: "Method Name" %>
@@ -17,15 +17,15 @@ <%= u.text_field :parameter, placeholder: "Variable Name", id:"params_name" %> - <%= image_tag "add_buttom.png", id:"params", style: "width:15%;height:15%;margin_top:10px;cursor:pointer", onclick: "add_params(this);"%> + <%= image_tag "add_buttom.png", id:"params", style: "width:15%;height:15%;margin_top:10px;cursor:pointer", onclick: "add_params(this);" %> <% end %>

Paramter

- No paramters +

No paramters


- <%= f.submit "Save Changes", class: "btn btn-default", onclick:"submitParams();"%> + <%= f.submit "Save Changes", class: "btn btn-default", onclick:"submitParams();" %> <% end %> \ No newline at end of file diff --git a/tutor/app/views/solutions_constraints/_form.html.erb b/tutor/app/views/solutions_constraints/_form.html.erb index 337e853a..490883a0 100644 --- a/tutor/app/views/solutions_constraints/_form.html.erb +++ b/tutor/app/views/solutions_constraints/_form.html.erb @@ -22,13 +22,16 @@ -

Add Variable Constraints

-
+ +

Add Variable Constraints

+
+ <%= fields_for :@variables do |u| %> @@ -44,11 +47,11 @@

Paramters Constraints

- No paramters +

No paramters

Variables Constraints

- No variables +

No variables


<%= button_tag "Save Changes", type: "button", class: "btn btn-large btn-success", onclick:"submitParams();"%> diff --git a/tutor/app/views/solutions_constraints/new.html.erb b/tutor/app/views/solutions_constraints/new.html.erb index f15c0d6f..5b791746 100644 --- a/tutor/app/views/solutions_constraints/new.html.erb +++ b/tutor/app/views/solutions_constraints/new.html.erb @@ -2,10 +2,12 @@

Add Method Constraints

-
+
+ <%= render 'form' %> \ No newline at end of file diff --git a/tutor/app/views/students/new.html.erb b/tutor/app/views/students/new.html.erb deleted file mode 100644 index 25280b0a..00000000 --- a/tutor/app/views/students/new.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -<%= @solved.each do |c| - - - c.problem_id - - - -end %> \ No newline at end of file From da89f3e8d9e86363b1970ec3833910bc04e9f25a Mon Sep 17 00:00:00 2001 From: ahmed93 Date: Thu, 24 Apr 2014 17:47:24 +0200 Subject: [PATCH 26/55] fixing conventions --- .../javascripts/solutions_constraints.js | 62 +++++++++---------- .../solutions_constraints_controller.rb | 2 - .../_edit_method.html.erb | 10 +-- .../_edit_variable.html.erb | 8 +-- .../solutions_constraints/_form.html.erb | 20 +++--- .../views/solutions_constraints/new.html.erb | 12 ++-- 6 files changed, 55 insertions(+), 59 deletions(-) diff --git a/tutor/app/assets/javascripts/solutions_constraints.js b/tutor/app/assets/javascripts/solutions_constraints.js index 9d727740..63ab229b 100644 --- a/tutor/app/assets/javascripts/solutions_constraints.js +++ b/tutor/app/assets/javascripts/solutions_constraints.js @@ -11,8 +11,7 @@ var var_name = new Array(); // # Parameters:none // # Returns: none // # Author: Ahmed Mohamed Magdi -function add_params(field) -{ +function add_params(field) { var tmp_type = document.getElementById("params_type").value; var tmp_name = document.getElementById("params_name").value; @@ -23,9 +22,9 @@ function add_params(field) document.getElementById("params_type").value = ""; param_name[param_name.length] = tmp_name; document.getElementById("params_name").value = ""; - document.getElementById("parameter").innerHTML = "

Paramters Constraints

"; - for (var i = 0; i < type.length; i++) { + + for (var i = 0; i < type.length; i++) { $('#parameter').append(""); $('#parameter').append(""); $('#parameter').append(""); @@ -41,10 +40,12 @@ function add_params(field) if (tmp_name == "" && tmp_type == "") { document.getElementById("params_type").style.border= "red 1px solid"; document.getElementById("params_name").style.border= "red 1px solid"; - }else if(tmp_name == "") { + } + else if(tmp_name == "") { document.getElementById("params_type").style.border= ""; document.getElementById("params_name").style.border= "red 1px solid"; - }else{ + } + else{ document.getElementById("params_type").style.border= "red 1px solid"; document.getElementById("params_name").style.border= ""; } @@ -55,14 +56,12 @@ function add_params(field) // # Parameters:none // # Returns: none // # Author: Ahmed Mohamed Magdi -function remove_params(field) -{ +function remove_params(field) { var index = field.id.split("_")[1]; type.splice(index,1); param_name.splice(index,1); document.getElementById("parameter").innerHTML = "

Paramters Constraints

"; - if(type.length == 0) - { + if(type.length == 0) { $('#parameter').append("No paramter"); } for (var i = 0; i < type.length; i++) { @@ -82,8 +81,7 @@ function remove_params(field) // # Parameters:none // # Returns: none // # Author: Ahmed Mohamed Magdi -function add_variable(field) -{ +function add_variable(field) { var tmp_type = document.getElementById("variable_type").value; var tmp_name = document.getElementById("variable_name").value; @@ -94,9 +92,9 @@ function add_variable(field) document.getElementById("variable_type").value = ""; var_name[var_name.length] = tmp_name; document.getElementById("variable_name").value = ""; - document.getElementById("variable").innerHTML = "

Variables Constraints

"; - for (var i = 0; i < var_type.length; i++) { + + for (var i = 0; i < var_type.length; i++) { $('#variable').append(""); $('#variable').append(""); $('#variable').append(""); @@ -107,14 +105,17 @@ function add_variable(field) $('#variable').append(""); } $('#variable').append("
"); - }else { + } + else { if (tmp_name == "" && tmp_type == "") { document.getElementById("variable_type").style.border= "red 1px solid"; document.getElementById("variable_name").style.border= "red 1px solid"; - }else if(tmp_name == "") { + } + else if(tmp_name == "") { document.getElementById("variable_type").style.border= ""; document.getElementById("variable_name").style.border= "red 1px solid"; - }else{ + } + else { document.getElementById("variable_type").style.border= "red 1px solid"; document.getElementById("variable_name").style.border= ""; } @@ -125,14 +126,12 @@ function add_variable(field) // # Parameters:none // # Returns: none // # Author: Ahmed Mohamed Magdi -function remove_variable(field) -{ +function remove_variable(field){ var index = field.id.split("_")[1]; var_type.splice(index,1); var_name.splice(index,1); document.getElementById("variable").innerHTML = "

Variables Constraints

"; - if(var_type.length == 0) - { + if(var_type.length == 0) { $('#variable').append("No Variables"); } for (var i = 0; i < var_type.length; i++) { @@ -168,9 +167,9 @@ function testingValidation(errorArray,method,name) { if (type.length == 0 && var_type.length == 0 && method == 0 && - name == 0) - { - errorArray.push("Can not submit an empty Data, Try filling either Method Constraint for Variable Constraint"); + name == 0) { + errorArray.push("Can not submit an empty Data, + Try filling either Method Constraint for Variable Constraint"); return false; }; if (type.length > 0) { @@ -184,7 +183,8 @@ function testingValidation(errorArray,method,name) { document.getElementById("_constrain_method_name").style.border= ""; document.getElementById("_constrain_method_return").style.border= "red 1px solid"; errorArray.push("Enter method return type .."); - }else if(name == "" && method != "") { + } + else if(name == "" && method != "") { document.getElementById("_constrain_method_name").style.border= "red 1px solid"; document.getElementById("_constrain_method_return").style.border= ""; errorArray.push("Enter method name .."); @@ -196,20 +196,18 @@ function testingValidation(errorArray,method,name) { // # Parameters:none // # Returns: none // # Author: Ahmed Mohamed Magdi -function submitParams() -{ +function submitParams() { $("#errors").html(""); errorArray = new Array(); - + var hash_p = new Array(); + var hash_v = new Array(); method = $('#_constrain_method_return').val() name = $('#_constrain_method_name').val() + if (!testingValidation(errorArray,method,name)) { showErrorMessage(errorArray); return; }; - - var hash_p = [] - var hash_v = [] for (var i = 0; i < type.length; i++) { hash_p.push({ type: type[i] , @@ -237,7 +235,7 @@ function submitParams() alert("Data have been Added successfully"); window.location = window.location } - else{ + else { alert("Data messigin/incorrect !"); } }, diff --git a/tutor/app/controllers/solutions_constraints_controller.rb b/tutor/app/controllers/solutions_constraints_controller.rb index f7835de9..93afd2d2 100644 --- a/tutor/app/controllers/solutions_constraints_controller.rb +++ b/tutor/app/controllers/solutions_constraints_controller.rb @@ -13,7 +13,6 @@ def create var_cons = params[:variable_constraint] method = params[:method_name] method_returned = params[:method_return] - unless method == "" constarint = MethodConstraint.new constarint.method_name = method @@ -29,7 +28,6 @@ def create end constarint.save end - if var_cons.present? var_cons.each do |index,value| variable = VariableConstraint.new diff --git a/tutor/app/views/solutions_constraints/_edit_method.html.erb b/tutor/app/views/solutions_constraints/_edit_method.html.erb index 94aa0aac..bba0a708 100644 --- a/tutor/app/views/solutions_constraints/_edit_method.html.erb +++ b/tutor/app/views/solutions_constraints/_edit_method.html.erb @@ -2,9 +2,9 @@
- + - +
@@ -12,11 +12,11 @@ <%= fields_for :@params do |u| %> - + - + - + <% end %> diff --git a/tutor/app/views/solutions_constraints/_edit_variable.html.erb b/tutor/app/views/solutions_constraints/_edit_variable.html.erb index ca27359c..a9356ba1 100644 --- a/tutor/app/views/solutions_constraints/_edit_variable.html.erb +++ b/tutor/app/views/solutions_constraints/_edit_variable.html.erb @@ -2,13 +2,13 @@
Method Constrains <%= f.text_field :method_return, placeholder: "Return Type" %> <%= f.text_field :method_name, placeholder: "Method Name" %>
Method Parameter <%= u.text_field :params_type, placeholder: "Variable Type", id:"params_type" %> <%= u.text_field :parameter, placeholder: "Variable Name", id:"params_name" %> <%= image_tag "add_buttom.png", id:"params", style: "width:15%;height:15%;margin_top:10px;cursor:pointer", onclick: "add_params(this);" %>
- + - + - +
Variable Constraints <%= f.text_field :variable_type, placeholder: "Variable Type" %> <%= f.text_field :variable_name, placeholder: "Variable Name" %>

- <%= f.submit "Save Changes", class: "btn btn-default"%> + <%= f.submit "Save Changes", class: "btn btn-default "%> <% end %> \ No newline at end of file diff --git a/tutor/app/views/solutions_constraints/_form.html.erb b/tutor/app/views/solutions_constraints/_form.html.erb index 490883a0..5126076d 100644 --- a/tutor/app/views/solutions_constraints/_form.html.erb +++ b/tutor/app/views/solutions_constraints/_form.html.erb @@ -3,7 +3,7 @@ Method Constrains - <%= f.text_field :method_return, placeholder: "Return Type"%> + <%= f.text_field :method_return, placeholder: "Return Type" %> <%= f.text_field :method_name, placeholder: "Method Name" %>
@@ -17,7 +17,7 @@ <%= u.text_field :parameter, placeholder: "Variable Name", id:"params_name" %> - <%= image_tag "add_buttom.png", style: "width:15%;height:15%;margin_top:10px;cursor:pointer", onclick: "add_params(this);"%> + <%= image_tag "add_buttom.png", style: "width:15%;height:15%;margin_top:10px;cursor:pointer", onclick: "add_params(this);" %> <% end %> @@ -25,12 +25,12 @@

Add Variable Constraints

+ display: block; + height: 1px; + border: 0; + border-top: 1px solid #ccc; + margin: 1em 0; + padding: 0;"> @@ -41,7 +41,7 @@ <%= u.text_field :variable_name, placeholder: "Variable Name", id:"variable_name" %> - <%= image_tag "add_buttom.png", style: "width:15%;height:15%;margin_top:10px;cursor:pointer", onclick: "add_variable(this);"%> + <%= image_tag "add_buttom.png", style: "width:15%;height:15%;margin_top:10px;cursor:pointer", onclick: "add_variable(this);" %> <% end %> @@ -54,5 +54,5 @@

No variables


- <%= button_tag "Save Changes", type: "button", class: "btn btn-large btn-success", onclick:"submitParams();"%> + <%= button_tag "Save Changes", type: "button", class: "btn btn-large btn-success", onclick:"submitParams();" %> <% end %> \ No newline at end of file diff --git a/tutor/app/views/solutions_constraints/new.html.erb b/tutor/app/views/solutions_constraints/new.html.erb index 5b791746..5b1f6ed3 100644 --- a/tutor/app/views/solutions_constraints/new.html.erb +++ b/tutor/app/views/solutions_constraints/new.html.erb @@ -3,11 +3,11 @@

Add Method Constraints

+ display: block; + height: 1px; + border: 0; + border-top: 1px solid #ccc; + margin: 1em 0; + padding: 0;"> <%= render 'form' %> \ No newline at end of file From c27990a80d73a7e2ab1118dc91a8e0b4ebc536cb Mon Sep 17 00:00:00 2001 From: ahmed93 Date: Thu, 24 Apr 2014 18:23:32 +0200 Subject: [PATCH 27/55] fixing long lines --- .../javascripts/solutions_constraints.js | 22 +++++++++++++------ .../_edit_method.html.erb | 3 ++- .../solutions_constraints/_form.html.erb | 6 +++-- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/tutor/app/assets/javascripts/solutions_constraints.js b/tutor/app/assets/javascripts/solutions_constraints.js index 63ab229b..c07848de 100644 --- a/tutor/app/assets/javascripts/solutions_constraints.js +++ b/tutor/app/assets/javascripts/solutions_constraints.js @@ -31,7 +31,9 @@ function add_params(field) { $('#parameter').append(""); $('#parameter').append(""); $('#parameter').append(""); - $('#parameter').append("\"delete"); + $('#parameter').append("\"delete"); $('#parameter').append(""); } $('#parameter').append(""); @@ -71,7 +73,9 @@ function remove_params(field) { $('#parameter').append(""); $('#parameter').append(""); $('#parameter').append(""); - $('#parameter').append("\"delete"); + $('#parameter').append("\"delete"); $('#parameter').append(""); } $('#parameter').append(""); @@ -101,7 +105,9 @@ function add_variable(field) { $('#variable').append(""); $('#variable').append(""); $('#variable').append(""); - $('#variable').append("\"delete"); + $('#variable').append("\"delete"); $('#variable').append(""); } $('#variable').append(""); @@ -126,7 +132,7 @@ function add_variable(field) { // # Parameters:none // # Returns: none // # Author: Ahmed Mohamed Magdi -function remove_variable(field){ +function remove_variable(field) { var index = field.id.split("_")[1]; var_type.splice(index,1); var_name.splice(index,1); @@ -141,7 +147,9 @@ function remove_variable(field){ $('#variable').append(""); $('#variable').append(""); $('#variable').append(""); - $('#variable').append("\"delete"); + $('#variable').append("\"delete"); $('#variable').append(""); } $('#variable').append(""); @@ -168,8 +176,8 @@ function testingValidation(errorArray,method,name) { var_type.length == 0 && method == 0 && name == 0) { - errorArray.push("Can not submit an empty Data, - Try filling either Method Constraint for Variable Constraint"); + errorArray.push("Can not submit an empty Data,\ + Try filling either Method Constraint for Variable Constraint"); return false; }; if (type.length > 0) { diff --git a/tutor/app/views/solutions_constraints/_edit_method.html.erb b/tutor/app/views/solutions_constraints/_edit_method.html.erb index bba0a708..08cca49a 100644 --- a/tutor/app/views/solutions_constraints/_edit_method.html.erb +++ b/tutor/app/views/solutions_constraints/_edit_method.html.erb @@ -17,7 +17,8 @@ <%= u.text_field :parameter, placeholder: "Variable Name", id:"params_name" %> - <%= image_tag "add_buttom.png", id:"params", style: "width:15%;height:15%;margin_top:10px;cursor:pointer", onclick: "add_params(this);" %> + <%= image_tag "add_buttom.png", id:"params", style: "width:15%;height:15%;margin_top:10px;cursor:pointer", + onclick: "add_params(this);" %> <% end %> diff --git a/tutor/app/views/solutions_constraints/_form.html.erb b/tutor/app/views/solutions_constraints/_form.html.erb index 5126076d..475dc477 100644 --- a/tutor/app/views/solutions_constraints/_form.html.erb +++ b/tutor/app/views/solutions_constraints/_form.html.erb @@ -17,7 +17,8 @@ <%= u.text_field :parameter, placeholder: "Variable Name", id:"params_name" %> - <%= image_tag "add_buttom.png", style: "width:15%;height:15%;margin_top:10px;cursor:pointer", onclick: "add_params(this);" %> + <%= image_tag "add_buttom.png", style: "width:15%;height:15%;margin_top:10px;cursor:pointer", + onclick: "add_params(this);" %> <% end %> @@ -41,7 +42,8 @@ <%= u.text_field :variable_name, placeholder: "Variable Name", id:"variable_name" %> - <%= image_tag "add_buttom.png", style: "width:15%;height:15%;margin_top:10px;cursor:pointer", onclick: "add_variable(this);" %> + <%= image_tag "add_buttom.png", style: "width:15%;height:15%;margin_top:10px;cursor:pointer", + onclick: "add_variable(this);" %> <% end %> From 1e28332c53c7885ab663294297adcc04bc0b9e41 Mon Sep 17 00:00:00 2001 From: ahmed93 Date: Thu, 24 Apr 2014 18:59:33 +0200 Subject: [PATCH 28/55] fixing indextations --- tutor/app/assets/javascripts/solutions_constraints.js | 3 +-- tutor/app/views/solutions_constraints/_form.html.erb | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/tutor/app/assets/javascripts/solutions_constraints.js b/tutor/app/assets/javascripts/solutions_constraints.js index c07848de..5864732f 100644 --- a/tutor/app/assets/javascripts/solutions_constraints.js +++ b/tutor/app/assets/javascripts/solutions_constraints.js @@ -237,8 +237,7 @@ function submitParams() { method_return: method, method_name: name }, - success: function(data) - { + success: function(data) { if (data) { alert("Data have been Added successfully"); window.location = window.location diff --git a/tutor/app/views/solutions_constraints/_form.html.erb b/tutor/app/views/solutions_constraints/_form.html.erb index 475dc477..47407cc0 100644 --- a/tutor/app/views/solutions_constraints/_form.html.erb +++ b/tutor/app/views/solutions_constraints/_form.html.erb @@ -28,11 +28,11 @@
- + border: 0; + border-top: 1px solid #ccc; + margin: 1em 0; + padding: 0;"> + <%= fields_for :@variables do |u| %> From 7382c5cf4478af2f034a5ceb6613445f925bea42 Mon Sep 17 00:00:00 2001 From: Ahmed ELAssuty Date: Thu, 24 Apr 2014 19:02:12 +0200 Subject: [PATCH 29/55] fix layout sizing issues --- tutor/app/assets/stylesheets/application.css | 7 +++++++ tutor/app/views/layouts/_footer.html.erb | 2 +- tutor/app/views/layouts/_right_side_bar.html.erb | 3 +-- tutor/app/views/layouts/application.html.erb | 9 +++++---- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/tutor/app/assets/stylesheets/application.css b/tutor/app/assets/stylesheets/application.css index 5dd23c89..2288e797 100644 --- a/tutor/app/assets/stylesheets/application.css +++ b/tutor/app/assets/stylesheets/application.css @@ -28,6 +28,9 @@ margin-bottom:70px; width:78%; margin-left:1%; + min-width:500px; + overflow:scroll; + position:static; } .footer { @@ -46,4 +49,8 @@ .button-devise { margin-top: 10px; +} + +.home { + overflow:scroll; } \ No newline at end of file diff --git a/tutor/app/views/layouts/_footer.html.erb b/tutor/app/views/layouts/_footer.html.erb index b26c482f..94abcf86 100644 --- a/tutor/app/views/layouts/_footer.html.erb +++ b/tutor/app/views/layouts/_footer.html.erb @@ -3,7 +3,7 @@ # General layout for footer # Author: Ahmed Elassuty --> -
+
<%= link_to "About us"%> diff --git a/tutor/app/views/layouts/_right_side_bar.html.erb b/tutor/app/views/layouts/_right_side_bar.html.erb index 29814900..58035bf4 100644 --- a/tutor/app/views/layouts/_right_side_bar.html.erb +++ b/tutor/app/views/layouts/_right_side_bar.html.erb @@ -3,7 +3,7 @@ # General layout for right side bar # Author: Ahmed Elassuty --> - <%= button_to "Back", {:controller => 'courses', :action => 'index'}, class: "btn btn-success" , style: "margin-left: - 600px; margin-top: 250px", :method => :get%> \ No newline at end of file + 600px; margin-top: 250px", :method => :get%> +
+
+
\ No newline at end of file diff --git a/tutor/app/views/courses/index.html.erb b/tutor/app/views/courses/index.html.erb index 37388dff..4f2b3e4b 100644 --- a/tutor/app/views/courses/index.html.erb +++ b/tutor/app/views/courses/index.html.erb @@ -1,57 +1,61 @@ -<% if !@courses.any? %> -

You have no courses

-<% end %> -<% if current_lecturer %> - <%= button_to "Create course", { :action => 'new', :controller => 'courses' }, { - class: 'btn btn-primary'} %> -<% end %> - -
-<% if flash[:success_creation] %> -
<%= flash[:success_creation] %>
-<% end %> -<% if flash[:success_deletion] %> -
<%= flash[:success_deletion] %>
-<% end %> -
- -<% if @courses.any? %> -

Your Courses

- - - - - - - - - <% @courses.each do |c| %> - - - - - - - + +
+
NameCodeOptions
<%= link_to c.name, { :controller => 'courses', :action => 'show', :id => c.id }, - :method => :get, class: "btn btn-success" %><%= c.code %> - <% if current_lecturer %> - <%= link_to "Manage Course", { :controller => 'courses', :action => 'edit', - :method => :get, :id => c.id }, class: "btn btn-success", style: "text-decoration:none" %> - <% end %> - - <%= link_to "Discussion Board", { :controller => 'discussion_boards', :action => 'show', :id => c.id }, - class: "btn btn-success", method: :get, style: "text-decoration:none" %> - - <% if current_student %> - <% if @share[c.id] == "Show" %> - <%= button_to "Show Performance", {:controller => 'courses', :action => 'share', - :id => c.id, :value => true}, class: "btn btn-success", style: "text-decoration:none" %> - <% else %> - <%= button_to "Hide Performance", {:controller => 'courses', :action => 'share', - :id => c.id, :value => false}, class: "btn btn-success", style: "text-decoration:none" %> - <% end %> - <% end %> -
-<% end %> + +
+
+ <% if !@courses.any? %> +

You have no courses

+ <% end %> +
+ <%= flash[:success_deletion] %> + <%= flash[:success_creation] %> + <% if @courses.any? %> +

Your Courses

+ + + + + + + + + <% @courses.each do |c| %> + + + + + + + + <% end %> +
NameCodeOptions
<%= link_to c.name, { :controller => 'courses', :action => 'show', :id => c.id }, + :method => :get, class: "btn btn-success" %><%= c.code %> + <% if current_lecturer %> + <%= link_to "Manage Course", { :controller => 'courses', :action => 'edit', + :method => :get, :id => c.id }, class: "btn btn-success", style: "text-decoration:none" %> + <% end %> + + <%= link_to "Discussion Board", { :controller => 'discussion_boards', :action => 'show', :id => c.id }, + class: "btn btn-success", method: :get, style: "text-decoration:none" %> + + <% if current_student %> + <% if @share[c.id] == "Show" %> + <%= button_to "Show Performance", {:controller => 'courses', :action => 'share', + :id => c.id, :value => true}, class: "btn btn-success", style: "text-decoration:none" %> + <% else %> + <%= button_to "Hide Performance", {:controller => 'courses', :action => 'share', + :id => c.id, :value => false}, class: "btn btn-success", style: "text-decoration:none" %> + <% end %> + <% end %> +
+ <% end %> +
+
+
diff --git a/tutor/app/views/courses/new.html.erb b/tutor/app/views/courses/new.html.erb index 15f67d88..fbacdd7f 100644 --- a/tutor/app/views/courses/new.html.erb +++ b/tutor/app/views/courses/new.html.erb @@ -1,58 +1,68 @@ -

Create New Course

+ +
+
    +
  • My Courses
    • +
  • Create new Course
    • - -<%= form_for :course, url: courses_path do |f| %> -

    - <%= f.label :Name %>
    - <% unless @new_course.errors[:name].blank? %> - - Name <%= @new_course.errors[:name].join(", ") %> - -
    - <% end %> - <%= f.text_field :name, :value => @new_course.name, class:"form-control", style: "width:300px" %> -

    -

    - <%= f.label :Code %>
    - <% unless @new_course.errors[:code].blank? %> - - Code <%= @new_course.errors[:code].join(", ") %> - -
    - <% end %> - <%= f.text_field :code, :value => @new_course.code, class:"form-control", style: "width:300px" %> -

    -

    - <%= f.label :Description %>
    - <% unless @new_course.errors[:description].blank? %> - - Description <%= @new_course.errors[:description].join(", ") %> - -
    - <% end %> - <%= f.text_area :description, class:"form-control", style:"width:300px",placeholder:"Description", :value => @new_course.description %> -

    -

    - <%= f.label :Semester %>
    - <% unless @new_course.errors[:semester].blank? %> - - Semester <%= @new_course.errors[:semester].join(", ") %> - -
    - <% end %> - <%= f.text_field :semester, :value => @new_course.semester, class:"form-control", style: "width:50px" %> -

    -

    - <%= f.label :Year %>
    - <% unless @new_course.errors[:year].blank? %> - - Year <%= @new_course.errors[:year].join(", ") %> - -
    +

+
+
+

Create New Course

+ <%= form_for :course, url: courses_path do |f| %> +

+ <%= f.label :Name %>
+ <% unless @new_course.errors[:name].blank? %> + + Name <%= @new_course.errors[:name].join(", ") %> + +
+ <% end %> + <%= f.text_field :name, :value => @new_course.name, class:"form-control", style: "width:300px" %> +

+

+ <%= f.label :Code %>
+ <% unless @new_course.errors[:code].blank? %> + + Code <%= @new_course.errors[:code].join(", ") %> + +
+ <% end %> + <%= f.text_field :code, :value => @new_course.code, class:"form-control", style: "width:300px" %> +

+

+ <%= f.label :Description %>
+ <% unless @new_course.errors[:description].blank? %> + + Description <%= @new_course.errors[:description].join(", ") %> + +
+ <% end %> + <%= f.text_area :description, class:"form-control", style:"width:300px",placeholder:"Description", :value => @new_course.description %> +

+

+ <%= f.label :Semester %>
+ <% unless @new_course.errors[:semester].blank? %> + + Semester <%= @new_course.errors[:semester].join(", ") %> + +
+ <% end %> + <%= f.text_field :semester, :value => @new_course.semester, class:"form-control", style: "width:50px" %> +

+

+ <%= f.label :Year %>
+ <% unless @new_course.errors[:year].blank? %> + + Year <%= @new_course.errors[:year].join(", ") %> + +
+ <% end %> + <%= f.text_field :year, :value => @new_course.year, class:"form-control", style: "width:100px" %> +

+

+ <%= f.submit "Save", class: "btn btn-success" %> +

<% end %> - <%= f.text_field :year, :value => @new_course.year, class:"form-control", style: "width:100px" %> -

-

- <%= f.submit "Save", class: "btn btn-success" %> -

-<% end %> \ No newline at end of file +
+
+
diff --git a/tutor/app/views/courses/show.html.erb b/tutor/app/views/courses/show.html.erb index d1574083..a0032e2f 100644 --- a/tutor/app/views/courses/show.html.erb +++ b/tutor/app/views/courses/show.html.erb @@ -1,50 +1,64 @@ -

<%= @course.name %>

-
-
-

- Code: - <%= @course.code %> -

-

- Year: - <%= @course.year %> -

-

- Semester: - <%= @course.semester %> -

-

- Description: - <%= @course.description %> -

-
- -
- <%= link_to "View Discussion Board", { :controller => 'discussion_boards', :action => 'show', :id => @course.id }, class: "btn btn-success", method: :get, style: "text-decoration:none" %> -
+
+ +
+
+

<%= @course.name %>

+
+
+

+ Code: + <%= @course.code %> +

+

+ Year: + <%= @course.year %> +

+

+ Semester: + <%= @course.semester %> +

+

+ Description: + <%= @course.description %> +

+
-
- <% @topics.each do |t| %> -
-
- - <%= link_to t.title, t, style: 'color:#003366;'%> - <%= t.tracks.count %> +
+ <%= link_to "View Discussion Board", { :controller => 'discussion_boards', :action => 'show', :id => @course.id }, class: "btn btn-success", method: :get, style: "text-decoration:none" %>
-
-
    - <% t.tracks.each do |tt|%> - <% color = "label label-default" %> -
  • - <%= link_to tt.title, tt, class: color %> -
    • - <% end %> -
+ +
+ <% @topics.each do |t| %> +
+
+ + <%= link_to t.title, t, style: 'color:#003366;'%> + <%= t.tracks.count %> +
+
+
    + <% t.tracks.each do |tt|%> + <% color = "label label-default" %> +
  • + <%= link_to tt.title, tt, class: color %> +
    • + <% end %> +
+
+
+ <% end %>
-
- <% end %> +
+
diff --git a/tutor/app/views/courses/sign_up.html.erb b/tutor/app/views/courses/sign_up.html.erb index 7ef61281..494e1fb6 100644 --- a/tutor/app/views/courses/sign_up.html.erb +++ b/tutor/app/views/courses/sign_up.html.erb @@ -1,69 +1,81 @@ - -

Course Sign-Up

- - - <% case @status%> - <% when "0" %> -

Sorry, only students can sign up for courses!

- <% when "1" %> -

<%=@status%> / 6

-

Please choose a University

- <% @courses.each do |course| %> - - - - <% end %> - <% when "2" %> -

<%=@status%> / 6

-

Please choose a Semester

- <% @courses.each do |course| %> - - - - <% end %> - <% when "3" %> -

<%=@status%> / 6

-

Please choose a Course

- <% @courses.each do |course| %> - - - - <% end %> - <% when "4" %> -

<%=@status%> / 6

-

Pleas choose an Instructor

- <% @course.lecturers.each do |lecturer| %> - - - - <% end %> - <% when "5" %> -

<%=@status%> / 6

-

Semester: <%=@course.semester%> - Course: <%=@course.name%> - Instructor: <%=@lecturer.name%>

- - - - <% when "6" %> -

<%=@status%> / 6

-

You have signed up to:

-

Semester: <%=@course.semester%> - Course: <%=@course.name%> - Instructor: <%=@lecturer.name%>

- <% when "7" %> -

You are already signed up to this course!

- <% end %> - -
- <%= link_to(course.university, {:action => "sign_up", :university => course.university, - :status => "2"}) %> -
- <%= link_to(course.semester, {:action => "sign_up", :university => params[:university], - :semester => course.semester, :status => "3"}) %> -
- <%= link_to(course.name, {:action => "sign_up", :university => params[:university], - :semester =>course.semester, :id => course.id, :status => "4"} )%> -
- <%= link_to(lecturer.name, {:action => "sign_up", :university => params[:university], - :semester =>@course.semester, :id => @course.id, :lecturer => lecturer.id, :status => "5"} )%> -
- <%= link_to("Sign-Up!", {:action => "sign_up", :university => params[:university], - :semester => @course.semester, :id => @course.id, :lecturer => params[:lecturer], :status => "6"} )%> -
\ No newline at end of file + +
+ +
+
+ +

Course Sign-Up

+ + + <% case @status%> + <% when "0" %> +

Sorry, only students can sign up for courses!

+ <% when "1" %> +

<%=@status%> / 6

+

Please choose a University

+ <% @courses.each do |course| %> + + + + <% end %> + <% when "2" %> +

<%=@status%> / 6

+

Please choose a Semester

+ <% @courses.each do |course| %> + + + + <% end %> + <% when "3" %> +

<%=@status%> / 6

+

Please choose a Course

+ <% @courses.each do |course| %> + + + + <% end %> + <% when "4" %> +

<%=@status%> / 6

+

Pleas choose an Instructor

+ <% @course.lecturers.each do |lecturer| %> + + + + <% end %> + <% when "5" %> +

<%=@status%> / 6

+

Semester: <%=@course.semester%> - Course: <%=@course.name%> - Instructor: <%=@lecturer.name%>

+ + + + <% when "6" %> +

<%=@status%> / 6

+

You have signed up to:

+

Semester: <%=@course.semester%> - Course: <%=@course.name%> - Instructor: <%=@lecturer.name%>

+ <% when "7" %> +

You are already signed up to this course!

+ <% end %> + +
+ <%= link_to(course.university, {:action => "sign_up", :university => course.university, + :status => "2"}) %> +
+ <%= link_to(course.semester, {:action => "sign_up", :university => params[:university], + :semester => course.semester, :status => "3"}) %> +
+ <%= link_to(course.name, {:action => "sign_up", :university => params[:university], + :semester =>course.semester, :id => course.id, :status => "4"} )%> +
+ <%= link_to(lecturer.name, {:action => "sign_up", :university => params[:university], + :semester =>@course.semester, :id => @course.id, :lecturer => lecturer.id, :status => "5"} )%> +
+ <%= link_to("Sign-Up!", {:action => "sign_up", :university => params[:university], + :semester => @course.semester, :id => @course.id, :lecturer => params[:lecturer], :status => "6"} )%> +
+
+
+
\ No newline at end of file From 60f03111d5e2d26ed667bdd5c3c37d3e845a06bf Mon Sep 17 00:00:00 2001 From: ahmed93 Date: Thu, 24 Apr 2014 21:17:24 +0200 Subject: [PATCH 36/55] fixing indentations --- .../javascripts/solutions_constraints.js | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/tutor/app/assets/javascripts/solutions_constraints.js b/tutor/app/assets/javascripts/solutions_constraints.js index 1483ac96..6217872e 100644 --- a/tutor/app/assets/javascripts/solutions_constraints.js +++ b/tutor/app/assets/javascripts/solutions_constraints.js @@ -1,17 +1,17 @@ -// # Place all the behaviors and hooks related to the matching controller here. -// # All this logic will automatically be available in application.js. -// # You can use CoffeeScript in this file: http://coffeescript.org/ +//# Place all the behaviors and hooks related to the matching controller here. +//# All this logic will automatically be available in application.js. +//# You can use CoffeeScript in this file: http://coffeescript.org/ var type = new Array(); var param_name = new Array(); var var_type = new Array(); var var_name = new Array(); -// # [Add Solutions' constraints - Story 4.14] -// # Description: Adds the parameters from the text_fields to array -// # Parameters: none -// # Returns: none -// # Author: Ahmed Mohamed Magdi +//# [Add Solutions' constraints - Story 4.14] +//# Description: Adds the parameters from the text_fields to array +//# Parameters: none +//# Returns: none +//# Author: Ahmed Mohamed Magdi function add_params(field) { var tmp_type = document.getElementById("params_type").value; var tmp_name = document.getElementById("params_name").value; @@ -55,11 +55,11 @@ function add_params(field) { } } -// # [Add Solutions' constraints - Story 4.14] -// # Description: removes selected variable from method Contraints -// # Parameters: none -// # Returns: none -// # Author: Ahmed Mohamed Magdi +//# [Add Solutions' constraints - Story 4.14] +//# Description: removes selected variable from method Contraints +//# Parameters: none +//# Returns: none +//# Author: Ahmed Mohamed Magdi function remove_params(field) { var index = field.id.split("_")[1]; type.splice(index,1); @@ -83,11 +83,11 @@ function remove_params(field) { $('#parameter').append(""); } -// # [Add Solutions' constraints - Story 4.14] -// # Description: Adds the parameters from the text_fields to array -// # Parameters: none -// # Returns: none -// # Author: Ahmed Mohamed Magdi +//# [Add Solutions' constraints - Story 4.14] +//# Description: Adds the parameters from the text_fields to array +//# Parameters: none +//# Returns: none +//# Author: Ahmed Mohamed Magdi function add_variable(field) { var tmp_type = document.getElementById("variable_type").value; var tmp_name = document.getElementById("variable_name").value; @@ -131,11 +131,11 @@ function add_variable(field) { } } -// # [Add Solutions' constraints - Story 4.14] -// # Description: removes selected variable from Variable Contraints -// # Parameters: none -// # Returns: none -// # Author: Ahmed Mohamed Magdi +//# [Add Solutions' constraints - Story 4.14] +//# Description: removes selected variable from Variable Contraints +//# Parameters: none +//# Returns: none +//# Author: Ahmed Mohamed Magdi function remove_variable(field) { var index = field.id.split("_")[1]; var_type.splice(index,1); @@ -159,24 +159,24 @@ function remove_variable(field) { $('#variable').append(""); } -// # [Add Solutions' constraints - Story 4.14] -// # Description: for showing the error massages for the user -// # Parameters: -// # errorArray: array of Error, for multi error massage show -// # Returns: none -// # Author: Ahmed Mohamed Magdi +//# [Add Solutions' constraints - Story 4.14] +//# Description: for showing the error massages for the user +//# Parameters: +//# errorArray: array of Errors, for multi error massage show +//# Returns: none +//# Author: Ahmed Mohamed Magdi function showErrorMessage(arrayOfErrors) { for (var i = 0; i < arrayOfErrors.length; i++) { $("#errors").append("
"+arrayOfErrors[i]+"
"); }; } -// # [Add Solutions' constraints - Story 4.14] -// # Description: Validates Data before sending it to the Server side -// # Parameters: -// # errorArray: array of Error, for multi error massage show -// # Returns: none -// # Author: Ahmed Mohamed Magdi +//# [Add Solutions' constraints - Story 4.14] +//# Description: Validates Data before sending it to the Server side +//# Parameters: +//# errorArray: array of Errors, for multi error massage show +//# Returns: none +//# Author: Ahmed Mohamed Magdi function testingValidation(errorArray,method,name) { if (type.length == 0 && var_type.length == 0 && @@ -206,11 +206,11 @@ function testingValidation(errorArray,method,name) { return errorArray.length == 0; } -// # [Add Solutions' constraints - Story 4.14] -// # Description: submits via ajax to the controller -// # Parameters: none -// # Returns: none -// # Author: Ahmed Mohamed Magdi +//# [Add Solutions' constraints - Story 4.14] +//# Description: submits via ajax to the controller +//# Parameters: none +//# Returns: none +//# Author: Ahmed Mohamed Magdi function submitParams() { $("#errors").html(""); errorArray = new Array(); From 5cf94fab3807a79b8833854391a26d71f448830f Mon Sep 17 00:00:00 2001 From: Ahmed Atef Date: Thu, 24 Apr 2014 21:29:05 +0200 Subject: [PATCH 37/55] Fixing conflicts in problem controller --- tutor/app/controllers/problems_controller.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tutor/app/controllers/problems_controller.rb b/tutor/app/controllers/problems_controller.rb index 7389b747..d5ba96aa 100644 --- a/tutor/app/controllers/problems_controller.rb +++ b/tutor/app/controllers/problems_controller.rb @@ -84,7 +84,6 @@ def new end end -<<<<<<< HEAD # [Remove Problem - Story 4.18] # This action takes the problem id, remove it from the database # and then redirects the user to the show page of the track that had the problem @@ -103,7 +102,6 @@ def destroy end end -======= # [Edit Problem - 4.5] # Update the problem's title or description # Parameters: @@ -178,5 +176,5 @@ def done def problem_params params.require(:Problem).permit(:title, :description, :track_id) end ->>>>>>> master + end \ No newline at end of file From c0ab70b345b2ee0b891d509955f6bf4c697721c1 Mon Sep 17 00:00:00 2001 From: Mohab Date: Thu, 24 Apr 2014 21:29:21 +0200 Subject: [PATCH 38/55] fixing TA problem --- tutor/app/views/courses/index.html.erb | 2 +- tutor/app/views/courses/new.html.erb | 2 +- tutor/app/views/courses/show.html.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tutor/app/views/courses/index.html.erb b/tutor/app/views/courses/index.html.erb index 4f2b3e4b..0ce82820 100644 --- a/tutor/app/views/courses/index.html.erb +++ b/tutor/app/views/courses/index.html.erb @@ -4,7 +4,7 @@
  • My Courses
    • <% if lecturer_signed_in? %>
  • Create new Course
    • - <% else %> + <% elsif student_signed_in? %>
  • Sign up for a course
    • <% end %> diff --git a/tutor/app/views/courses/new.html.erb b/tutor/app/views/courses/new.html.erb index fbacdd7f..70618fcf 100644 --- a/tutor/app/views/courses/new.html.erb +++ b/tutor/app/views/courses/new.html.erb @@ -65,4 +65,4 @@ <% end %>
    -
    +
    \ No newline at end of file diff --git a/tutor/app/views/courses/show.html.erb b/tutor/app/views/courses/show.html.erb index a0032e2f..18f5a9e4 100644 --- a/tutor/app/views/courses/show.html.erb +++ b/tutor/app/views/courses/show.html.erb @@ -3,7 +3,7 @@
  • My Courses
    • <% if lecturer_signed_in? %>
  • Create new Course
    • - <% else %> + <% elsif student_signed_in? %>
  • Sign up for a course
    • <% end %> From 4849766300cf51bb2264cdcd624387bebaf88556 Mon Sep 17 00:00:00 2001 From: Ahmed Atef Date: Thu, 24 Apr 2014 21:36:05 +0200 Subject: [PATCH 39/55] Fixed typo --- tutor/app/views/problems/edit.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutor/app/views/problems/edit.html.erb b/tutor/app/views/problems/edit.html.erb index ee3ce125..6bf63c14 100644 --- a/tutor/app/views/problems/edit.html.erb +++ b/tutor/app/views/problems/edit.html.erb @@ -25,7 +25,7 @@ <%= render partial: "test_cases/index" %> -<%= render partial: "model_answers/new" %> +<%= render partial: "model_answers/index" %> <%= render partial: "problems/success_options" %> <% if flash[:notice] %> From 0f33971c9eb5691248bfab550ebcf7abf0514a54 Mon Sep 17 00:00:00 2001 From: ahmed93 Date: Thu, 24 Apr 2014 21:49:01 +0200 Subject: [PATCH 40/55] hadling error --- tutor/app/assets/javascripts/solutions_constraints.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tutor/app/assets/javascripts/solutions_constraints.js b/tutor/app/assets/javascripts/solutions_constraints.js index 6217872e..4b764148 100644 --- a/tutor/app/assets/javascripts/solutions_constraints.js +++ b/tutor/app/assets/javascripts/solutions_constraints.js @@ -161,8 +161,8 @@ function remove_variable(field) { //# [Add Solutions' constraints - Story 4.14] //# Description: for showing the error massages for the user -//# Parameters: -//# errorArray: array of Errors, for multi error massage show +//# Parameters: +//# errorArray: array of Errors,for multi error massage show //# Returns: none //# Author: Ahmed Mohamed Magdi function showErrorMessage(arrayOfErrors) { @@ -173,8 +173,8 @@ function showErrorMessage(arrayOfErrors) { //# [Add Solutions' constraints - Story 4.14] //# Description: Validates Data before sending it to the Server side -//# Parameters: -//# errorArray: array of Errors, for multi error massage show +//# Parameters: +//# method_cons: Hash containting the Method parameters //# Returns: none //# Author: Ahmed Mohamed Magdi function testingValidation(errorArray,method,name) { From bed857bbe4d6d662aa60ac326fb0632b5ebc7775 Mon Sep 17 00:00:00 2001 From: MohabGhanim Date: Thu, 24 Apr 2014 22:06:38 +0200 Subject: [PATCH 41/55] adding space before tag --- tutor/app/views/courses/edit.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutor/app/views/courses/edit.html.erb b/tutor/app/views/courses/edit.html.erb index 4ea8a085..32b758d5 100644 --- a/tutor/app/views/courses/edit.html.erb +++ b/tutor/app/views/courses/edit.html.erb @@ -85,7 +85,7 @@ <%= button_to "Back", {:controller => 'courses', :action => 'index'}, class: "btn btn-success" , style: "margin-left: - 600px; margin-top: 250px", :method => :get%> + 600px; margin-top: 250px", :method => :get %>
    - \ No newline at end of file + From db020a58149bcb381431601630c581ca89b5299b Mon Sep 17 00:00:00 2001 From: MohabGhanim Date: Thu, 24 Apr 2014 22:09:19 +0200 Subject: [PATCH 42/55] adding space before tag --- tutor/app/views/courses/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutor/app/views/courses/show.html.erb b/tutor/app/views/courses/show.html.erb index 18f5a9e4..62dad37a 100644 --- a/tutor/app/views/courses/show.html.erb +++ b/tutor/app/views/courses/show.html.erb @@ -49,7 +49,7 @@ <% t.tracks.each do |tt|%> <% color = "label label-default" %>
  • + data-placement="top" title="<%= tt.difficulty %>"> <%= link_to tt.title, tt, class: color %>
    • <% end %> From 2d81d2e5a8de915991291bab1dc5c92cc12b1de0 Mon Sep 17 00:00:00 2001 From: MohabGhanim Date: Thu, 24 Apr 2014 22:09:53 +0200 Subject: [PATCH 43/55] removing empty line --- tutor/app/views/courses/sign_up.html.erb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tutor/app/views/courses/sign_up.html.erb b/tutor/app/views/courses/sign_up.html.erb index 494e1fb6..47b7d4f0 100644 --- a/tutor/app/views/courses/sign_up.html.erb +++ b/tutor/app/views/courses/sign_up.html.erb @@ -3,7 +3,6 @@
    @@ -78,4 +77,4 @@
    - \ No newline at end of file + From 2508f8ec09ae08d1b3c9d35367e9e09eaf176832 Mon Sep 17 00:00:00 2001 From: MohabGhanim Date: Thu, 24 Apr 2014 22:11:05 +0200 Subject: [PATCH 44/55] removing empty line --- tutor/app/views/courses/edit.html.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/tutor/app/views/courses/edit.html.erb b/tutor/app/views/courses/edit.html.erb index 32b758d5..9eb04e8d 100644 --- a/tutor/app/views/courses/edit.html.erb +++ b/tutor/app/views/courses/edit.html.erb @@ -2,7 +2,6 @@