diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Dtos/ActivityCreateDto.cs b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/ActivityCreateDto.cs index c320b4602d2b2bdfe628999a22f53a36eb728650..c6d043701593a89e2cfbae91d21e58304bc74450 100644 --- a/Tsi1.Api/Tsi1.BusinessLayer/Dtos/ActivityCreateDto.cs +++ b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/ActivityCreateDto.cs @@ -11,5 +11,7 @@ namespace Tsi1.BusinessLayer.Dtos public bool IsVideoConference { get; set; } public int CourseId { get; set; } + + public EvaluationCreateDto Evaluation { get; set; } } } diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Dtos/ActivityModifyDto.cs b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/ActivityModifyDto.cs index 084adde789d42cc7542cd6585e793690323a13d3..aa92abe101aef0d82ba09a7ce9ae68f6a166537f 100644 --- a/Tsi1.Api/Tsi1.BusinessLayer/Dtos/ActivityModifyDto.cs +++ b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/ActivityModifyDto.cs @@ -9,5 +9,7 @@ namespace Tsi1.BusinessLayer.Dtos public string Name { get; set; } public bool IsVideoConference { get; set; } + + public EvaluationModifyDto Evaluation { get; set; } } } diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Dtos/EvaluationCreateDto.cs b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/EvaluationCreateDto.cs new file mode 100644 index 0000000000000000000000000000000000000000..a2f6abc93766959963674b6dc2687c3ade70601e --- /dev/null +++ b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/EvaluationCreateDto.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Tsi1.BusinessLayer.Dtos +{ + public class EvaluationCreateDto + { + public int EvaluationTypeId { get; set; } + + public bool IsCompleted { get; set; } + } +} diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Dtos/EvaluationDetailDto.cs b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/EvaluationDetailDto.cs new file mode 100644 index 0000000000000000000000000000000000000000..963bf1a8e857a4ec00e989ec6fc0a13dfa450318 --- /dev/null +++ b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/EvaluationDetailDto.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Tsi1.BusinessLayer.Dtos +{ + public class EvaluationDetailDto + { + public int Id { get; set; } + + public int EvaluationTypeId { get; set; } + + public bool IsCompleted { get; set; } + + } +} diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Dtos/EvaluationInscriptionDto.cs b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/EvaluationInscriptionDto.cs new file mode 100644 index 0000000000000000000000000000000000000000..4ce3191eead04de775708b35f1a5f44563803803 --- /dev/null +++ b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/EvaluationInscriptionDto.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Tsi1.BusinessLayer.Dtos +{ + public class EvaluationInscriptionDto + { + public int EvaluationId { get; set; } + + public int StudentId { get; set; } + + public decimal Grade { get; set; } + + public bool HasAttended { get; set; } + } +} diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Dtos/EvaluationInscriptionModifyDto.cs b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/EvaluationInscriptionModifyDto.cs new file mode 100644 index 0000000000000000000000000000000000000000..1792396db86dbf97ee45aac714efb4ff86493f36 --- /dev/null +++ b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/EvaluationInscriptionModifyDto.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Tsi1.BusinessLayer.Dtos +{ + public class EvaluationInscriptionModifyDto + { + public int EvaluationId { get; set; } + + public int StudentId { get; set; } + + public decimal Grade { get; set; } + } +} diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Dtos/EvaluationModifyDto.cs b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/EvaluationModifyDto.cs new file mode 100644 index 0000000000000000000000000000000000000000..9ebaf996ef6a8b82555a38e395622cf374289b5f --- /dev/null +++ b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/EvaluationModifyDto.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Tsi1.BusinessLayer.Dtos +{ + public class EvaluationModifyDto + { + public int Id { get; set; } + + public int EvaluationTypeId { get; set; } + + public bool IsCompleted { get; set; } + } +} diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Dtos/EvaluationTypeDto.cs b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/EvaluationTypeDto.cs new file mode 100644 index 0000000000000000000000000000000000000000..2f678c32cbf5674b2d3683e77df4ef7cf916d115 --- /dev/null +++ b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/EvaluationTypeDto.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Tsi1.BusinessLayer.Dtos +{ + public class EvaluationTypeDto + { + public int Id { get; set; } + + public string Name { get; set; } + } +} diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Dtos/MyEvaluationInscriptionDto.cs b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/MyEvaluationInscriptionDto.cs new file mode 100644 index 0000000000000000000000000000000000000000..d4997da1ef84d6ed083d09541b9507a0a4d9d0b1 --- /dev/null +++ b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/MyEvaluationInscriptionDto.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Tsi1.BusinessLayer.Dtos +{ + public class MyEvaluationInscriptionDto + { + public string ActivityName { get; set; } + + public int EvaluationTypeId { get; set; } + + public string EvaluationType { get; set; } + + public decimal Grade { get; set; } + + public bool HasAttended { get; set; } + + } +} diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Helpers/ErrorMessages.cs b/Tsi1.Api/Tsi1.BusinessLayer/Helpers/ErrorMessages.cs index 2b12422eeae02f5d5cad8cd0cc9d6166d1d7a2cb..6812a7205963d518917cffee2c9c874f1a955986 100644 --- a/Tsi1.Api/Tsi1.BusinessLayer/Helpers/ErrorMessages.cs +++ b/Tsi1.Api/Tsi1.BusinessLayer/Helpers/ErrorMessages.cs @@ -69,5 +69,19 @@ namespace Tsi1.BusinessLayer.Helpers public const string ActivityDoesNotExist = "La actividad con id '{0}' no existe"; public const string GradeDoesNotExist = "La nota para la actividad con id '{0}' y usuario con id '{0}' no existe"; + + + public const string EvaluationTypeDoesNotExist = "El tipo de evaluación con id '{0}' no existe"; + public const string EvaluationDoesNotExist = "La evaluación con id '{0}' no existe"; + public const string EvaluationIsCompleted = "La evaluación con id '{0}' ha finalizado"; + public const string EvaluationInscriptionAlreadyExists = "El estudiante con id '{0}' ya se inscribió a la evaluación con id '{1}'"; + public const string EvaluationInscriptionDoesNotExists = "El estudiante con id '{0}' no esta inscripto en la evaluación con id '{1}'"; + public const string EvaluationInscriptionHasAttended = "El estudiante con id '{0}' ya realizó la evaluación con id '{1}'"; + public const string SubmissionDoesNotExists = "No existe ninguna tarea para el estudiante con id '{0}' en la evaluación con id '{1}'"; + public const string SubmissionAlreadyExists = "Ya existe una tarea para el estudiante con id '{0}' en la evaluación con id '{1}'"; + public const string InavalidUserSubmission = "La tarea con id '{0}' no pertenece al estudiante con id '{1}'"; + + public const string VideoConferenceIsNotEvaluation = "Una video conferencia no es una evaluación"; + } } diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Helpers/MappingProfile.cs b/Tsi1.Api/Tsi1.BusinessLayer/Helpers/MappingProfile.cs index f0da4ed4c5da81030579247175e3f581b6ef5891..11a8b2282491917888c1280ff39e074ded5dea28 100644 --- a/Tsi1.Api/Tsi1.BusinessLayer/Helpers/MappingProfile.cs +++ b/Tsi1.Api/Tsi1.BusinessLayer/Helpers/MappingProfile.cs @@ -57,7 +57,11 @@ namespace Tsi1.BusinessLayer.Helpers CreateMap<Activity, ActivityCreateDto>(); CreateMap<Activity, ActivityModifyDto>(); CreateMap<Activity, ActivityDto>(); - CreateMap<Grade, GradeDto>(); + CreateMap<EvaluationType, EvaluationTypeDto>(); + CreateMap<Evaluation, EvaluationCreateDto>(); + CreateMap<Evaluation, EvaluationModifyDto>(); + CreateMap<Evaluation, EvaluationDetailDto>(); + CreateMap<EvaluationInscription, EvaluationInscriptionDto>(); CreateMap<ForumCreateDto, Forum>(); CreateMap<ForumPreviewDto, Forum>(); @@ -104,7 +108,11 @@ namespace Tsi1.BusinessLayer.Helpers CreateMap<ActivityCreateDto, Activity>(); CreateMap<ActivityModifyDto, Activity>(); CreateMap<ActivityDto, Activity>(); - CreateMap<GradeDto, Grade>(); + CreateMap<EvaluationTypeDto, EvaluationType>(); + CreateMap<EvaluationCreateDto, Evaluation>(); + CreateMap<EvaluationModifyDto, Evaluation>().ForMember(x => x.Id, opt => opt.Ignore()); + CreateMap<EvaluationDetailDto, Evaluation>(); + CreateMap<EvaluationInscriptionDto, EvaluationInscription>(); } } }