+
+
+
+
+
+
+
+
+
+
Lista de tareas
+
+
+
+
+
+
+ | ID |
+ Título |
+ |
+ Descripción |
+ Horas |
+ Inicio-Fin |
+ Comité |
+
+
+
+ @foreach($tasks as $task)
+
+ | {{$task->id}} |
+ {{$task->title}} |
+ |
+ {{$task->description}} |
+ {{$task->hours}} |
+ {{substr($task->start_date,11,5)}} - {{substr($task->end_date,11,5)}} |
+
+
+ |
+
+ @endforeach
+
+
+
+
+
+
+
+
+
+ @section('scripts')
+
+
+
+ @endsection
+
+@endsection
diff --git a/resources/views/task/view.blade.php b/resources/views/task/view.blade.php
new file mode 100644
index 00000000..0f10749e
--- /dev/null
+++ b/resources/views/task/view.blade.php
@@ -0,0 +1,49 @@
+@extends('layouts.app')
+
+@section('title', 'Ver tarea: '.$task->title)
+
+@section('title-icon', 'fab fa-battle-net')
+
+@section('breadcrumb')
+
Home
+
+
Mis tareas
+
+
+
@yield('title')
+@endsection
+
+@section('content')
+
+
+
+
+
+
+
+
+
+
Comité:
+
Horas: {{$task->hours}} horas
+
Fecha Inicio: {{$task->start_date}}
+
Fecha Inicio: {{$task->end_date}}
+
Descripción:
{!! $task->description !!}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@endsection
diff --git a/routes/web.php b/routes/web.php
index 4942352a..3574053e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -5,6 +5,9 @@
use App\Http\Controllers\MeetingSecretaryController;
use App\Http\Controllers\MeetingController;
use App\Http\Controllers\EvidenceController;
+use App\Http\Controllers\KanbanController;
+use App\Http\Controllers\TaskController;
+use App\Http\Controllers\LectureDashboardController;
use App\Http\Controllers\SignController;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Route;
@@ -133,6 +136,20 @@
Route::post('/xls/upload/process','UploadController@process')->name('xls.upload.process');
Route::get('/xls/upload/remove/{file_name}','UploadController@remove')->name('xls.upload.remove');
+ /**
+ * TASKS
+ */
+ Route::get('/task/list', 'TaskController@list')->name('task.list');
+ Route::post('/task/remove', 'TaskController@remove')->name('task.remove');
+ Route::post('/task/create', 'TaskController@create')->name('task.create');
+ Route::post('/task/edit/save', 'TaskController@save')->name('task.save');
+ Route::middleware(['checknotnull:Task'])->group(function () {
+ Route::get('/task/view/{id}', 'TaskController@view')->name('task.view');
+ Route::get('/task/edit/{id}', 'TaskController@edit')->name('task.edit');
+
+ });
+
+ Route::get('/task/list/export/{ext}',[TaskController::class , 'export'])->name('task.list.export');
/**
* EVIDENCES
@@ -295,6 +312,23 @@
});
+ /**
+ * KANBAN
+ */
+ Route::get('/kanban/list/', 'KanbanController@list')->name('kanban.list');
+ Route::get('/kanban/view/{id}', 'KanbanController@view')->name('kanban.view');
+ Route::get('/kanban/create', 'KanbanController@create')->name('kanban.create');
+ Route::post('/kanban/new', 'KanbanController@new')->name('kanban.new');
+ Route::post('/kanban/remove', 'KanbanController@remove_kanban')->name('kanban.remove_kanban');
+ Route::get('/kanban/list/export/{ext}',[KanbanController::class , 'export'])->name('kanban.list.export');
+
+ /**
+ * ISSUES
+ */
+ Route::get('/kanban/view/{id}/issue/create/', 'KanbanController@create_issue')->name('kanban.create_issue');
+ Route::post('/kanban/view/{id}/issue/new/', 'KanbanController@new_issue')->name('kanban.view.issue.new');
+
+
/**
* ATTENDEES
*/
@@ -376,6 +410,9 @@
Route::get('/lecture/user/list','ManagementController@user_list')->name('lecture.user.list');
Route::get('/lecture/evidence/list','ManagementController@evidence_list')->name('lecture.evidence.list');
Route::get('/lecture/meeting/list','ManagementController@meeting_list')->name('lecture.meeting.list');
+ # Lecture filemanager
+ Route::get('/lecture/user/{id}/filemanager', 'ManagementController@user_filemanager')->name('lecture.user.filemanager');
+ Route::get('/lecture/user/{user_id}/filemanager/evidence/{evidence_id}/proof/{proof_id}/verify', 'ManagementController@verify_proof')->name('lecture.proof.verify');
Route::middleware(['checkroles:LECTURE'])->group(function () {
Route::get('/lecture/config', 'ConfigController@config')->name('lecture.config');
@@ -459,4 +496,9 @@
*/
Route::get('/updates','GitController@list')->name('updates.list');
+ /**
+ * TEACHER ESTADISTICS DASHBOARD
+ */
+ Route::get('lecture/dashboard','LectureDashboardController@view')->name('dashboard.view');
+
});
diff --git a/sonar-project.properties b/sonar-project.properties
index 56bd4fa5..0e36a66c 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1,6 +1,5 @@
-sonar.projectKey=drorganvidez_evidentia
-sonar.organization=drorganvidez
-
+sonar.projectKey=innosoft-evidentia-3_innosoft-evidentia-3
+sonar.organization=innosoft-evidentia-3
# This is the name and version displayed in the SonarCloud UI.
#sonar.projectName=evidentia
#sonar.projectVersion=1.0
diff --git a/start.sh b/start.sh
index b4709733..10795baa 100644
--- a/start.sh
+++ b/start.sh
@@ -1,2 +1,12 @@
cd laradock
-docker-compose up -d nginx mysql phpmyadmin redis workspace
\ No newline at end of file
+docker-compose up -d nginx
+echo "nginx cargado"
+docker-compose up -d mysql
+echo "mysql cargado"
+docker-compose up -d phpmyadmin
+echo "phpmyadmin cargado"
+docker-compose up -d redis
+echo "redis cargado"
+docker-compose up -d workspace
+echo "workspace cargado"
+echo "Mirar a ver si hay un fallo en la traza de ejecución, si no, ya está todo desplegado correctamente"
diff --git a/stop.sh b/stop.sh
index c9c50b9e..2b9394e2 100644
--- a/stop.sh
+++ b/stop.sh
@@ -1,2 +1,5 @@
cd laradock
-docker-compose down
\ No newline at end of file
+docker-compose down
+echo "contenedores fuera"
+docker ps
+echo "No debe haber ninguno, al menos de evidentia"
diff --git a/test.bat b/test.bat
index e8591299..2ce7dac3 100644
--- a/test.bat
+++ b/test.bat
@@ -1 +1 @@
-docker exec -it laradock_workspace_1 vendor/bin/phpunit tests/
+docker exec -it laradock-workspace-1 vendor/bin/phpunit tests/
diff --git a/tests/Feature/FilemanagerTest.php b/tests/Feature/FilemanagerTest.php
new file mode 100644
index 00000000..1a43f055
--- /dev/null
+++ b/tests/Feature/FilemanagerTest.php
@@ -0,0 +1,140 @@
+getPdo()->exec("DROP DATABASE IF EXISTS `evidentia`;");
+ DB::connection()->getPdo()->exec("CREATE DATABASE IF NOT EXISTS `evidentia`");
+ DB::connection()->getPdo()->exec("ALTER SCHEMA `evidentia` DEFAULT CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci");
+ exec("php artisan migrate");
+ exec("php artisan db:seed");
+ exec('php artisan db:seed --class=InstancesTableSeeder');
+
+ $this->assertTrue(true);
+
+ }
+
+
+ private function loginWithProfesor1()
+ {
+ $request = [
+ 'username' => 'profesor1',
+ 'password' => 'profesor1'
+ ];
+ $response = $this->post('login',$request);
+ }
+
+ private function loginWithAlumno1()
+ {
+ $request = [
+ 'username' => 'alumno1',
+ 'password' => 'alumno1'
+ ];
+ $response = $this->post('login', $request);
+ }
+ private function logout()
+ {
+ $this->post('/logout');
+ }
+
+ private function createFakeFile()
+ {
+ return UploadedFile::fake()->image('prueba.jpg')->size(100);
+ }
+ /**
+ * A basic feature test example.
+ *
+ * @return void
+ */
+ public function testFilemanagerView()
+ {
+ $this->loginWithProfesor1();
+ $response = $this->get('/lecture/user/1/filemanager');
+ $response->assertStatus(302);
+ }
+
+ public function testPublishEvidenceWithProof()
+ {
+ $this->loginWithAlumno1();
+ //Archivo para adjuntar
+ $request = [
+ 'title' => 'test',
+ 'description' => 'description of test',
+ 'hours' => 1,
+ 'status' => 'PENDING',
+ 'user_id' => 1,
+ 'comittee_id' => 1,
+ 'files[]' => [$this->createFakeFile()]
+ ];
+ $this->post('/evidence/publish', $request)->assertStatus(302);
+ }
+
+ public function testDraftEvidenceWithProof()
+ {
+ $this->loginWithAlumno1();
+ //Archivo para adjuntar
+ $request = [
+ 'title' => 'test',
+ 'description' => 'description of test',
+ 'hours' => 1,
+ 'status' => 'DRAFT',
+ 'user_id' => 1,
+ 'comittee_id' => 1,
+ 'files[]' => [$this->createFakeFile()]
+ ];
+ $this->post('/evidence/draft', $request)->assertStatus(302);
+ }
+ public function testVerifyFile()
+ {
+ $this->loginWithAlumno1();
+ //Archivo para adjuntar
+ $request = [
+ 'title' => 'test',
+ 'description' => 'description of test',
+ 'hours' => 1,
+ 'status' => 'PENDING',
+ 'user_id' => 1,
+ 'comittee_id' => 1,
+ 'files[]' => [$this->createFakeFile()]
+ ];
+ $this->post('/evidence/publish', $request);
+ $this->logout();
+ $this->loginWithProfesor1();
+ $this->get('/lecture/user/1/filemanager/evidence/1/proof/1/verify')->assertStatus(302);
+ }
+
+ public function testDeleteEvidenceWithVerifiedFile()
+ {
+ $this->loginWithAlumno1();
+ //Archivo para adjuntar
+ $request = [
+ 'title' => 'test',
+ 'description' => 'description of test',
+ 'hours' => 1,
+ 'status' => 'PENDING',
+ 'user_id' => 1,
+ 'comittee_id' => 1,
+ 'files[]' => [$this->createFakeFile()]
+ ];
+ $this->post('/evidence/publish', $request);
+ $this->logout();
+ $this->loginWithProfesor1();
+ $this->get('/lecture/user/1/filemanager/evidence/1/proof/1/verify');
+ $this->logout();
+ $this->loginWithAlumno1();
+ $this->post('/evidence/remove', ['id' => 1])->assertStatus(302);
+ }
+
+
+}
diff --git a/tests/Feature/KanbanTest.php b/tests/Feature/KanbanTest.php
new file mode 100644
index 00000000..98b6a23e
--- /dev/null
+++ b/tests/Feature/KanbanTest.php
@@ -0,0 +1,213 @@
+getPdo()->exec("DROP DATABASE IF EXISTS `evidentia`;");
+ DB::connection()->getPdo()->exec("CREATE DATABASE IF NOT EXISTS `evidentia`");
+ DB::connection()->getPdo()->exec("ALTER SCHEMA `evidentia` DEFAULT CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci");
+ exec("php artisan migrate");
+ exec("php artisan db:seed");
+ exec('php artisan db:seed --class=InstancesTableSeeder');
+
+ $this->assertTrue(true);
+
+ }
+
+ public function testLoginWithAlumno1(){
+ $request = [
+ 'username' => 'alumno1',
+ 'password' => 'alumno1'
+ ];
+ $response = $this->post('login',$request);
+ $response->assertSessionDoesntHaveErrors();
+
+ }
+
+ public function testLoginWithCoordinator1(){
+ $request = [
+ 'username' => 'coordinador1',
+ 'password' => 'coordinador1'
+ ];
+ $response = $this->post('login',$request);
+ $response->assertSessionDoesntHaveErrors();
+
+ }
+
+ public function testListKanban()
+ {
+
+ $this->testLoginWithAlumno1();
+
+
+ $response = $this->get('/21/kanban/list/');
+ $response->assertStatus(302);
+ $response->assertSessionDoesntHaveErrors();
+ }
+
+ public function testDetailKanbanView(){
+ $this->testLoginWithAlumno1();
+
+ $response = $this->get('/21/kanban/view/1');
+
+ $response->assertSessionDoesntHaveErrors();
+ $response->assertStatus(302);
+ }
+
+
+ public function testNewKanbanPositive()
+ {
+
+ $this->testLoginWithCoordinator1();
+ $user = Auth::user();
+ $request = [
+ 'title' => 'Kanban Test',
+ 'user_id' => $user,
+ 'comittee_id' => '1'
+ ];
+
+
+ $response = $this->post('/21/kanban/new',$request);
+
+ $response->assertStatus(302);
+ }
+
+ public function testCreateKanban(){
+ $this->testLoginWithAlumno1();
+
+ $response = $this->get('/21/kanban/create'); ##Un alumno no debería poder acceder a esta url
+
+ $response->assertSessionDoesntHaveErrors();
+ $response->assertStatus(302);
+ }
+
+ public function testNewKanbanNegative()
+ {
+
+ $this->testLoginWithCoordinator1();
+ $user = Auth::user();
+ $request = [
+ 'title' => 'Quad', ##El titulo en principio debería ser mínimo de 5 caracteres
+ 'user_id' => $user,
+ 'comittee_id' => '2'
+ ];
+
+ $response = $this->post('/21/kanban/new',$request);
+
+ $response->assertStatus(302);
+ }
+
+ public function testNewKanbanWithoutLogin()
+ {
+ $user = Auth::user();
+ $request = [
+ 'title' => 'Intento de creación de Tablero sin estar logueado',
+ 'user_id' => $user,
+ 'comittee_id' => '1'
+ ];
+
+ $response = $this->post('/21/kanban/new',$request);
+
+ $response->assertStatus(302);
+ }
+
+ public function testNewKanbanLoginWithAlumno1()
+ {
+ $this->testLoginWithAlumno1();
+ $user = Auth::user();
+ $request = [
+ 'title' => 'Intento de creación de Tablero siendo alumno',
+ 'user_id' => $user,
+ 'comittee_id' => '1'
+ ];
+
+ $response = $this->post('/21/kanban/new',$request);
+
+ $response->assertStatus(302);
+ }
+
+ public function testDeleteKanban()
+ {
+ $this->testLoginWithAlumno1();
+ $user = Auth::user();
+ $request = [
+ 'id' => '1'
+ ];
+
+ $response = $this->post('/21/kanban/remove',$request);
+
+ $response->assertStatus(302);
+ }
+
+ public function testDeleteKanbanWithoutLogin()
+ {
+ $user = Auth::user();
+ $request = [
+ 'id' => '1'
+ ];
+
+ $response = $this->post('/21/kanban/remove',$request);
+
+ $response->assertStatus(302);
+ }
+
+ public function testNewIssuePositive()
+ {
+
+ $this->testLoginWithAlumno1();
+ $user = Auth::user();
+ $request = [
+ 'title' => 'Issue Test',
+ 'description' => 'This is a test issue',
+ 'estimated_hours' => '1',
+ 'kanban_id' => '1'
+ ];
+
+
+ $response = $this->post('/21/kanban/view/1/issue/new',$request);
+
+ $response->assertStatus(302);
+ }
+
+ public function testNewIssueNegative()
+ {
+
+ $this->testLoginWithCoordinator1();
+ $user = Auth::user();
+ $request = [
+ 'title' => 'Quad', ##El titulo en principio debería ser mínimo de 5 caracteres
+ 'description' => 'This is a test issue',
+ 'estimated_hours' => '1',
+ 'kanban_id' => '1'
+ ];
+
+ $response = $this->post('/21/kanban/view/1/issue/new',$request);
+
+ $response->assertStatus(302);
+ }
+
+ public function testNewIssueWithoutLogin()
+ {
+ $user = Auth::user();
+ $request = [
+ 'title' => 'Intento de creación de Issue sin estar logueado',
+ 'user_id' => $user,
+ 'comittee_id' => '1'
+ ];
+
+ $response = $this->post('/21/kanban/view/1/issue/new',$request);
+
+ $response->assertStatus(302);
+ }
+
+}
\ No newline at end of file
diff --git a/tests/Feature/TaskTest.php b/tests/Feature/TaskTest.php
new file mode 100644
index 00000000..61cc2543
--- /dev/null
+++ b/tests/Feature/TaskTest.php
@@ -0,0 +1,111 @@
+getPdo()->exec("DROP DATABASE IF EXISTS `evidentia`;");
+ DB::connection()->getPdo()->exec("CREATE DATABASE IF NOT EXISTS `evidentia`");
+ DB::connection()->getPdo()->exec("ALTER SCHEMA `evidentia` DEFAULT CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci");
+ exec("php artisan migrate");
+ exec("php artisan db:seed");
+ exec('php artisan db:seed --class=InstancesTableSeeder');
+
+ $this->assertTrue(true);
+
+ }
+
+ private function loginWithAlumno1(){
+ $request = [
+ 'username' => 'alumno1',
+ 'password' => 'alumno1'
+ ];
+ $response = $this->post('login',$request);
+ }
+
+ public function testListTask()
+ {
+
+ $this->loginWithAlumno1();
+
+
+ $response = $this->get('/21/task/list');
+ $response->assertStatus(302);
+ }
+
+ public function testEditTask()
+ {
+
+ $this->loginWithAlumno1();
+
+ //$response = $this->get('/21/task/edit/1');
+
+ $request = [
+ 'id' => 1,
+ 'title' => 'Task 1',
+ 'description' => 'Modificación de un test exitoso',
+ 'hours' => '1.0',
+ 'end_date' => '2022-11-18 08:26',
+ 'user_id' => '2022-11-18 09:26',
+ 'comittee_id' => '2'
+ ];
+
+ $response = $this->post('task/edit/save',$request);
+
+ $response->assertStatus(302);
+ }
+
+ public function createTaskPositive()
+ {
+
+ $this->loginWithAlumno1();
+
+ $response = $this->get('/21/task/');
+ $request = [
+ 'title' => 'Evidencia 2',
+ 'description' => 'Creación de un test exitoso',
+ 'hours' => '1.0',
+ 'end_date' => '2022-11-18 08:26',
+ 'user_id' => '2022-11-18 09:26',
+ 'comittee_id' => '2'
+ ];
+
+ $response = $this->post('create',$request);
+
+ $response->assertStatus(200);
+ }
+
+ public function createTaskNegative()
+ {
+
+ $this->loginWithAlumno1();
+
+ $response = $this->get('/21/task/');
+ $request = [
+ 'title' => 'Evidencia 2',
+ 'description' => '',
+ 'hours' => '1.0',
+ 'end_date' => '2022-11-18 08:26',
+ 'user_id' => '2022-11-18 09:26',
+ 'comittee_id' => '2'
+ ];
+
+ $response = $this->post('create',$request);
+
+ $response->assertStatus(400);
+ }
+
+
+}