From d2021eefad5c4fc46f8d5373e758cb5399aea1e4 Mon Sep 17 00:00:00 2001 From: Jhonny Date: Wed, 21 Feb 2024 16:24:42 -0400 Subject: [PATCH 1/2] Creadas Clases STUDEN Y ADMIN --- .../Controllers/CreateExamController.java | 3 +- .../cienciasucv/certicomp/Models/Admin.java | 20 +++++++++++++ .../cienciasucv/certicomp/Models/Exam.java | 5 +++- .../cienciasucv/certicomp/Models/Student.java | 19 +++++++++++++ .../cienciasucv/certicomp/Models/User.java | 28 ++++++++++--------- .../Views/AdminViews/CreateExamPanel.java | 19 +++++++++---- .../Views/AdminViews/PanelContent.java | 6 ++++ 7 files changed, 80 insertions(+), 20 deletions(-) create mode 100644 src/main/java/cienciasucv/certicomp/Models/Admin.java create mode 100644 src/main/java/cienciasucv/certicomp/Models/Student.java diff --git a/src/main/java/cienciasucv/certicomp/Controllers/CreateExamController.java b/src/main/java/cienciasucv/certicomp/Controllers/CreateExamController.java index c6bf766..0b46d7a 100644 --- a/src/main/java/cienciasucv/certicomp/Controllers/CreateExamController.java +++ b/src/main/java/cienciasucv/certicomp/Controllers/CreateExamController.java @@ -80,6 +80,7 @@ public Exam collectExamData(CreateExamPanel view,action accion,Exam examen){ String name= view.getNameBox(); String id; String instructions= view.getInstructionsArea(); + String level= view.getLevelBox(); String duration=String.valueOf(view.getDurationBox()); ArrayList domains= new ArrayList<>(); ArrayList questions = new ArrayList<>(); @@ -95,6 +96,6 @@ public Exam collectExamData(CreateExamPanel view,action accion,Exam examen){ break; } - return new Exam(name,id,duration,instructions,domains); + return new Exam(name,id,duration,instructions,domains,level); } } diff --git a/src/main/java/cienciasucv/certicomp/Models/Admin.java b/src/main/java/cienciasucv/certicomp/Models/Admin.java new file mode 100644 index 0000000..acb6373 --- /dev/null +++ b/src/main/java/cienciasucv/certicomp/Models/Admin.java @@ -0,0 +1,20 @@ +package cienciasucv.certicomp.Models; + +public class Admin extends User { + private String adminID; + + public Admin(String name, String lastname, String nationalID, String email, String adminID) { + super(name, lastname, nationalID, email); + this.adminID = adminID; + setRole(role.ADMIN); + } + + public String getAdminID() { + return adminID; + } + + public void setAdminID(String adminID) { + this.adminID = adminID; + } + +} diff --git a/src/main/java/cienciasucv/certicomp/Models/Exam.java b/src/main/java/cienciasucv/certicomp/Models/Exam.java index 801434a..9007e35 100644 --- a/src/main/java/cienciasucv/certicomp/Models/Exam.java +++ b/src/main/java/cienciasucv/certicomp/Models/Exam.java @@ -28,6 +28,7 @@ public class Exam { private String name; private String duration; private String instructions; + private String level; private ArrayList dominios; private ArrayList questions; public static Map exams; @@ -48,12 +49,14 @@ public class Exam { this.dominios= domains; } - public Exam(String name,String id, String duration, String instructions,ArrayList domains){ + public Exam(String name,String id, String duration, String instructions,ArrayList domains,String level){ this.name= name; this.id = id; this.duration= duration; this.instructions=instructions; this.dominios=domains; + this.level=level; + } private static Map loadExamsFromFile() { diff --git a/src/main/java/cienciasucv/certicomp/Models/Student.java b/src/main/java/cienciasucv/certicomp/Models/Student.java new file mode 100644 index 0000000..995e65f --- /dev/null +++ b/src/main/java/cienciasucv/certicomp/Models/Student.java @@ -0,0 +1,19 @@ +package cienciasucv.certicomp.Models; + +public class Student extends User{ + private String studentID; + + public Student(String name, String lastname, String nationalID, String email, String studentID) { + super(name, lastname, nationalID, email); + this.studentID = studentID; + setRole(role.STUDENT); + } + + public String getStudentID() { + return studentID; + } + + public void setStudentID(String studentID) { + this.studentID = studentID; + } + } diff --git a/src/main/java/cienciasucv/certicomp/Models/User.java b/src/main/java/cienciasucv/certicomp/Models/User.java index 4bf45a1..b8c0f07 100644 --- a/src/main/java/cienciasucv/certicomp/Models/User.java +++ b/src/main/java/cienciasucv/certicomp/Models/User.java @@ -12,21 +12,24 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -public class User { - - private String name; - private String lastname; - private String nationalID; - private String email; - private String role; +class User { + + protected String name; + protected String lastname; + protected String nationalID; + protected String email; + protected enum role{ + STUDENT, + ADMIN; + } + protected role role; - public User(String name, String lastname, String nationalID, String email, String role) { + public User(String name, String lastname, String nationalID, String email) { this.name = name; this.lastname = lastname; this.nationalID = nationalID; this.email = email; - this.role = role; } public String getName() { @@ -45,7 +48,7 @@ public String getEmail() { return email; } - public String getRole() { + public role getRole() { return role; } @@ -65,8 +68,7 @@ public void setEmail(String email) { this.email= email; } - - public void setRole(String role) { + public void setRole(role role) { this.role = role; } @@ -104,6 +106,6 @@ public static Map getUsersInfo() { } return usersInfo; } - + } diff --git a/src/main/java/cienciasucv/certicomp/Views/AdminViews/CreateExamPanel.java b/src/main/java/cienciasucv/certicomp/Views/AdminViews/CreateExamPanel.java index ef41bc4..d138f79 100644 --- a/src/main/java/cienciasucv/certicomp/Views/AdminViews/CreateExamPanel.java +++ b/src/main/java/cienciasucv/certicomp/Views/AdminViews/CreateExamPanel.java @@ -1,5 +1,6 @@ package cienciasucv.certicomp.Views.AdminViews; import cienciasucv.certicomp.Controllers.CreateExamController; +import cienciasucv.certicomp.Models.Course; import cienciasucv.certicomp.Models.Exam; import cienciasucv.certicomp.Views.ButtonSize; import cienciasucv.certicomp.Views.Buttons; @@ -9,12 +10,15 @@ import javax.swing.event.DocumentListener; import javax.swing.text.AbstractDocument; +import com.google.gson.Gson; + import java.awt.Graphics; import java.awt.Rectangle; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.FileReader; import java.util.Map; public class CreateExamPanel extends PanelContent{ @@ -29,7 +33,8 @@ public class CreateExamPanel extends PanelContent{ JButton botonCrear; private JButton addEdit1; private JButton addEdit2; - + private java.lang.reflect.Type type; + public CreateExamPanel(){ for (Map.Entry entry : Exam.exams.entrySet()) { String key = entry.getKey(); @@ -47,8 +52,7 @@ public CreateExamPanel(){ addDurationBox(DurationBox); String [] Prueba ={"Nivel 1", "Nivel 2", "Nivel 3"}; addLevelBox(Prueba); - String [] CursosP={"Java","CISCO","Front-End Web Developer"}; - addCourseBox(CursosP); + addCourseBox(); DominiumArea =addTextArea(160, 265, 220,50); DominiumArea.setEditable(false); addDominumArea(DominiumArea); @@ -164,9 +168,14 @@ private void addLevelBox(String[] prueba){ this.add(Levels); } - private void addCourseBox(String[] lista){ + private void addCourseBox(){ + Map coursesInfo= Course.getCoursesInfo(); + DefaultComboBoxModelcomboBoxModel=new DefaultComboBoxModel<>(); + for(String course:coursesInfo.values()){ + comboBoxModel.addElement(course); + } addSideText("Curso Asociado:", 54, 168, 120, 30); - AsociatedCourses=addComboBox(lista, 160,173 , 220, 22); + AsociatedCourses=addComboBox(comboBoxModel, 160,173 , 220, 22); this.add(AsociatedCourses); } diff --git a/src/main/java/cienciasucv/certicomp/Views/AdminViews/PanelContent.java b/src/main/java/cienciasucv/certicomp/Views/AdminViews/PanelContent.java index 8c446ba..29473a4 100644 --- a/src/main/java/cienciasucv/certicomp/Views/AdminViews/PanelContent.java +++ b/src/main/java/cienciasucv/certicomp/Views/AdminViews/PanelContent.java @@ -62,6 +62,12 @@ public static JComboBox addComboBox(Object contenido[],int x,int y, int w, int h lista.setBounds(x, y, w, h); return lista; } + + public static JComboBox addComboBox(DefaultComboBoxModel Modelo ,int x,int y, int w, int h){ + JComboBox lista = new JComboBox(Modelo); + lista.setBounds(x, y, w, h); + return lista; + } public static JTextArea addTextArea(int x, int y, int w, int h){ JTextArea Area = new JTextArea(); From 0c32422119a9792c6c25e96bb4146c498fd754f4 Mon Sep 17 00:00:00 2001 From: Jhonny Date: Wed, 21 Feb 2024 20:18:12 -0400 Subject: [PATCH 2/2] Eliminados modelos Student y admin --- .../cienciasucv/certicomp/Models/Admin.java | 20 ------------------- .../cienciasucv/certicomp/Models/Student.java | 19 ------------------ 2 files changed, 39 deletions(-) delete mode 100644 src/main/java/cienciasucv/certicomp/Models/Admin.java delete mode 100644 src/main/java/cienciasucv/certicomp/Models/Student.java diff --git a/src/main/java/cienciasucv/certicomp/Models/Admin.java b/src/main/java/cienciasucv/certicomp/Models/Admin.java deleted file mode 100644 index acb6373..0000000 --- a/src/main/java/cienciasucv/certicomp/Models/Admin.java +++ /dev/null @@ -1,20 +0,0 @@ -package cienciasucv.certicomp.Models; - -public class Admin extends User { - private String adminID; - - public Admin(String name, String lastname, String nationalID, String email, String adminID) { - super(name, lastname, nationalID, email); - this.adminID = adminID; - setRole(role.ADMIN); - } - - public String getAdminID() { - return adminID; - } - - public void setAdminID(String adminID) { - this.adminID = adminID; - } - -} diff --git a/src/main/java/cienciasucv/certicomp/Models/Student.java b/src/main/java/cienciasucv/certicomp/Models/Student.java deleted file mode 100644 index 995e65f..0000000 --- a/src/main/java/cienciasucv/certicomp/Models/Student.java +++ /dev/null @@ -1,19 +0,0 @@ -package cienciasucv.certicomp.Models; - -public class Student extends User{ - private String studentID; - - public Student(String name, String lastname, String nationalID, String email, String studentID) { - super(name, lastname, nationalID, email); - this.studentID = studentID; - setRole(role.STUDENT); - } - - public String getStudentID() { - return studentID; - } - - public void setStudentID(String studentID) { - this.studentID = studentID; - } - }