Merge develop to master

.env.laradock

@@ -900,7 +900,7 @@ TRAEFIK_HOST_HTTP_PORT=80
 TRAEFIK_HOST_HTTPS_PORT=443
 TRAEFIK_DASHBOARD_PORT=8888
 # basic authentication for traefik dashboard username: admin password:admin
-TRAEFIK_DASHBOARD_USER=admin:$2y$10$lXaL3lj6raFic6rFqr2.lOBoCudAIhB6zyoqObNg290UFppiUzTTi
+TRAEFIK_DASHBOARD_USER='admin:$2y$10$lXaL3lj6raFic6rFqr2.lOBoCudAIhB6zyoqObNg290UFppiUzTTi'
 ACME_DOMAIN=example.org
 [email protected]
 

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,38 +1,31 @@
 ---
-name: Bug report
-about: Create a report to help us improve
+name: Reportar un bug
+about: Crea un incidencia para ayudar a mejorar evidencia
 title: ''
 labels: ''
 assignees: ''
 
 ---
 
-**Describe the bug**
-A clear and concise description of what the bug is.
+**¿Qué pasos producen el problema?**
 
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
+1. 
 
-**Expected behavior**
-A clear and concise description of what you expected to happen.
+2.
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+3.
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
+**¿Cuál es el resultado esperado?**
 
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+* E:
+
+* R: 
+
+**¿Qué versión de producto y sistema operativo estoy usando?**
+
+*
+
+**Detalles adicionales:**
+
+* 
 
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/nueva_funcionalidad.md

@@ -6,18 +6,18 @@ tags: ''
 
 ---
 
-**¿Está funcionalidad está asociada a un problema? Por favor, descríbelo.**
+**¿Está funcionalidad está asociada a un problema?**
 
-Una descripción concisa y clara del problema. E.g: Siempre me frustra que... [...]
+* 
 
-**Describe la solución que te gustaría**
+**¿Qué solución planteo?**
 
-Una descripción concisa y clara de lo que te gustaría que ocurriese.
+* 
 
-**Describe alternativas que hayas considerado**
+**¿Existe otras soluciones posibles?**
 
-Una descripción concisa y clara de soluciones alternativas o funcionalidades que hayas considerado.
+*
 
-**Contenido adicional**
+**Detalles adicionales:**
 
-Añade cualquier otro contenido o capturas sobre la funcionalidad requerida.
+* 

.github/workflows/cicd.yml

@@ -74,7 +74,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
         with:
-          images: drorganvidez/evidentia
+          images: innosoftevidentia3/innosoft-evidentia-3
 
       - name: Build and push
         uses: docker/build-push-action@v2

.gitignore

@@ -14,3 +14,8 @@ yarn-error.log
 resources/.DS_Store
 .idea/
 .editorconfig
+package-lock.json
+*.lock
+composer.lock
+laradock
+

access_workspace.bat

@@ -1,2 +1,2 @@
 cd laradock
-docker exec -it laradock_workspace_1 bash
+docker exec -it laradock-workspace-1 bash

app/Exports/MyTasksExport.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Exports;
+
+use App\Models\Task;
+use Illuminate\Support\Facades\Auth;
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+
+class MyTasksExport implements FromCollection, WithHeadings
+{
+    /**
+     * @return \Illuminate\Support\Collection
+     */
+    public function collection()
+    {
+        $tasks = Task::where("user_id","=",Auth::id())->get();
+
+        $res = collect();
+        foreach($tasks as $task){
+
+            if(Auth::User()->hasRole('STUDENT')) {
+
+                $array = [
+                    'Titulo' => strtoupper(trim($task->title)),
+                    'Horas' => strtoupper(trim($task->hours)),
+                    'Comité' => strtoupper(trim($task->comittee->name)),
+                    'Fecha de inicio' => strtoupper(trim($task->start_date)),
+                    'Fecha fin' => strtoupper(trim($task->end_date)),
+                    'Creada' =>  strtoupper(trim($task->created_at))
+                ];
+
+                $object = (object) $array;
+                $res->push($object);
+            }
+        }
+        return $res;
+    }
+
+    public function headings(): array
+    {
+        return [
+            'Título',
+            'Horas',
+            'Comité',
+            'Fecha de inicio',
+            'Fecha fin',
+            'Creada'
+        ];
+    }
+}

app/Http/Controllers/EvidenceController.php

@@ -32,8 +32,22 @@ public function view($instance,$id)
         $instance = \Instantiation::instance();
         $evidence = Evidence::find($id);
 
+        /*lista de archivos segun el tipo*/
+
+        $evidence_storaged_files_type = collect();
+        foreach($evidence-> proofs as $proof){
+            $evidence_storaged_files_type->push($proof->file->type);
+        }
+        $evidence_vp_type = collect();
+        foreach($evidence->verified_proofs as $vp)
+        {
+            $evidence_vp_type->push($vp->type);
+        }
+        $evidence_storaged_files_type = $evidence_storaged_files_type->unique();
+        $evidence_vp_type = $evidence_vp_type->unique();
+
         return view('evidence.view',
-            ['instance' => $instance, 'evidence' => $evidence]);
+            ['instance' => $instance, 'evidence' => $evidence, 'dict_storaged_files' => $evidence_storaged_files_type, 'dict_vp_filetypes' => $evidence_vp_type]);
     }
 
     public function list()
