From 005185898aeac1e59044392858308eb2f2caa22b Mon Sep 17 00:00:00 2001
From: marisalerno <salerno.marisa@gmail.com>
Date: Sun, 23 May 2021 16:41:34 -0300
Subject: [PATCH 1/2] Add Resource Geogebra

---
 app/Http/Controllers/ResourceController.php |  2 +-
 app/Resource.php                            |  2 +-
 composer.json                               |  3 +++
 database/factories/ResourceFactory.php      |  3 ++-
 database/seeds/ResourcesTableSeeder.php     |  1 +
 public/js/resources.js                      | 24 ++++++++++++++----
 resources/assets/js/resources.js            | 20 ++++++++++++---
 resources/views/Resource/create.blade.php   |  8 ++++++
 resources/views/Resource/show.blade.php     | 28 ++++++++++++++-------
 resources/views/Resource/update.blade.php   |  7 ++++++
 10 files changed, 77 insertions(+), 21 deletions(-)

diff --git a/app/Http/Controllers/ResourceController.php b/app/Http/Controllers/ResourceController.php
index 99fb9e0..2bc0726 100644
--- a/app/Http/Controllers/ResourceController.php
+++ b/app/Http/Controllers/ResourceController.php
@@ -9,7 +9,7 @@
 class ResourceController extends Controller
 {
 
-    public $types = ['Audio','Video', 'Imagen', 'Documento','Link'];
+    public $types = ['Audio','Video', 'Imagen', 'Documento','Link', 'Geogebra'];
     /**
      * Display a listing of the resource.
      *
diff --git a/app/Resource.php b/app/Resource.php
index 209bc95..677e98f 100755
--- a/app/Resource.php
+++ b/app/Resource.php
@@ -6,5 +6,5 @@
 
 class Resource extends Model
 {
-      protected $fillable = ['name','type', 'path', 'link'];
+      protected $fillable = ['name','type', 'path', 'link', 'geogebra_id'];
 }
diff --git a/composer.json b/composer.json
index 7380c61..c3b2b6f 100644
--- a/composer.json
+++ b/composer.json
@@ -39,6 +39,9 @@
         }
     },
     "autoload": {
+        "classmap": [
+          "database"
+        ],
         "psr-4": {
             "App\\": "app/",
             "Database\\Factories\\": "database/factories/",
diff --git a/database/factories/ResourceFactory.php b/database/factories/ResourceFactory.php
index 7a1d1ec..60c39b2 100644
--- a/database/factories/ResourceFactory.php
+++ b/database/factories/ResourceFactory.php
@@ -18,6 +18,7 @@
     return [
         'name' => $faker->word,
         'type' => $faker->text,
-        'link' => $faker->url
+        'link' => $faker->url,
+        'geogebra' => $faker->GGBApplet
     ];
 });
diff --git a/database/seeds/ResourcesTableSeeder.php b/database/seeds/ResourcesTableSeeder.php
index a9adcac..d702408 100644
--- a/database/seeds/ResourcesTableSeeder.php
+++ b/database/seeds/ResourcesTableSeeder.php
@@ -17,6 +17,7 @@ public function run()
       factory(App\Resource::class, 1)->create(['name'=>'presentación', 'type'=>'presentación de diapositivas']);
       factory(App\Resource::class, 1)->create(['name'=>'hipervínculo', 'type'=>'hipervínculo']);
       factory(App\Resource::class, 1)->create(['name'=>'imagen', 'type'=>'imagen']);
+      factory(App\Resource::class, 1)->create(['name'=>'geogebra', 'type'=>'app geogebra']);
 
     }
 }
diff --git a/public/js/resources.js b/public/js/resources.js
index bf5d51f..14b8d25 100644
--- a/public/js/resources.js
+++ b/public/js/resources.js
@@ -31857,14 +31857,28 @@ module.exports = __webpack_require__(44);
 
 __webpack_require__(9);
 $(document).ready(function () {
-  function toggleControls(value) {
+
+  function toggleControls(value){
     if (value == 'Link') {
       $('.link').show();
       $('.file').hide();
-    } else {
-      $('.link').hide();
-      $('.file').show();
+      $('.ggb-element').hide();
     }
+    else if (value == 'Documento'){
+            $('.link').hide();
+            $('.file').show();
+            $('.ggb-element').hide();
+          }
+          else if (value == 'Geogebra'){
+                  $('.link').hide();
+                  $('.file').hide();
+                  $('.ggb-element').show();
+                }
+                else {
+                  $('.link').hide();
+                  $('.file').show();
+                  $('.ggb-element').hide();
+                }
   }
 
   toggleControls($('#type')[0].value);
@@ -31875,4 +31889,4 @@ $(document).ready(function () {
 });
 
 /***/ })
