Merge pull request #229 from CampusDual/BFS42024-291-V2

Tarea 291
CampusDual · Jan 10, 2025 · f24f917 · f24f917
2 parents 577b6d1 + fff48f2
commit f24f917
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/en.json b/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/en.json
@@ -333,5 +333,7 @@
   "Cancelar" : "Cancel",
   "Registrar Asistencia" : "Register Attendance",
   "Attendance_Warning" : "This action will overwrite all attendance records in that day range.",
-  "Attendance_Range" : "Select date range"
+  "Attendance_Range" : "Select date range",
+  "NOT_DELETABLE_TUTOR_TYPE_IS_IN_USE": "The mentor type you want to delete is in use",
+  "TUTOR_TYPE_CANNOT_BE_EMPTY": "The mentor type cannot be empty"
 }
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/es.json b/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/es.json
@@ -331,5 +331,7 @@
   "Cancelar" : "Cancelar",
   "Registrar Asistencia" : "Registrar Asistencia",
   "Attendance_Warning": "Esta acción sobreescribirá todos los registros de asistencia en ese rango de días.",
-  "Attendance_Range": "Seleccionar Rango de Fechas"
+  "Attendance_Range": "Seleccionar Rango de Fechas",
+  "NOT_DELETABLE_TUTOR_TYPE_IS_IN_USE": "El tipo de tutor que quieres eliminar esta ya en uso",
+  "TUTOR_TYPE_CANNOT_BE_EMPTY": "El tipo de tutor no puede estar vacio"
 }
diff --git a/...-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/TutorTypeService.java b/...-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/TutorTypeService.java
@@ -46,7 +46,7 @@ public EntityResult tutorTypeQuery(Map<String, Object> keyMap, List<String> attr
     public EntityResult tutorTypeInsert(Map<String, Object> attrMap) throws OntimizeJEERuntimeException {
 
         if (isEmptyField(attrMap, TutorTypeDao.ATTR_TYPE)) {
-            return createErrorResult("EMPLOYMENT_STATUS_CANNOT_BE_EMPTY");
+            return createErrorResult("TUTOR_TYPE_CANNOT_BE_EMPTY");
         }
         return this.daoHelper.insert(this.tutorTypeDao, attrMap);
     }
@@ -55,7 +55,7 @@ public EntityResult tutorTypeInsert(Map<String, Object> attrMap) throws Ontimize
     public EntityResult tutorTypeUpdate(Map<String, Object> attrMap, Map<String, Object> keyMap) throws OntimizeJEERuntimeException {
 
         if (isEmptyField(attrMap, TutorTypeDao.ATTR_TYPE)) {
-            return createErrorResult("EMPLOYMENT_STATUS_CANNOT_BE_EMPTY");
+            return createErrorResult("TUTOR_TYPE_CANNOT_BE_EMPTY");
         }
         return this.daoHelper.update(this.tutorTypeDao, attrMap, keyMap);
     }
@@ -66,7 +66,7 @@ public EntityResult tutorTypeDelete(Map<String, Object> keyMap) throws OntimizeJ
            return this.daoHelper.delete(this.tutorTypeDao, keyMap);
        } catch (DataIntegrityViolationException e) {
            EntityResult error = new EntityResultMapImpl();
-           error.setMessage("NOT_DELETABLE_EMPLOYMENT_STATUS_IS_IN_USE");
+           error.setMessage("NOT_DELETABLE_TUTOR_TYPE_IS_IN_USE");
            error.setCode(EntityResult.OPERATION_WRONG);
            return error;
         }