@@ -303,6 +317,10 @@ private function delete_files($evidence)
         {
             $proof->file->delete();
         }
+        foreach($evidence->verified_proofs as $proof)
+        {
+            $proof->delete();
+        }
     }
 
     /****************************************************************************

app/Http/Controllers/KanbanController.php

@@ -0,0 +1,172 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\Comittee;
+use App\Models\Kanban;
+use App\Models\Issue;
+use App\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
+use Maatwebsite\Excel\Facades\Excel;
+use App\Rules\MaxCharacters;
+use App\Rules\MinCharacters;
+
+class KanbanController extends Controller
+{
+
+    public function __construct()
+    {
+        $this->middleware('auth');
+        $this->middleware('checkroles:PRESIDENT|COORDINATOR|REGISTER_COORDINATOR|SECRETARY|STUDENT');
+    }
+
+
+    public function view($instance,$id)
+    {
+        $instance = \Instantiation::instance();
+        $kanban = Kanban::find($id);
+
+        $issues = Issue::where(['kanban_id' => $id])->get();
+
+        return view('kanban.view',
+            ['instance' => $instance, 'kanban' => $kanban, 'issues' =>$issues]);
+    }
+
+    public function list()
+    {
+        $kanban = Kanban::where(['user_id' => Auth::id(),'last' => true])->get();
+        $instance = \Instantiation::instance();
+
+        $kanban = $kanban->reverse();
+
+        return view('kanban.list',
+            ['instance' => $instance, 'kanban' => $kanban]);
+    }
+
+    /****************************************************************************
+     * CREATE A KANBAN
+     ****************************************************************************/
+
+    public function create()
+    {
+        $instance = \Instantiation::instance();
+        $comittees = Comittee::all();
+
+        return view('kanban.create', ['route' => route('kanban.new',$instance),
+                                      'instance' => $instance,
+                                      'comittees' => $comittees]);
+    }
+
+    public function new(Request $request)
+    {
+
+        $instance = \Instantiation::instance();
+
+        $request->validate([
+            'title' => 'required|min:5|max:255'
+        ]);
+
+        // datos necesarios para crear tableros
+        $user = Auth::user();
+
+        // creación de un nuevo
+        $kanban = Kanban::create([
+            'title' => $request->input('title'),
+            'user_id' => $user->id,
+            'comittee_id' => $request->input('comittee')
+        ]);
+
+        // cómputo del sello
+        //$kanban = \Stamp::compute_evidence($evidence);
+        $kanban->save();
+
+        return redirect()->route('kanban.list',$instance)->with('success', 'Tablero creado con éxito.');
+
+    }
+
+     /****************************************************************************
+     * REMOVE A KANBAN
+     ****************************************************************************/
+    public function remove_kanban(Request $request, $instance)
+    {
+        $kanban = Kanban::find($request->_id);
+        $instance = \Instantiation::instance();
+
+        $issues = Issue::all();
+
+        foreach($issues as $issue)
+        {
+            if($issue->kanban_id == $kanban->id){
+                $issue -> delete();
+            }
+        }
+
+        $kanban->delete();
+
+        return redirect()->route('kanban.list', ['instance' => $instance,
+                                                 'id' => $kanban -> id])->with('success', 'Tablero eliminado con éxito.');
+    }
+
+
+    /****************************************************************************
+     * CREATE AN ISSUE
+     ****************************************************************************/
+
+    public function create_issue($instance, $id)
+    {
+        $instance = \Instantiation::instance();
+        $kanban = Kanban::find($id);
+        $users = User::orderBy('surname')->get();
+
+        return view('kanban.create_issue', ['route' => route('kanban.view.issue.new', ['instance' => $instance, 'id' => $kanban->id]),
+                                                 'users' => $users,
+                                                 'instance' => $instance,
+                                                 'kanban' => $kanban]);
+    }
+
+
+    public function new_issue(Request $request, $instance, $id)
+    {
+
+        $instance = \Instantiation::instance();
+
+        $request->validate([
+            'title' => 'required|min:5|max:255',
+            'description' => ['required',new MinCharacters(10),new MaxCharacters(20000)],
+            'users' => 'required|array|min:1',
+            'estimated_hours' => ['numeric','sometimes','min:0','max:99']
+        ]);
+
+        // datos necesarios para crear issue
+        $user = Auth::user();
+
+        // creación de un nuevo
+        $issue = Issue::create([
+            'title' => $request->input('title'),
+            'description' => $request->input('description'),
+            'estimated_hours'=> $request->input('estimated_hours'),
+            'kanban_id'=>$id
+        ]);
+
+        $issue->save();
+
+        // Asociamos los usuarios a la issue
+        $users_ids = $request->input('users',[]);
+
+        foreach($users_ids as $user_id)
+        {
+
+            $user = User::find($user_id);
+            $issue->users()->attach($user);
+
+        }
+        $kanban = Kanban::find($id);
+
+        return redirect()->route('kanban.view', ['instance' => $instance, 'id' => $kanban->id])->with('success', 'Tarea creada con éxito.');
+
+    }
+
+
+}