-/******/ ]);
\ No newline at end of file
+/******/ ]);
diff --git a/resources/assets/js/resources.js b/resources/assets/js/resources.js
index 3b1799a..bed9dfb 100755
--- a/resources/assets/js/resources.js
+++ b/resources/assets/js/resources.js
@@ -4,11 +4,23 @@ $(document).ready(function() {
     if (value == 'Link') {
       $('.link').show();
       $('.file').hide();
+      $('.ggb-element').hide();
     }
-    else{
-      $('.link').hide();
-      $('.file').show();
-    }
+    else if (value == 'Documento'){
+            $('.link').hide();
+            $('.file').show();
+            $('.ggb-element').hide();
+          }
+          else if (value == 'Geogebra'){
+                  $('.link').hide();
+                  $('.file').hide();
+                  $('.ggb-element').show();
+                }
+                else {
+                  $('.link').hide();
+                  $('.file').show();
+                  $('.ggb-element').hide();
+                }
   }
 
   toggleControls($('#type')[0].value);
diff --git a/resources/views/Resource/create.blade.php b/resources/views/Resource/create.blade.php
index ab6b385..a6ae364 100755
--- a/resources/views/Resource/create.blade.php
+++ b/resources/views/Resource/create.blade.php
@@ -2,6 +2,7 @@
 
 @section('pagespecificscripts')
   <script src="{{ asset('js/resources.js') }}"></script>
+  <script src="https://www.geogebra.org/apps/deployggb.js"></script>
 @stop
 
 @section('content')
@@ -42,6 +43,13 @@
                 </div>
             </div>
 
+            <div class="form-group ggb-element">
+                <label for="ggb-element" class="col-md-2 control-label"><p>Geogebra</p></label>
+                <div class="col-md-6">
+                    <input id="ggb-element" type="GGBApplet" class="form-control" name="ggb.element" >
+                </div>
+            </div>
+
            <div class="form-group">
                 <div class="col-md-6 col-md-offset-4">
                     <button type="submit" class="btn btn-primary">
diff --git a/resources/views/Resource/show.blade.php b/resources/views/Resource/show.blade.php
index 9fcd491..4cf1fb3 100755
--- a/resources/views/Resource/show.blade.php
+++ b/resources/views/Resource/show.blade.php
@@ -22,16 +22,26 @@
               <p>{!!$resource->type!!} </p>
             </div>
 
-            @if(isset($resource->path))
-              <div class="container">
-                <h4>Archivo</h4>
-                <a href="{{asset('/storage/'.$resource->path)}}" download="{{$resource->name}}">Bajar archivo actual</a>
-              </div>
+            @if ($resource->type == "Geogebra")
+              <div id="ggb-element"></div>
+              <script>
+                var ggbApp = new GGBApplet({"appName": "graphing", "width": 800, "height": 600, "showToolBar": true, "showAlgebraInput": true, "showMenuBar": true, "material_id":"{$resource->geogebra_id)}" }, true);
+                window.addEventListener("load", function() {
+                  ggbApp.inject('ggb-element');
+                });
+              </script>
             @else
-              <div class="container">
-                <h4>Link</h4>
-                <a href="{{asset($resource->link)}}" target="popup" onclick="window.open('', 'popup', 'width = 800, height = 600')">{{$resource->link}}</a>
-              </div>
+              @if(isset($resource->path))
+                <div class="container">
+                  <h4>Archivo</h4>
+                  <a href="{{asset('/storage/'.$resource->path)}}" download="{{$resource->name}}">Bajar archivo actual</a>
+                </div>
+              @else
+                <div class="container">
+                  <h4>Link</h4>
+                  <a href="{{asset($resource->link)}}" target="popup" onclick="window.open('', 'popup', 'width = 800, height = 600')">{{$resource->link}}</a>
+                </div>
+              @endif
             @endif
 
         </form>
diff --git a/resources/views/Resource/update.blade.php b/resources/views/Resource/update.blade.php
index 62da49d..e2b6bf6 100755
--- a/resources/views/Resource/update.blade.php
+++ b/resources/views/Resource/update.blade.php
@@ -55,6 +55,13 @@
           </div>
           @endif
 
+          <div class="form-group ggb-element">
+              <label for="ggb-element" class="col-md-2 control-label"><p>Geogebra</p></label>
+              <div class="col-md-6">
+                  <input id="ggb-element" type="text" class="form-control" value="{{$resource->geogebra_id}}" name="ggb-element" autofocus>
+              </div>
+          </div>
+
           <div class="form-group">
               <div class="col-md-6 col-md-offset-4">
                   <button type="submit" class="btn btn-primary">

From b29ebc518b2faf6c6fcb5f6620d8fd2b7b3a5b13 Mon Sep 17 00:00:00 2001
From: marisalerno <salerno.marisa@gmail.com>
Date: Sun, 25 Jul 2021 17:32:54 -0300
Subject: [PATCH 2/2] possible changes to make geogebra work

---
 app/Http/Controllers/ResourceController.php            |  5 +++--
 app/Resource.php                                       |  2 +-
 database/factories/ResourceFactory.php                 |  2 +-
 .../2018_02_16_195855_create_resources_table.php       |  1 +
 database/seeds/ResourcesTableSeeder.php                |  2 +-
 resources/assets/js/resources.js                       |  7 +------
 resources/views/Resource/create.blade.php              | 10 ++++++++--
 resources/views/Resource/show.blade.php                |  3 ++-
 8 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/app/Http/Controllers/ResourceController.php b/app/Http/Controllers/ResourceController.php
index 2bc0726..848ec17 100644
--- a/app/Http/Controllers/ResourceController.php
+++ b/app/Http/Controllers/ResourceController.php
@@ -10,6 +10,7 @@ class ResourceController extends Controller
 {
 
     public $types = ['Audio','Video', 'Imagen', 'Documento','Link', 'Geogebra'];
+    public $geotypes = ['graphing', 'geometry', '3d'];
     /**
      * Display a listing of the resource.
      *
@@ -28,7 +29,7 @@ public function index()
      */
     public function create()
     {
-        return view('Resource.create',['types' => $this->types]);
+        return view('Resource.create',['types' => $this->types], ['geotypes' => $this->geotypes]);
     }
 
     /**
@@ -66,7 +67,7 @@ public function show(Resource $resource)
      */
     public function edit(Resource $resource)
     {
-        return view('Resource.update',['resource'=> $resource, 'types' => $this->types]);
+        return view('Resource.update',['resource'=> $resource, 'types' => $this->types], ['geotypes' => $this->geotypes]);
     }
 
     /**
diff --git a/app/Resource.php b/app/Resource.php
index 677e98f..1b2295e 100755
--- a/app/Resource.php
+++ b/app/Resource.php
@@ -6,5 +6,5 @@
 
 class Resource extends Model
 {
-      protected $fillable = ['name','type', 'path', 'link', 'geogebra_id'];
+      protected $fillable = ['name','type', 'path', 'link', 'geotype'];
 }
diff --git a/database/factories/ResourceFactory.php b/database/factories/ResourceFactory.php
index 60c39b2..2ffcc7c 100644
--- a/database/factories/ResourceFactory.php
+++ b/database/factories/ResourceFactory.php
@@ -19,6 +19,6 @@
         'name' => $faker->word,
         'type' => $faker->text,
         'link' => $faker->url,
-        'geogebra' => $faker->GGBApplet
+        'geotype' => 'ZT6xkDYM'
     ];
 });
diff --git a/database/migrations/2018_02_16_195855_create_resources_table.php b/database/migrations/2018_02_16_195855_create_resources_table.php
index 8c5fe14..c67079b 100755
--- a/database/migrations/2018_02_16_195855_create_resources_table.php
+++ b/database/migrations/2018_02_16_195855_create_resources_table.php
@@ -19,6 +19,7 @@ public function up()
             $table->string('type');
             $table->string('path')->nullable();
             $table->string('link')->nullable();
+            $table->string('geotype')->nullable();
             $table->timestamps();
         });
     }
diff --git a/database/seeds/ResourcesTableSeeder.php b/database/seeds/ResourcesTableSeeder.php
index d702408..4965f18 100644
--- a/database/seeds/ResourcesTableSeeder.php
+++ b/database/seeds/ResourcesTableSeeder.php
@@ -17,7 +17,7 @@ public function run()
       factory(App\Resource::class, 1)->create(['name'=>'presentación', 'type'=>'presentación de diapositivas']);
       factory(App\Resource::class, 1)->create(['name'=>'hipervínculo', 'type'=>'hipervínculo']);
       factory(App\Resource::class, 1)->create(['name'=>'imagen', 'type'=>'imagen']);
-      factory(App\Resource::class, 1)->create(['name'=>'geogebra', 'type'=>'app geogebra']);
+      factory(App\Resource::class, 1)->create(['name'=>'ggb-element', 'type'=>'app geogebra']);
 
     }
 }
diff --git a/resources/assets/js/resources.js b/resources/assets/js/resources.js
index bed9dfb..f8f6736 100755
--- a/resources/assets/js/resources.js
+++ b/resources/assets/js/resources.js
@@ -6,12 +6,7 @@ $(document).ready(function() {
       $('.file').hide();
       $('.ggb-element').hide();
     }
-    else if (value == 'Documento'){
-            $('.link').hide();
-            $('.file').show();
-            $('.ggb-element').hide();
-          }
-          else if (value == 'Geogebra'){
+    else if (value == 'Geogebra'){
                   $('.link').hide();
                   $('.file').hide();
                   $('.ggb-element').show();
diff --git a/resources/views/Resource/create.blade.php b/resources/views/Resource/create.blade.php
index a6ae364..e19840a 100755
--- a/resources/views/Resource/create.blade.php
+++ b/resources/views/Resource/create.blade.php
@@ -3,6 +3,7 @@
 @section('pagespecificscripts')
   <script src="{{ asset('js/resources.js') }}"></script>
   <script src="https://www.geogebra.org/apps/deployggb.js"></script>
+
 @stop
 
 @section('content')
@@ -44,9 +45,13 @@
             </div>
 
             <div class="form-group ggb-element">
-                <label for="ggb-element" class="col-md-2 control-label"><p>Geogebra</p></label>
+                <label for="geotype" class="col-md-2 control-label"><p>Seleccione tipo de elemento Geogebra</p></label>
                 <div class="col-md-6">
-                    <input id="ggb-element" type="GGBApplet" class="form-control" name="ggb.element" >
+                      <select class="form-control" name="geotype" id= "geotype">
+                        @foreach ($geotypes as $geotype)
+                          <option value="{{$geotype}}">{{$geotype}}</option>
+                        @endforeach
+                      </select>
                 </div>
             </div>
 
@@ -60,4 +65,5 @@
         </form>
     </div>
 </div>
+
 @endsection
diff --git a/resources/views/Resource/show.blade.php b/resources/views/Resource/show.blade.php
index 4cf1fb3..aec4f9a 100755
--- a/resources/views/Resource/show.blade.php
+++ b/resources/views/Resource/show.blade.php
@@ -2,6 +2,7 @@
 
 @section('pagespecificscripts')
   <script src="{{ asset('js/resources.js') }}"></script>
+  <script src="https://www.geogebra.org/apps/deployggb.js"></script>
 @stop
 
 @section('content')
@@ -25,7 +26,7 @@
             @if ($resource->type == "Geogebra")
               <div id="ggb-element"></div>
               <script>
-                var ggbApp = new GGBApplet({"appName": "graphing", "width": 800, "height": 600, "showToolBar": true, "showAlgebraInput": true, "showMenuBar": true, "material_id":"{$resource->geogebra_id)}" }, true);
+                var ggbApp = new GGBApplet({"appName": "{$resource->geotype}", "width": 800, "height": 600, "showToolBar": true, "showAlgebraInput": true, "showMenuBar": true, "material_id":"{$resource->name)}" }, true);
                 window.addEventListener("load", function() {
                   ggbApp.inject('ggb-element');
                 });