diff --git a/Tsi1.Api/Tsi1.Api/Controllers/EvaluationController.cs b/Tsi1.Api/Tsi1.Api/Controllers/EvaluationController.cs
index 669c0e22058ae0a6b59d4c47c4e7163824bd8c10..a0b1f65f705a09c9ad7115bce5624c5b5b1e5d77 100644
--- a/Tsi1.Api/Tsi1.Api/Controllers/EvaluationController.cs
+++ b/Tsi1.Api/Tsi1.Api/Controllers/EvaluationController.cs
@@ -16,10 +16,13 @@ namespace Tsi1.Api.Controllers
     public class EvaluationController : ControllerBase
     {
         private readonly IEvaluationService _evaluationService;
+        private readonly IEvaluationTypeService _evaluationTypeService;
 
-        public EvaluationController(IEvaluationService evaluationService)
+
+        public EvaluationController(IEvaluationService evaluationService, IEvaluationTypeService evaluationTypeService)
         {
             _evaluationService = evaluationService;
+            _evaluationTypeService = evaluationTypeService;
         }
 
         [Authorize(Roles = UserTypes.Student)]
@@ -134,5 +137,33 @@ namespace Tsi1.Api.Controllers
 
             return Ok(result.Data);
         }
+
+        [Authorize(Roles = UserTypes.Student + ", " + UserTypes.FacultyAdmin + ", " + UserTypes.Professor)]
+        [HttpGet("GetEvaluationTypes")]
+        public async Task<IActionResult> GetEvaluationTypes()
+        {
+            var result = await _evaluationTypeService.GetAll();
+
+            if (result.HasError)
+            {
+                return BadRequest(result.Message);
+            }
+
+            return Ok(result.Data);
+        }
+
+        [Authorize(Roles = UserTypes.Student + ", " + UserTypes.FacultyAdmin + ", " + UserTypes.Professor)]
+        [HttpGet("GetEvaluationTypeById/{evaluationTypeId}")]
+        public async Task<IActionResult> GetEvaluationTypeById(int evaluationTypeId)
+        {
+            var result = await _evaluationTypeService.GetById(evaluationTypeId);
+
+            if (result.HasError)
+            {
+                return BadRequest(result.Message);
+            }
+
+            return Ok(result.Data);
+        }
     }
 }
diff --git a/Tsi1.Api/Tsi1.Api/Startup.cs b/Tsi1.Api/Tsi1.Api/Startup.cs
index 1f237eccf6808788164953e11f50f003db17c27f..c576fdeb3e4a0cf4abd97780a4dee362b6850e03 100644
--- a/Tsi1.Api/Tsi1.Api/Startup.cs
+++ b/Tsi1.Api/Tsi1.Api/Startup.cs
@@ -107,6 +107,7 @@ namespace Tsi1.Api
             services.AddScoped<IChatService, ChatService>();
             services.AddScoped<IActivityService, ActivityService>();
             services.AddScoped<IEvaluationService, EvaluationService>();
+            services.AddScoped<IEvaluationTypeService, EvaluationTypeService>();
 
             services.AddSingleton<PresenceTracker>();
 
diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IEvaluationTypeService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IEvaluationTypeService.cs
index 55ac35724ef5331ea100cdbd5d2e832dfdfa2c75..ec7b5bfa340a841ae8dc99f6c1cc6a8bfa3ab74c 100644
--- a/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IEvaluationTypeService.cs
+++ b/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IEvaluationTypeService.cs
@@ -11,6 +11,6 @@ namespace Tsi1.BusinessLayer.Interfaces
     {
         public Task<ServiceResult<EvaluationTypeDto>> GetById(int id);
 
-        public Task<ServiceResult<List<EvaluationTypeDto>>> GetAll(string userType);
+        public Task<ServiceResult<List<EvaluationTypeDto>>> GetAll();
     }
 }
diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Services/EvaluationTypeService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Services/EvaluationTypeService.cs
index d2ce280ffb68f1bdf6295dc05188251b61540e7d..a3ea2c3616b60f498be880818e246d8ffe5d55fe 100644
--- a/Tsi1.Api/Tsi1.BusinessLayer/Services/EvaluationTypeService.cs
+++ b/Tsi1.Api/Tsi1.BusinessLayer/Services/EvaluationTypeService.cs
@@ -22,7 +22,7 @@ namespace Tsi1.BusinessLayer.Services
             _mapper = mapper;
         }
 
-        public async Task<ServiceResult<List<EvaluationTypeDto>>> GetAll(string userType)
+        public async Task<ServiceResult<List<EvaluationTypeDto>>> GetAll()
         {
             var result = new ServiceResult<List<EvaluationTypeDto>>();