From b08f840b9978e756c924e3e39dac924e106f13fc Mon Sep 17 00:00:00 2001 From: Francisco Ismael Farrando <121203370+franciscofarrando@users.noreply.github.com> Date: Mon, 14 Apr 2025 16:15:25 +0200 Subject: [PATCH 01/36] Inicio --- .gitignore | 1 + homework-java.iml | 9 +++++++++ homework-java/pom.xml | 17 +++++++++++++++++ .../src/main/java/com/example/Main.java | 17 +++++++++++++++++ 4 files changed, 44 insertions(+) create mode 100644 .gitignore create mode 100644 homework-java.iml create mode 100644 homework-java/pom.xml create mode 100644 homework-java/src/main/java/com/example/Main.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..57f1cb2a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/.idea/ \ No newline at end of file diff --git a/homework-java.iml b/homework-java.iml new file mode 100644 index 00000000..bfced71f --- /dev/null +++ b/homework-java.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/homework-java/pom.xml b/homework-java/pom.xml new file mode 100644 index 00000000..27f9a934 --- /dev/null +++ b/homework-java/pom.xml @@ -0,0 +1,17 @@ + + + 4.0.0 + + com.example + homework-java + 1.0-SNAPSHOT + + + 21 + 21 + UTF-8 + + + \ No newline at end of file diff --git a/homework-java/src/main/java/com/example/Main.java b/homework-java/src/main/java/com/example/Main.java new file mode 100644 index 00000000..71e405f4 --- /dev/null +++ b/homework-java/src/main/java/com/example/Main.java @@ -0,0 +1,17 @@ +package com.example; + +//TIP To Run code, press or +// click the icon in the gutter. +public class Main { + public static void main(String[] args) { + //TIP Press with your caret at the highlighted text + // to see how IntelliJ IDEA suggests fixing it. + System.out.printf("Hello and welcome!"); + + for (int i = 1; i <= 5; i++) { + //TIP Press to start debugging your code. We have set one breakpoint + // for you, but you can always add more by pressing . + System.out.println("i = " + i); + } + } +} \ No newline at end of file From df023d83964ba9aef1641526b586f4f5ab2a9d22 Mon Sep 17 00:00:00 2001 From: Francisco Ismael Farrando <121203370+franciscofarrando@users.noreply.github.com> Date: Mon, 14 Apr 2025 16:53:50 +0200 Subject: [PATCH 02/36] git ignore --- .gitignore | 2 +- homework-java.iml | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 homework-java.iml diff --git a/.gitignore b/.gitignore index 57f1cb2a..61069b7a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/.idea/ \ No newline at end of file +/.idea/* \ No newline at end of file diff --git a/homework-java.iml b/homework-java.iml deleted file mode 100644 index bfced71f..00000000 --- a/homework-java.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file From 9972f1574bc40921b13e0b3d1773dfa592de4026 Mon Sep 17 00:00:00 2001 From: Francisco Ismael Farrando <121203370+franciscofarrando@users.noreply.github.com> Date: Mon, 14 Apr 2025 17:06:04 +0200 Subject: [PATCH 03/36] clase Course OK con getters setters y const --- homework-java.iml | 9 ---- .../src/main/java/com/example/Course.java | 43 +++++++++++++++++++ 2 files changed, 43 insertions(+), 9 deletions(-) delete mode 100644 homework-java.iml create mode 100644 homework-java/src/main/java/com/example/Course.java diff --git a/homework-java.iml b/homework-java.iml deleted file mode 100644 index bfced71f..00000000 --- a/homework-java.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/homework-java/src/main/java/com/example/Course.java b/homework-java/src/main/java/com/example/Course.java new file mode 100644 index 00000000..2c80e047 --- /dev/null +++ b/homework-java/src/main/java/com/example/Course.java @@ -0,0 +1,43 @@ +package com.example; + +public class CourseClass { + private String courseId; + private String name; + private double price; + private double money_earned; + // private Teacher teacher; + + //constructor de name y price + + + public CourseClass(String name, double price) { + this.name = name; + this.price = price; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public double getPrice() { + return price; + } + + public void setPrice(double price) { + this.price = price; + } + + @Override + public String toString() { + return "CourseClass{" + + "courseId='" + courseId + '\'' + + ", name='" + name + '\'' + + ", price=" + price + + ", money_earned=" + money_earned + + '}'; + } +} From ceef0ffee09a7e6d98bcff5cfc5107f410c40cbb Mon Sep 17 00:00:00 2001 From: Francisco Ismael Farrando <121203370+franciscofarrando@users.noreply.github.com> Date: Mon, 14 Apr 2025 17:09:36 +0200 Subject: [PATCH 04/36] course OK --- .../src/main/java/com/example/Course.java | 27 +++++++++++++++---- .../src/main/java/com/example/Main.java | 9 +------ 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/homework-java/src/main/java/com/example/Course.java b/homework-java/src/main/java/com/example/Course.java index 2c80e047..67d840f3 100644 --- a/homework-java/src/main/java/com/example/Course.java +++ b/homework-java/src/main/java/com/example/Course.java @@ -1,6 +1,6 @@ package com.example; -public class CourseClass { +public class Course { private String courseId; private String name; private double price; @@ -8,13 +8,14 @@ public class CourseClass { // private Teacher teacher; //constructor de name y price - - - public CourseClass(String name, double price) { + public Course(String name, double price) { this.name = name; this.price = price; } + + //getters y setters + public String getName() { return name; } @@ -22,7 +23,7 @@ public String getName() { public void setName(String name) { this.name = name; } - +/* public double getPrice() { return price; } @@ -31,6 +32,22 @@ public void setPrice(double price) { this.price = price; } + public String getCourseId() { + return courseId; + } + + public void setCourseId(String courseId) { + this.courseId = courseId; + } + + public double getMoney_earned() { + return money_earned; + } + + public void setMoney_earned(double money_earned) { + this.money_earned = money_earned; + } +*/ @Override public String toString() { return "CourseClass{" + diff --git a/homework-java/src/main/java/com/example/Main.java b/homework-java/src/main/java/com/example/Main.java index 71e405f4..81d687e8 100644 --- a/homework-java/src/main/java/com/example/Main.java +++ b/homework-java/src/main/java/com/example/Main.java @@ -4,14 +4,7 @@ // click the icon in the gutter. public class Main { public static void main(String[] args) { - //TIP Press with your caret at the highlighted text - // to see how IntelliJ IDEA suggests fixing it. - System.out.printf("Hello and welcome!"); - for (int i = 1; i <= 5; i++) { - //TIP Press to start debugging your code. We have set one breakpoint - // for you, but you can always add more by pressing . - System.out.println("i = " + i); - } + } } \ No newline at end of file From aaf5c3303979bd9a0640316311bbf4146ef42e68 Mon Sep 17 00:00:00 2001 From: Francisco Ismael Farrando <121203370+franciscofarrando@users.noreply.github.com> Date: Mon, 14 Apr 2025 17:32:12 +0200 Subject: [PATCH 05/36] const vacio creado --- homework-java/src/main/java/com/example/Course.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/homework-java/src/main/java/com/example/Course.java b/homework-java/src/main/java/com/example/Course.java index 67d840f3..1f1fc9b5 100644 --- a/homework-java/src/main/java/com/example/Course.java +++ b/homework-java/src/main/java/com/example/Course.java @@ -1,5 +1,7 @@ package com.example; +import java.util.UUID; + public class Course { private String courseId; private String name; @@ -12,7 +14,11 @@ public Course(String name, double price) { this.name = name; this.price = price; } + //Constructor vacio para UUID + public Course() { + this.courseId = UUID.randomUUID().toString(); + } //getters y setters From 290144ed7ac854a6f82a833b7542b62c16d0f1fb Mon Sep 17 00:00:00 2001 From: Irenevn16 Date: Mon, 14 Apr 2025 17:33:07 +0200 Subject: [PATCH 06/36] teacher class --- .../src/main/java/com/example/Teacher.java | 39 ++++++++++++++++++ .../target/classes/com/example/Main.class | Bin 0 -> 1153 bytes .../target/classes/com/example/Teacher.class | Bin 0 -> 1827 bytes 3 files changed, 39 insertions(+) create mode 100644 homework-java/src/main/java/com/example/Teacher.java create mode 100644 homework-java/target/classes/com/example/Main.class create mode 100644 homework-java/target/classes/com/example/Teacher.class diff --git a/homework-java/src/main/java/com/example/Teacher.java b/homework-java/src/main/java/com/example/Teacher.java new file mode 100644 index 00000000..fa6aadc9 --- /dev/null +++ b/homework-java/src/main/java/com/example/Teacher.java @@ -0,0 +1,39 @@ +package com.example; + +import java.util.UUID; + +public class Teacher { + private String teacherId; //UUID + private String name; + private double salary; + + public Teacher (String name, double salary) { + setName(name); + setSalary(salary); + } + public Teacher(){ + this.teacherId = UUID.randomUUID().toString(); + } + + public String getTeacherId() { + return teacherId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public double getSalary() { + return salary; + } + + public void setSalary(double salary) { + this.salary = salary; + } + + +} diff --git a/homework-java/target/classes/com/example/Main.class b/homework-java/target/classes/com/example/Main.class new file mode 100644 index 0000000000000000000000000000000000000000..3414b65a1048cb0a69e663e265a80bc530ee5982 GIT binary patch literal 1153 zcmaJ=T~8B16g|_HZd(?L1&WAbQ9fE!*6*)Y6Kz5uDQZ#z4?Ydc2t#*wn%yai&;AJC zeehWyFd@+&;BWC47^B|ZZnQ|_COaQz&pr3tJF{PZ9(@7u2(=s%NE%3)7(kj~WRLH2 z%i-RR^>k}b*qR|-lb+NM8ItA7Miv=l4dhG=!aPQA9t2vr#8Mp!8gE2GQd!S@>FK8S z1$V0%3^No~gyX0Z_qIzfg<~sM%;YeFQw9nqMlr@P+9#HLv_qvA47GAsJaS3O(%Y#% z?}56;tChYM3RHH{!~{+=Ot`!y>dLdZ-jsTmR)OZ84#<9aH4g7h652dtVhU#&jL41S zh1{Opv7O3>foWnSyXrH&&gx*!#K?WAXfGj;Iv3wfWa=4Bg25yF}y~Qy5_Z~@aU$unQ zb=K|nGPkwz4;bF|_AVxN^;hVAI3k#BDAnq;t0!CBgB%N7KWK|S^xo=^Uy$g8V~IL< zoTk)*+H07Ro14qOnNQq0|ul-D4OgY!LHw>BDqIlFZZL&SN1;ynr$)gfB)B ki66+b??g)C5&;QZ#ub_~M7>Jy5^mEjN2@!yhbkt21Nyxo#Q*>R literal 0 HcmV?d00001 diff --git a/homework-java/target/classes/com/example/Teacher.class b/homework-java/target/classes/com/example/Teacher.class new file mode 100644 index 0000000000000000000000000000000000000000..2063f6b21d35c600d09cae474221d5b3285d512c GIT binary patch literal 1827 zcmaJ?+j1L45IrNwT1gp8MvgDRAvTE<%Q9pMccNfOBuqpU=OQ_m;%O{R*&DBRRlB1U z{uBO!OJRo!ReS&+MWttUZOPHX%iOlR&*{@Wv;X}2`fmWY@vMLp(iSotQ^+#Rybv#i z?Fw(tez5yOb`?YRmg6~UlObJMe^NjWc?$)ObKnfKUB7S3pG1G)O1mRPcV7k!Rw&iB z=u3vVN^2Cbtpdl}t3^SI93{*!f05$?-et%sKLTYqe`0BJi>c%(n~NOp;Sv#15&dS5p*+c2 zo33!YuT3)^C8rOraIE4gNfgEzu!a^Woks=h7OET@_~4AF?ZZ&XK56L>N!qyx$MNll zB#k0gQuHZ<9IkWNIs?8ZRjg~XSEiEP;P@DyFf8=Nfvo#pSE#3s+NV{hgr`D=Ye||< zCRD&@_}s!59ABDB8lBHFp-K)kFV|z3Pl!s@A~EWIk1AbiIiB1e_IG8_5xXv(lv{pR zxKBjj=zV;cQTq;YoNFaCPL1#=-KcZ&v^wbvYCI}@rY{^rIFDzhcJ%GaI!^SFAkVT5y+y4jWCYRmTzhJ)HBBvy(7O41_{@;{tMwA!b zn;bnfK$=FnZnR42yJTj%LNw>V=n49Y#+$TzPL>&(OVw9k)s16V)ygrZe=`m>8q4N$ zfyQ&lgQJLP+@kXpawIo=jZK>MO2aU-(m*K#lZ|0+oBavQpLpjO3rAQQ!4yrnBEggh zV#Yx5I9vq5^hJ%s*)(gYsp=nC`jr+bXs#L!m>qMTiuo~oljywsw(~-wGrhqv@+LuP zeY4e#BP@^j>*pO*AE2wBr#{0q6~uW+sPJJzTbK75UjfMa|*iXN3| xjhd)}1+0%DETVz$C`OJLZc$Ir(~Iv-PIu8X=L{`6{Q-|@SD;lJJ9vr Date: Mon, 14 Apr 2025 17:39:24 +0200 Subject: [PATCH 07/36] Class Student created --- .../src/main/java/com/example/Student.java | 76 +++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 homework-java/src/main/java/com/example/Student.java diff --git a/homework-java/src/main/java/com/example/Student.java b/homework-java/src/main/java/com/example/Student.java new file mode 100644 index 00000000..85749487 --- /dev/null +++ b/homework-java/src/main/java/com/example/Student.java @@ -0,0 +1,76 @@ +package com.example; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + +public class Student { + private static final Set usedIds = new HashSet<>(); + + private final String studentId; + private String name; + private String address; + private String email; + private Course course; + + + public Student(String name,String address,String email) { + this.studentId = generateUniqueStudentId(); + this.name = name; + this.address = address; + this.email = email; + this.course = null; + } + public Student(){ + this.studentId = generateUniqueStudentId(); + } + + + private String generateUniqueStudentId(){ + String id= ""; + do{ + id=UUID.randomUUID().toString(); + } while (usedIds.contains(id)); + usedIds.add(id); + return id; + } + + public String getStudentId() { + return studentId; + } + + public Course getCourse() { + return course; + } + + public void setCourse(Course course) { + this.course = course; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getName() { + return name; + } + + public void setName(String name) { + if (!name.matches("[a-zA-ZáéíóúÁÉÍÓÚñÑ ]+")) { + throw new IllegalArgumentException("El nombre no puede contener números ni caracteres especiales."); + } + this.name = name; + } +} + From 3ea805cf5abfce39e34057d4d289c3cdffa3176d Mon Sep 17 00:00:00 2001 From: Francisco Ismael Farrando <121203370+franciscofarrando@users.noreply.github.com> Date: Tue, 15 Apr 2025 12:23:21 +0200 Subject: [PATCH 08/36] dev branch created --- homework-java/src/main/java/com/example/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homework-java/src/main/java/com/example/Main.java b/homework-java/src/main/java/com/example/Main.java index 81d687e8..182805d1 100644 --- a/homework-java/src/main/java/com/example/Main.java +++ b/homework-java/src/main/java/com/example/Main.java @@ -5,6 +5,6 @@ public class Main { public static void main(String[] args) { - +//comentario } } \ No newline at end of file From 376c536443d5679e2bcc8a0474e4aa4ffe6c5202 Mon Sep 17 00:00:00 2001 From: Irenevn16 Date: Tue, 15 Apr 2025 13:29:33 +0200 Subject: [PATCH 09/36] comienzo scanner --- .../src/main/java/com/example/Menu.java | 42 ++++++++++++++++++ .../target/classes/com/example/Main.class | Bin 1153 -> 0 bytes .../target/classes/com/example/Teacher.class | Bin 1827 -> 0 bytes 3 files changed, 42 insertions(+) create mode 100644 homework-java/src/main/java/com/example/Menu.java delete mode 100644 homework-java/target/classes/com/example/Main.class delete mode 100644 homework-java/target/classes/com/example/Teacher.class diff --git a/homework-java/src/main/java/com/example/Menu.java b/homework-java/src/main/java/com/example/Menu.java new file mode 100644 index 00000000..955fd288 --- /dev/null +++ b/homework-java/src/main/java/com/example/Menu.java @@ -0,0 +1,42 @@ +package com.example; + +import java.util.ArrayList; +import java.util.List; +import java.util.Scanner; + +public class Menu { + + + Scanner myScanner = new Scanner(System.in); + + public void CreatingSchool () { + System.out.println("Please, enter a name for the new school: "); + String schoolName = myScanner.nextLine(); + //hay que crear la clase School? + + System.out.println("Now, we need some teachers for your school " + schoolName + ". How wany teachers should be created? Please enter a number."); + int numberOfTeachers = myScanner.nextInt(); + myScanner.nextLine(); + + List teachers = new ArrayList<>(); + + for (int i = 0; i < numberOfTeachers; i++) { + System.out.println("\nEnter the details for teacher " + i); + + System.out.println("Name: "); + String name = myScanner.nextLine(); + + System.out.println("Salary: "); + double salary = myScanner.nextDouble(); + myScanner.nextLine(); + + Teacher teacher = new Teacher(name, salary); + teachers.add(teacher); + + System.out.println("Teacher " + i + "added."); + } + System.out.println(numberOfTeachers + "teachers created for " + schoolName); + + + } + } diff --git a/homework-java/target/classes/com/example/Main.class b/homework-java/target/classes/com/example/Main.class deleted file mode 100644 index 3414b65a1048cb0a69e663e265a80bc530ee5982..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1153 zcmaJ=T~8B16g|_HZd(?L1&WAbQ9fE!*6*)Y6Kz5uDQZ#z4?Ydc2t#*wn%yai&;AJC zeehWyFd@+&;BWC47^B|ZZnQ|_COaQz&pr3tJF{PZ9(@7u2(=s%NE%3)7(kj~WRLH2 z%i-RR^>k}b*qR|-lb+NM8ItA7Miv=l4dhG=!aPQA9t2vr#8Mp!8gE2GQd!S@>FK8S z1$V0%3^No~gyX0Z_qIzfg<~sM%;YeFQw9nqMlr@P+9#HLv_qvA47GAsJaS3O(%Y#% z?}56;tChYM3RHH{!~{+=Ot`!y>dLdZ-jsTmR)OZ84#<9aH4g7h652dtVhU#&jL41S zh1{Opv7O3>foWnSyXrH&&gx*!#K?WAXfGj;Iv3wfWa=4Bg25yF}y~Qy5_Z~@aU$unQ zb=K|nGPkwz4;bF|_AVxN^;hVAI3k#BDAnq;t0!CBgB%N7KWK|S^xo=^Uy$g8V~IL< zoTk)*+H07Ro14qOnNQq0|ul-D4OgY!LHw>BDqIlFZZL&SN1;ynr$)gfB)B ki66+b??g)C5&;QZ#ub_~M7>Jy5^mEjN2@!yhbkt21Nyxo#Q*>R diff --git a/homework-java/target/classes/com/example/Teacher.class b/homework-java/target/classes/com/example/Teacher.class deleted file mode 100644 index 2063f6b21d35c600d09cae474221d5b3285d512c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1827 zcmaJ?+j1L45IrNwT1gp8MvgDRAvTE<%Q9pMccNfOBuqpU=OQ_m;%O{R*&DBRRlB1U z{uBO!OJRo!ReS&+MWttUZOPHX%iOlR&*{@Wv;X}2`fmWY@vMLp(iSotQ^+#Rybv#i z?Fw(tez5yOb`?YRmg6~UlObJMe^NjWc?$)ObKnfKUB7S3pG1G)O1mRPcV7k!Rw&iB z=u3vVN^2Cbtpdl}t3^SI93{*!f05$?-et%sKLTYqe`0BJi>c%(n~NOp;Sv#15&dS5p*+c2 zo33!YuT3)^C8rOraIE4gNfgEzu!a^Woks=h7OET@_~4AF?ZZ&XK56L>N!qyx$MNll zB#k0gQuHZ<9IkWNIs?8ZRjg~XSEiEP;P@DyFf8=Nfvo#pSE#3s+NV{hgr`D=Ye||< zCRD&@_}s!59ABDB8lBHFp-K)kFV|z3Pl!s@A~EWIk1AbiIiB1e_IG8_5xXv(lv{pR zxKBjj=zV;cQTq;YoNFaCPL1#=-KcZ&v^wbvYCI}@rY{^rIFDzhcJ%GaI!^SFAkVT5y+y4jWCYRmTzhJ)HBBvy(7O41_{@;{tMwA!b zn;bnfK$=FnZnR42yJTj%LNw>V=n49Y#+$TzPL>&(OVw9k)s16V)ygrZe=`m>8q4N$ zfyQ&lgQJLP+@kXpawIo=jZK>MO2aU-(m*K#lZ|0+oBavQpLpjO3rAQQ!4yrnBEggh zV#Yx5I9vq5^hJ%s*)(gYsp=nC`jr+bXs#L!m>qMTiuo~oljywsw(~-wGrhqv@+LuP zeY4e#BP@^j>*pO*AE2wBr#{0q6~uW+sPJJzTbK75UjfMa|*iXN3| xjhd)}1+0%DETVz$C`OJLZc$Ir(~Iv-PIu8X=L{`6{Q-|@SD;lJJ9vr Date: Tue, 15 Apr 2025 14:51:43 +0200 Subject: [PATCH 10/36] Agregar CommandHandler y cambio en student --- .../main/java/com/example/CommandHandler.java | 102 ++++++++++++++++++ .../src/main/java/com/example/Student.java | 3 + 2 files changed, 105 insertions(+) create mode 100644 homework-java/src/main/java/com/example/CommandHandler.java diff --git a/homework-java/src/main/java/com/example/CommandHandler.java b/homework-java/src/main/java/com/example/CommandHandler.java new file mode 100644 index 00000000..b0b9a5c6 --- /dev/null +++ b/homework-java/src/main/java/com/example/CommandHandler.java @@ -0,0 +1,102 @@ +package com.example; +import java.util.*; + +public class CommandHandler { + private List students; + private List teachers; + private List courses; + + public CommandHandler(List students, List courses, List teachers) { + this.students = students; + this.courses = courses; + this.teachers = teachers; + } + + public void executeCommand(String wholeCommand){ + String[] commandPart = wholeCommand.split(" "); + String command = commandPart[0]; + switch (command){ + case "ENROLL": + enrollStudent(commandPart[0],commandPart[1]); + break; + case "ASSIGN": + + break; + case "SHOW": + handleShow(commandPart); + break; + case "LOOKUP": + + break; + default: + System.out.println("Can't recognize command"); + + } + } + + public Student findStudentById(String student_id){ + Student student = null; + for(Student s: students){ + if(s.getStudentId().equals(student_id)){ + student = s; + return student; + } + } + return null; + } + + public Course findCourseById(String course_id){ + Course course = null; + for(Course c: courses){ + if(c.getCourseId().equals(course_id)){ + course = c; + break; + } + } + return null; + } + + private void enrollStudent(String student_id, String course_id) { + Student student = findStudentById(student_id); + Course course = findCourseById(course_id); + + if (student != null && course!= null) { + student.setCourse(course); + } else { + System.out.println("Couldn't assign the course"); + } + + assert course != null; + updateMoneyEarned(course); + } + + private void updateMoneyEarned(Course course){ + double total = course.getMoney_earned() + course.getPrice(); + course.setMoney_earned(total); + } + + private void handleShow(String[] command) { + switch (command[0]){ + case "COURSES": + showCourses(); + break; + case "STUDENTS": + + break; + case "TEACHERS": + + break; + case "PROFIT": + + break; + } + } + + private void showCourses() { + for (Course course: courses){ + System.out.println(course.toString()); + } + + } + +} diff --git a/homework-java/src/main/java/com/example/Student.java b/homework-java/src/main/java/com/example/Student.java index 85749487..6d4707b8 100644 --- a/homework-java/src/main/java/com/example/Student.java +++ b/homework-java/src/main/java/com/example/Student.java @@ -20,6 +20,9 @@ public Student(String name,String address,String email) { this.email = email; this.course = null; } + public Student(Course course){ + setCourse(course); + } public Student(){ this.studentId = generateUniqueStudentId(); } From c6785e5ea78bc66a3ab75edbd2acacabca45b9fe Mon Sep 17 00:00:00 2001 From: Francisco Ismael Farrando <121203370+franciscofarrando@users.noreply.github.com> Date: Tue, 15 Apr 2025 14:52:52 +0200 Subject: [PATCH 11/36] command2 iniciado --- .../src/main/java/com/example/Commands2.java | 5 +++++ .../src/main/java/com/example/Course.java | 21 ++++++++++++++----- .../src/main/java/com/example/Student.java | 14 ++++--------- 3 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 homework-java/src/main/java/com/example/Commands2.java diff --git a/homework-java/src/main/java/com/example/Commands2.java b/homework-java/src/main/java/com/example/Commands2.java new file mode 100644 index 00000000..7c114305 --- /dev/null +++ b/homework-java/src/main/java/com/example/Commands2.java @@ -0,0 +1,5 @@ +package com.example; + +public class Commands2 { + +} diff --git a/homework-java/src/main/java/com/example/Course.java b/homework-java/src/main/java/com/example/Course.java index 1f1fc9b5..ac2c3b5e 100644 --- a/homework-java/src/main/java/com/example/Course.java +++ b/homework-java/src/main/java/com/example/Course.java @@ -7,12 +7,14 @@ public class Course { private String name; private double price; private double money_earned; - // private Teacher teacher; + private Teacher teacher; //constructor de name y price public Course(String name, double price) { + setCourseId(); this.name = name; this.price = price; + setTeacher(null); } //Constructor vacio para UUID @@ -29,7 +31,7 @@ public String getName() { public void setName(String name) { this.name = name; } -/* + public double getPrice() { return price; } @@ -42,7 +44,7 @@ public String getCourseId() { return courseId; } - public void setCourseId(String courseId) { + public void setCourseId() { this.courseId = courseId; } @@ -53,14 +55,23 @@ public double getMoney_earned() { public void setMoney_earned(double money_earned) { this.money_earned = money_earned; } -*/ + + public Teacher getTeacher() { + return teacher; + } + + public void setTeacher(Teacher teacher) { + this.teacher = teacher; + } + @Override public String toString() { - return "CourseClass{" + + return "Course{" + "courseId='" + courseId + '\'' + ", name='" + name + '\'' + ", price=" + price + ", money_earned=" + money_earned + + ", teacher=" + teacher + '}'; } } diff --git a/homework-java/src/main/java/com/example/Student.java b/homework-java/src/main/java/com/example/Student.java index 85749487..9908d98b 100644 --- a/homework-java/src/main/java/com/example/Student.java +++ b/homework-java/src/main/java/com/example/Student.java @@ -14,25 +14,19 @@ public class Student { public Student(String name,String address,String email) { - this.studentId = generateUniqueStudentId(); + this.studentId = UUID.randomUUID().toString(); this.name = name; this.address = address; this.email = email; this.course = null; } public Student(){ - this.studentId = generateUniqueStudentId(); + this.studentId = UUID.randomUUID().toString(); + } - private String generateUniqueStudentId(){ - String id= ""; - do{ - id=UUID.randomUUID().toString(); - } while (usedIds.contains(id)); - usedIds.add(id); - return id; - } + public String getStudentId() { return studentId; From 77d683d5178653b119d036f708dabc3f38b08233 Mon Sep 17 00:00:00 2001 From: Gab Caser Date: Tue, 15 Apr 2025 15:02:28 +0200 Subject: [PATCH 12/36] =?UTF-8?q?Correcci=C3=B3n=20de=20findCourseById?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- homework-java/src/main/java/com/example/CommandHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homework-java/src/main/java/com/example/CommandHandler.java b/homework-java/src/main/java/com/example/CommandHandler.java index b0b9a5c6..b9f01b23 100644 --- a/homework-java/src/main/java/com/example/CommandHandler.java +++ b/homework-java/src/main/java/com/example/CommandHandler.java @@ -50,7 +50,7 @@ public Course findCourseById(String course_id){ for(Course c: courses){ if(c.getCourseId().equals(course_id)){ course = c; - break; + return course; } } return null; From 579a4607e355f82edfa6d8671ae2736e36b57443 Mon Sep 17 00:00:00 2001 From: Francisco Ismael Farrando <121203370+franciscofarrando@users.noreply.github.com> Date: Tue, 15 Apr 2025 15:59:06 +0200 Subject: [PATCH 13/36] course con set Id --- .../src/main/java/com/example/Command2.java | 146 ++++++++++++++++++ .../src/main/java/com/example/Commands2.java | 5 - .../src/main/java/com/example/Teacher.java | 7 + 3 files changed, 153 insertions(+), 5 deletions(-) create mode 100644 homework-java/src/main/java/com/example/Command2.java delete mode 100644 homework-java/src/main/java/com/example/Commands2.java diff --git a/homework-java/src/main/java/com/example/Command2.java b/homework-java/src/main/java/com/example/Command2.java new file mode 100644 index 00000000..5049ad1c --- /dev/null +++ b/homework-java/src/main/java/com/example/Command2.java @@ -0,0 +1,146 @@ +package com.example; +import java.util.*; + +public class Command2 { + private List students; + private List teachers; + private List courses; + + public Command2(List students, List courses, List teachers) { + this.students = students; + this.courses = courses; + this.teachers = teachers; + } + + public void executeCommand(String wholeCommand){ + String[] commandPart = wholeCommand.split(" "); + String command = commandPart[0]; + switch (command){ + case "ENROLL": + enrollStudent(commandPart[0],commandPart[1]); + break; + case "ASSIGN": + assignTeacher(commandPart[0], commandPart[1]); + break; + case "SHOW": + handleShow(commandPart); + break; + case "LOOKUP": + handleLookUp(commandPart); + break; + default: + System.out.println("Can't recognize command"); + + } + } + + public Student findStudentById(String student_id){ + Student student = null; + for(Student s: students){ + if(s.getStudentId().equals(student_id)){ + student = s; + return student; + } + } + return null; + } + + public Course findCourseById(String course_id){ + Course course = null; + for(Course c: courses){ + if(c.getCourseId().equals(course_id)){ + course = c; + break; + } + } + return null; + } + + + public Teacher findTeacherById(String teacher_id){ + Teacher teacher = null; + for(Teacher t: teachers){ + if(t.getTeacherId().equals(teacher_id)){ + teacher = t; + return teacher; + } + } + return null; + } + private void enrollStudent(String student_id, String course_id) { + Student student = findStudentById(student_id); + Course course = findCourseById(course_id); + + if (student != null && course!= null) { + student.setCourse(course); + } else { + System.out.println("Couldn't assign the course"); + } + + assert course != null; + updateMoneyEarned(course); + } + + + public void assignTeacher(String teacher_id, String course_id){ + Teacher teacher = findTeacherById(teacher_id); + Course course = findCourseById(course_id); + + if (teacher != null && course!=null){ + teacher.setCourse(course); + }else { + System.out.println("Couldn't assign the course"); + } + } + + private void updateMoneyEarned(Course course){ + double total = course.getMoney_earned() + course.getPrice(); + course.setMoney_earned(total); + } + + private void handleShow(String[] command) { + switch (command[0]){ + case "COURSES": + showCourses(); + break; + case "STUDENTS": + + break; + case "TEACHERS": + + break; + case "PROFIT": + + break; + } + } + + private void showCourses() { + for (Course course: courses){ + System.out.println(course.toString()); + } + + } + +//----------- comienzo lookup + + private void handleLookUp(String[] command) { + switch (command[0]){ + case "COURSES": + lookUpCourse(); + break; + case "STUDENTS": + + break; + case "TEACHERS": + + break; + + } + } + private void lookUpCourse() { + + + } + +} \ No newline at end of file diff --git a/homework-java/src/main/java/com/example/Commands2.java b/homework-java/src/main/java/com/example/Commands2.java deleted file mode 100644 index 7c114305..00000000 --- a/homework-java/src/main/java/com/example/Commands2.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.example; - -public class Commands2 { - -} diff --git a/homework-java/src/main/java/com/example/Teacher.java b/homework-java/src/main/java/com/example/Teacher.java index fa6aadc9..add50268 100644 --- a/homework-java/src/main/java/com/example/Teacher.java +++ b/homework-java/src/main/java/com/example/Teacher.java @@ -6,6 +6,7 @@ public class Teacher { private String teacherId; //UUID private String name; private double salary; + private Course course; public Teacher (String name, double salary) { setName(name); @@ -35,5 +36,11 @@ public void setSalary(double salary) { this.salary = salary; } + public Course getCourse() { + return course; + } + public void setCourse(Course course) { + this.course = course; + } } From 0625ae369e86c1dcb26cd341447d7473f1551c33 Mon Sep 17 00:00:00 2001 From: Irenevn16 Date: Tue, 15 Apr 2025 16:03:14 +0200 Subject: [PATCH 14/36] scanner borrador --- .../src/main/java/com/example/Menu.java | 83 ++++++++++++++---- .../src/main/java/com/example/School.java | 69 +++++++++++++++ .../src/main/java/com/example/Teacher.java | 6 +- .../target/classes/com/example/Course.class | Bin 0 -> 1444 bytes .../target/classes/com/example/Main.class | Bin 0 -> 379 bytes .../target/classes/com/example/Menu.class | Bin 0 -> 2379 bytes .../target/classes/com/example/School.class | Bin 0 -> 2053 bytes .../target/classes/com/example/Teacher.class | Bin 0 -> 1668 bytes 8 files changed, 142 insertions(+), 16 deletions(-) create mode 100644 homework-java/src/main/java/com/example/School.java create mode 100644 homework-java/target/classes/com/example/Course.class create mode 100644 homework-java/target/classes/com/example/Main.class create mode 100644 homework-java/target/classes/com/example/Menu.class create mode 100644 homework-java/target/classes/com/example/School.class create mode 100644 homework-java/target/classes/com/example/Teacher.class diff --git a/homework-java/src/main/java/com/example/Menu.java b/homework-java/src/main/java/com/example/Menu.java index 955fd288..31a09edc 100644 --- a/homework-java/src/main/java/com/example/Menu.java +++ b/homework-java/src/main/java/com/example/Menu.java @@ -5,37 +5,90 @@ import java.util.Scanner; public class Menu { + private School school; + public static void main(String[] args) { - Scanner myScanner = new Scanner(System.in); - public void CreatingSchool () { - System.out.println("Please, enter a name for the new school: "); - String schoolName = myScanner.nextLine(); - //hay que crear la clase School? + Scanner myScanner = new Scanner(System.in); + System.out.println("Please, enter a name for the new school: "); + String schoolName = myScanner.nextLine(); + var school = new School(schoolName); - System.out.println("Now, we need some teachers for your school " + schoolName + ". How wany teachers should be created? Please enter a number."); - int numberOfTeachers = myScanner.nextInt(); - myScanner.nextLine(); - List teachers = new ArrayList<>(); + System.out.println("Now, we need some teachers for your school " + schoolName + ". How wany teachers should be created? Please enter a number."); + int numberOfTeachers = Integer.parseInt(myScanner.nextLine()); - for (int i = 0; i < numberOfTeachers; i++) { + for (int i = 1; i < numberOfTeachers; i++) { System.out.println("\nEnter the details for teacher " + i); System.out.println("Name: "); String name = myScanner.nextLine(); System.out.println("Salary: "); - double salary = myScanner.nextDouble(); - myScanner.nextLine(); + double salary = Double.parseDouble(myScanner.nextLine()); Teacher teacher = new Teacher(name, salary); - teachers.add(teacher); + school.addTeacher(teacher); - System.out.println("Teacher " + i + "added."); + System.out.println("Teacher " + i + " added."); } - System.out.println(numberOfTeachers + "teachers created for " + schoolName); + System.out.println(numberOfTeachers + "teachers created for " + schoolName); + + System.out.println("Now, we need some courses. How wany should be created? Please enter a number."); + int numberOfCourses = Integer.parseInt(myScanner.nextLine()); + + for (int i = 1; i < numberOfCourses; i++) { + System.out.println("\nEnter the details for course " + i); + + System.out.println("Name: "); + String name = myScanner.nextLine(); + + System.out.println("Price: "); + double price = Double.parseDouble(myScanner.nextLine()); + + Course course = new Course(name, price); + school.addCourse(course); + + System.out.println("Course " + i + " added."); + } + System.out.println(numberOfCourses + "courses created for " + schoolName); + + System.out.println("Let's create the students. How wany should be created? Please enter a number."); + int numberOfStudents = Integer.parseInt(myScanner.nextLine()); + + for (int i = 1; i < numberOfStudents; i++) { + System.out.println("\nEnter the details for student " + i); + + System.out.println("Name: "); + String name = myScanner.nextLine(); + + System.out.println("Address: "); + String address = myScanner.nextLine(); + + System.out.println("Email: "); + String email = myScanner.nextLine(); + + Student student = new Student(name, address, email); + school.addStudent(student); + + System.out.println("Student " + i + " added."); + } + System.out.println(numberOfStudents + "students created for " + schoolName); + + //comandos + while(true) { + System.out.println("Enter a command from the next list: "); + var input = myScanner.nextLine(); + String [] parts = input.split(" "); + if(parts[0].equalsIgnoreCase("Enroll")&& parts.length == 3) { + // school.enrollStudent(parts[1], parts[2]); + } else { + //System.out.println("ENROLL command needs to follow this format: ENOLL [sadlf]"); + } + + break; + } } diff --git a/homework-java/src/main/java/com/example/School.java b/homework-java/src/main/java/com/example/School.java new file mode 100644 index 00000000..539d962b --- /dev/null +++ b/homework-java/src/main/java/com/example/School.java @@ -0,0 +1,69 @@ +package com.example; +import java.util.ArrayList; +import java.util.List; + +public class School { + private String name; + private List teachers; + private List students; + private List courses; + + public School(String name) { + this.name = name; + this.teachers = new ArrayList<>(); + this.students = new ArrayList<>(); + this.courses = new ArrayList<>(); + } + public void addTeacher (Teacher teacher){ + teachers.add(teacher); + } + public List getTeachers () { + return teachers; + } + + public void showTeachers() { + if (teachers.isEmpty()) { + System.out.println("No teachers have been added yet."); + } else { + System.out.println("\n Teachers at " + name + ":"); + for (int i = 0; i < teachers.size(); i++) { + System.out.println(" #" + (i + 1) + " - " + teachers.get(i)); + } + } + } + public void addCourse (Course course){ + courses.add(course); + } + public List getCourses () { + return courses; + } + + public void showCourses() { + if (courses.isEmpty()) { + System.out.println("No courses have been added yet."); + } else { + System.out.println("\n Courses at " + name + ":"); + for (int i = 0; i < courses.size(); i++) { + System.out.println(" #" + (i + 1) + " - " + courses.get(i)); + } + } + } + public void addStudent (Student student){ + students.add(student); + } + public List getStudents () { + return students; + } + + public void showStudents() { + if (students.isEmpty()) { + System.out.println("No students have been added yet."); + } else { + System.out.println("\n Students at " + name + ":"); + for (int i = 0; i < students.size(); i++) { + System.out.println(" #" + (i + 1) + " - " + students.get(i)); + } + } + } +} + diff --git a/homework-java/src/main/java/com/example/Teacher.java b/homework-java/src/main/java/com/example/Teacher.java index fa6aadc9..249efca7 100644 --- a/homework-java/src/main/java/com/example/Teacher.java +++ b/homework-java/src/main/java/com/example/Teacher.java @@ -8,6 +8,7 @@ public class Teacher { private double salary; public Teacher (String name, double salary) { + this.teacherId = UUID.randomUUID().toString(); setName(name); setSalary(salary); } @@ -35,5 +36,8 @@ public void setSalary(double salary) { this.salary = salary; } - + @Override + public String toString() { + return "Name: " + name + ", teacherId: " + teacherId + ", Salary: $" + salary; + } } diff --git a/homework-java/target/classes/com/example/Course.class b/homework-java/target/classes/com/example/Course.class new file mode 100644 index 0000000000000000000000000000000000000000..e79f18a2696542202ad00a27f4761656cccae936 GIT binary patch literal 1444 zcmaJ>TTc@~6#k~SEoEu3KoL-=3Q`JE?-xo@Y(pfe_`t;&AI#8BU}3x4>~4v~_&@v^ znur=6`~m(bMd){u97Do+c1NSVKfd6fuV3BYwgQCbtd> zulA2b&0~nI8kXU$F@$pqdjp7LKtn>uAasUw&2ALLd){c8qENP5jw=`<7H^P9S39w` zJ;$&Piqbo&BZXmxXwxxjWX389q%oplRL2-H3`ynI@(i=EySrIoNI2Z8+YSGa&Mo+H zFAR#(|FVt=Oftkh+s9%UZCk2rx)@y1aaEF!*A(H+x}-IuBP(g?4cii@?*w-&QBPBi zuIspgS%&cjKNe-%s&VhN;T@9Zdff6{hLv1zroA_nNLSRo|v;a@YOPE@^3=%`au;Ao!YUc8M)z zyUSZ*A5$^hPv8L_YIr0I{g`34Gd6~GVjqiw-#fqd8@%S(&MCvEZvKIxPwNGZiz(dM zs%;;)n#JB$blv>rxO3VReazo>+53;8*xkw?M46lBw&4jXx4vmv!chegt_Hf9>&dAf zRShME>HnM3d-U_dHJaKG4QPaRnrG5N@=+>DFHA`qX_8UUbHg0%H|g{SVe$b|`R`!) z#WQI6+!=_B?QS;qJfMgKi@eT@MBoQ zt-yJWtYxWUD%}nR`SSy&sW>w#LdLhc$S@XU$mGu@i1jSM%n*?&Nru)Ct?6^>2>xYO i>|&M);)bzIs38<^n`E5g-lKH~Pw12&Z3U}X!^9tm+czZu literal 0 HcmV?d00001 diff --git a/homework-java/target/classes/com/example/Main.class b/homework-java/target/classes/com/example/Main.class new file mode 100644 index 0000000000000000000000000000000000000000..3f9a731f266eb6733eef584a80225913855d1b69 GIT binary patch literal 379 zcmZut!AiqG5Ph4bjY*@et$6p=R&YO{B8cEAt%pi3o;GobTat~esrXx-3Lg9bKT4bl z1w~!hH#_s@y`9~U&$o8~mpF>xp%cK5(M3;SxK__fmdY0LCR^*g5$K&8Ynlsz&SaVf z*rTSruB3iZ)nlpULK!RIU)A?oV2~KAmzyfn?p9?bRYpmjt1?y2aK0=0&4YPj?zhpL zoT}FFcygC~&$4QqvBi9v60clA+VMZMK(wkiF4xzFuMT;%Gd95q0(vJe4}xDx7*ZxF x3X0v?7UH#~BSNOBh(2MwJIC0kEW`l@RAKQcZSMOc41Wmew{X}tjtD)BzW{+?M;!nF literal 0 HcmV?d00001 diff --git a/homework-java/target/classes/com/example/Menu.class b/homework-java/target/classes/com/example/Menu.class new file mode 100644 index 0000000000000000000000000000000000000000..7d58a3190b07d486d7099758b7d1e509765eadd2 GIT binary patch literal 2379 zcmaJ?%W@M(6g_Rp9!ZvY$oK^T2FHK}#twNn!G`d#A&A(9M8@Da586`O8a$d&W=7b` zdyy5DRkF!4l?_$NDlBjcs`3H(qEr?kr)S1kE-P86N8Nqzx%Zwvef!UUp8f&gGQP>6 z4G9CuEZWf_uaXmArDAQ5vreCVKu03I9 zFo1&w4rTEY4hwW|<<|r$VAON~TNeMlrT^a$!CNQnRW&W?Yk=uQ>gW@(MW!oYe`vsx1mFib~;i z>ST^2Pnao;6SF97=`}RJZ{eJQi7X~@eupro-TJakmO8`mTeFq~PaB~8x|>OxSF%)5 zUIrI%NwaoYptl7h)B11*F_pzMt_oyixg2|jQfq<8$>QIz{%mlZf0B3 z@UFnn)mU=`uS%zEu6S-W*4;*6+Lj+omTj;ZVTjvR3}k6-R@TDm4cs$O*`c^7e*zWVx>r)yEG@sZ=3`VBN!u%~8~A}I zYqKh-xMe>Db}nnqT^}*mb>C2B(|6fP;*$Nar8I~Z_Y+f$n%CWRb6q-(Z6m+p*6p&n ztjrSoU7*Sr&8ReP8(oz7ROR ztEN_|8u&`!$p4#C;!#~Vh8cDPumiSX4mbI)jsN*na=gXa7{7ww_EVb>zlGcHan#%3 ztMER@Y-E5U<~d8_HWs)-XYr6g8Ls{M494PPq&Io7A0wCReS-eePjF=R83q?eHZe5E z)sd$-0mM7M1emm(eu}nhy@dIPr<@p@L!|<#U%%hGnJ(5tg zJ%q$_f^-;IF<=;2H83c6PJiQW7mKoJ(uVt3uEJLSLk#(afH`XGWtx{yF{~z)kF>5JOx;LPsC^ z8AkW`0ngjq+0C!->(3he?UT%xf$3s}l&2NxSNooae6b6uCFxFh7 zt;MMG17Yk4;TS|m)Qm$R7gES!Uc>V`u4AEHon9oO)l|5)^Mr(`tl4Usn)!l`7x5Cq zM1${(qU)GkZdtNUCtq?$QYB}*<+o$IDiWDgJzmlADqf>r`qtOfOKN>dncvXyCT`I4 zu28ZwrEFJtRL~R_@s@@q9dF~E-l7FlKxz)S-4g3xJi(~lkS@rGQ5p=(N?ws+E>k+~ z&`l$XVMtc2U5Cq-M*`-;n3Ew|EO$@tW;kqxr2Qnnni)@tks zZ80*O!ele6ZMe`7mV7QR!acYyxR;hB)D5;Se~nG@lZEPKlM|JBg_y8C4Zk68??#4uEm+}vN~%}8CULUl34ily`qhO!pa zH%R?oc3tU9k2hC^th+UT0Qbn6GTNvHmj=5rfKN%Dag`a@4K~t`&r`S$u3<;D-DH^Q zEECH)aQA851k)4_`U*Ft>(N*HZTE;rj$z(A+^N~ZpDDZUeydqHJwsiVp1{q+rZ~g> zUYGwFlN&)4xouZ0DX8pv$#H~Nw7F0FN&`**wNskTqN<_JF#U8_+R~veT%qL{qiqnU zE3Ifc#neWn59n5KzD>`xIZvKfkf3uP7U=pedDMbPz{ouY%gsN6mirAucOPTq5k@=5 zu^$4oJ9Iry(V$!j%9f-(K86w6rK2bX?-UmU@8NyAtCQkHGlVi$>8di`B1Xzf&;5+i z`6Eoku+>3V|0j@wLE_v&)K3s~tYJMs+`tFqs}S?SGtj3HACe&kMYNyHz<2- B>|6i< literal 0 HcmV?d00001 diff --git a/homework-java/target/classes/com/example/Teacher.class b/homework-java/target/classes/com/example/Teacher.class new file mode 100644 index 0000000000000000000000000000000000000000..5d51a8a0588e6b66fee3ed0c8f6a54ece3647659 GIT binary patch literal 1668 zcmaJ>+foxj5IsXe7Q#Ycxht1|L6U&1cZJ{u5-F*Q_`t;npN2363!7bPccA1?{0p^8 z(Bi=l@S`kyb{AMk^dURllkPsJ&-BdiKj*&yEa6QWEl6lc>S#rZp?jYnbJOO|uK9j@ zU(_T+YSD5m`H~@#FKngJhIS2U9Uagax`OZ{Y1!uH=4yo@?Qv(vt%r`0FI2AwlvI9~ zjtsgP+N8TKJp1tUL#F4hI9<$7K7#sxyI{)p+Daksd_UoqGJ?eRF-1bxy`*3hGf1{*ivM&Iwlm8 zq(fEI#vL6wOp!!>6v`?F$vUkgj{?JBogav@>(sdXV97nQe90Z@Gt4(3&`7Bg$ro>k zVW3Ga5hPk=cZZtGR4qrW9o4smx52k<+A*qbjoVw?vy>lgCgq+*O!})$WGyl1yFx}H zD`_=yL+#qhx=@BDLY?`#d*s!`ilwmhC}~a|Jk8Ux>q=jG{P3NSd+v_khUW|us?8jKE9G52w46)zR zXxhThRbBVs=&;nNcWmcc;>O9LXcGQ079U=gQvAT85@l}N>y{Ks(^bb2UfJfpFMJJ4 z3{wp~HKVGb%rN%(CFb9)XWhqb= zSPHf!08K@pOMwq$u7h4dbp_=z1l3IdJpqIsl*>dA4EO23um_V?1=U*oj-Ib%v_SDy zXh2^qx%D#nLDS^%o5@2>lj%K)kY5s%Qae?gImP%DfAy{cBP7^pP+=g9x|Ams$;0pv zkD^*8#awhT`GwNsU1XaQp~vcyNFtCdRh&M>@!|;HEr<7%L-cE`i4Z_a}Hts~Wa>`aQ!d^3r6z#xg1x{tHtcMOFX+ literal 0 HcmV?d00001 From 74fdab8342e560c5f8eff77b501c0e7dcfb762c6 Mon Sep 17 00:00:00 2001 From: Gab Caser Date: Tue, 15 Apr 2025 16:34:47 +0200 Subject: [PATCH 15/36] Corrected StudentId creation, created test --- homework-java/pom.xml | 14 ++++++++ .../main/java/com/example/CommandHandler.java | 1 - .../src/main/java/com/example/Course.java | 4 +-- .../src/main/java/com/example/Student.java | 18 +++++----- .../src/test/java/CommandHandlerTest.java | 34 ++++++++++++++++++ .../classes/com/example/CommandHandler.class | Bin 0 -> 3942 bytes .../target/classes/com/example/Course.class | Bin 0 -> 1954 bytes .../target/classes/com/example/Main.class | Bin 1153 -> 379 bytes .../target/classes/com/example/Student.class | Bin 0 -> 2293 bytes .../target/classes/com/example/Teacher.class | Bin 1827 -> 1082 bytes .../test-classes/CommandHandlerTest.class | Bin 0 -> 2142 bytes 11 files changed, 59 insertions(+), 12 deletions(-) create mode 100644 homework-java/src/test/java/CommandHandlerTest.java create mode 100644 homework-java/target/classes/com/example/CommandHandler.class create mode 100644 homework-java/target/classes/com/example/Course.class create mode 100644 homework-java/target/classes/com/example/Student.class create mode 100644 homework-java/target/test-classes/CommandHandlerTest.class diff --git a/homework-java/pom.xml b/homework-java/pom.xml index 27f9a934..55057c41 100644 --- a/homework-java/pom.xml +++ b/homework-java/pom.xml @@ -13,5 +13,19 @@ 21 UTF-8 + + + org.junit.jupiter + junit-jupiter-engine + 5.9.2 + + + org.junit.jupiter + junit-jupiter-api + 5.9.2 + + + + \ No newline at end of file diff --git a/homework-java/src/main/java/com/example/CommandHandler.java b/homework-java/src/main/java/com/example/CommandHandler.java index b9f01b23..01bb1f96 100644 --- a/homework-java/src/main/java/com/example/CommandHandler.java +++ b/homework-java/src/main/java/com/example/CommandHandler.java @@ -65,7 +65,6 @@ private void enrollStudent(String student_id, String course_id) { } else { System.out.println("Couldn't assign the course"); } - assert course != null; updateMoneyEarned(course); } diff --git a/homework-java/src/main/java/com/example/Course.java b/homework-java/src/main/java/com/example/Course.java index 1f1fc9b5..5250ed11 100644 --- a/homework-java/src/main/java/com/example/Course.java +++ b/homework-java/src/main/java/com/example/Course.java @@ -29,7 +29,7 @@ public String getName() { public void setName(String name) { this.name = name; } -/* + public double getPrice() { return price; } @@ -53,7 +53,7 @@ public double getMoney_earned() { public void setMoney_earned(double money_earned) { this.money_earned = money_earned; } -*/ + @Override public String toString() { return "CourseClass{" + diff --git a/homework-java/src/main/java/com/example/Student.java b/homework-java/src/main/java/com/example/Student.java index 6d4707b8..58ec1b7d 100644 --- a/homework-java/src/main/java/com/example/Student.java +++ b/homework-java/src/main/java/com/example/Student.java @@ -1,5 +1,6 @@ package com.example; import java.util.HashSet; +import java.util.Random; import java.util.Set; import java.util.UUID; @@ -12,7 +13,6 @@ public class Student { private String email; private Course course; - public Student(String name,String address,String email) { this.studentId = generateUniqueStudentId(); this.name = name; @@ -20,19 +20,19 @@ public Student(String name,String address,String email) { this.email = email; this.course = null; } - public Student(Course course){ - setCourse(course); - } + public Student(){ this.studentId = generateUniqueStudentId(); } - - private String generateUniqueStudentId(){ - String id= ""; - do{ - id=UUID.randomUUID().toString(); + private String generateUniqueStudentId() { + String id; + Random random = new Random(); + do { + int number = random.nextInt(900) + 100; + id = "S" + number; } while (usedIds.contains(id)); + usedIds.add(id); return id; } diff --git a/homework-java/src/test/java/CommandHandlerTest.java b/homework-java/src/test/java/CommandHandlerTest.java new file mode 100644 index 00000000..e0b48396 --- /dev/null +++ b/homework-java/src/test/java/CommandHandlerTest.java @@ -0,0 +1,34 @@ +import com.example.CommandHandler; +import com.example.Course; +import com.example.Student; +import com.example.Teacher; +import org.junit.jupiter.api.Test; + +import java.util.List; + +import static org.junit.jupiter.api.Assertions.*; + +public class CommandHandlerTest { + @Test + public void testEnrollStudentUpdatesStudentAndCourse(){ + + Student student = new Student("Studiant Diez", "Calle Su casa 12", "mail@mail"); + Course course = new Course("Ethics", 20.00); + + var studentList = List.of(student); + var courseList = List.of(course); + List teacherList = List.of(); + + CommandHandler commandHandler = new CommandHandler(studentList, courseList, teacherList); + + String commandWithIds = "ENROLL "+ student.getStudentId()+ " " + course.getCourseId(); + System.out.println(commandWithIds); + + commandHandler.executeCommand(commandWithIds); + + + + + + } +} diff --git a/homework-java/target/classes/com/example/CommandHandler.class b/homework-java/target/classes/com/example/CommandHandler.class new file mode 100644 index 0000000000000000000000000000000000000000..cd03ae83448c931385c8f2bb1efb116aff5d8fd9 GIT binary patch literal 3942 zcmai1TXYlG72P9^JhC)?AR7l0Fopt_Wf_Ap4z-AbW1C>`3uNpD(vm@**dnszNaOHm z+Vq*Gk2Gx(XhWMcB`s=R4I#lS+O-;1Khm}G*Z%gi{qJX2vr6eccl59b30~`J=G-~= z+E#^z43)l%3V!&pAu8cG}6&?5MK4cohV$Sh@Zc24G2nFz_8-?6R4yq(SY(WpUd4WJ447+7PX8EY$G#+__3 zJ*UB!TTCShw=L}MrF?Kd#@dg4dQL2^GqD~m+-=^<%@1Z~ZRO;MAFXtIc>M6h=%}b| zGVuj$=9K-!l9i%6t5@#f@)T=7>c>{<48-Fj4~_c~)}Y7tPt5oc;q2(d#K9wz0eToU z(TQyuYV342lS;*1j_!>6)2Q30#m06MJJ78mFt50d&u30)XbRuKONm$yb{Xh3aUXV9 zGIu8D*b8(yvqaujyPG95U6Ul#A#=915c8u?!##smy3J|L+KJ3uI(gP^Wz;3o0qnv3 z2Kr4rfV~6 zZmrDmLbw7rgeen8Fs;Fyv&ojq^pRN&m4*s#8u$`{tu!>Kaz20=95r!F>;!4YogE>w zetg-)S8!ZI-DAo0Y+-{3&&U?-E7Pw?uIE0+X*{Ge6r| zCz(m-hLSn!M9QXz+ED`;4Qo^=RYV4gTEp3FCL2H+UU4pKA}6p`EiKMkjy;x1+h>NY zY}zJ;Ggvb5Bv=}Cq*i@8ZmVx93x-7FjES?N;im@kK4Ht`QzpKKuX7oFtz4#uhs3>a zFrfw~jvS5;$Nl&gSI4K03=NM@QTh(0so{aa{lkYTJ;TzUJUp>)WJ>t ztjktT_WPlUA4vxIos1jJ0Dg?;4gAE!PbH)4$}|k7NEa(%*3Kof_H2ojxMMj>{7@Yy z)qKsem9?!X7HPVBDxy_Pk^b1-G^gBF923p0pKG&_0iw9GkX+@Kf7{B~?Q%OA(A_3n zH=0b_<4X%C?Cg|e1Z!tBldw|LRyHYeVN!SIlk|CAg z-zKh*l{y0a4WgEo8&HFnIU8};;{tv`iIxhuanP|d%Uwx_w@Rj^<~`q7C&K*Lw{!5D`)vU zimiXU$>)LG>(0OU>^r+%zr<&xSr2Vk#>SV?>+SXBv7Pc3C2!S5Zl&C&en=F4p7#b&1AXG$O(7)y5(p zz_^Y94db2H@sLIYoA@%O;RX)%>B4)wLs8>z*2kik^SA!4UFJ$RWm;$#*h*_{bRdi< z+R;U-cJQr-bQRrcrTdqVS4q@ca;z7>Q;vD4`v$*ylsk3s-h^r3kb(W1KjEY%C-xnI z*L()>85j7&cLTnI*1HLOr-IvsT?Bp~!R)R8{wC>?>RAc=?Go^J6qyo-BJi0aaF5(= z3&8)(t%UJ`2thqEE=lufpWgWqRyFG%!R!>GXA3Db&lI|XlNTf}|AOEjk$(6Z7C&TG zFXM@FZf#7 zIjEqxZK1vdrCx2uhD!*)$GcqVk-L0hkAG8=JtaR#6RB^IT8&$t<@!SO%It$wSK2DZnE}-Su5<5P4%)LDP*yAK6uKXX(!g|91 literal 0 HcmV?d00001 diff --git a/homework-java/target/classes/com/example/Course.class b/homework-java/target/classes/com/example/Course.class new file mode 100644 index 0000000000000000000000000000000000000000..c3792b3e6f30c4c3b111f5d9013abe1646532ce6 GIT binary patch literal 1954 zcmaJ?>vG#f6#mwBEXP*t;wBDlsGF9wcH9s_ffni{z1RdYlNM%jVHkce8+j*DB1;}g z>5yS~58i@yh5*waJU}0+)3dvBti%dGw0m}SF5mgiInvvAZ~g=D6yFw+LDoRd#02sT zR}T40Zn@msx4z#y6n4arUvWGqT4TsI7k4L7z@&kqi4shPs_pkJ@hk5STw!(m;~*3a zIgj^gt8R{bZAF3O?YE_M*+d0b7$ydRW0M-|7E#4j1JfpEP-7@7v*XBdt(~2XE<-Wk zUeE9AL$$f6{hlebrTvE{uHiaEA@X%BhUuZE$|ix}BNI0y_=2qfZ}cRrn z;^Y^>15fm-#L;aNA7g=Gw$G15$MV4Lr`idWy}?k*1;d5$l0(SbuyrZ>k6(q=IBMf5@y#R!Me zOiExGw?Mi-=+aQZiT(na#22}yf>t6GUF?k>Ly6vxP8E9hJV7C4K=04r6t{?YTdX@W zosza)mQ|#;kFb{T4-^%sm+BxE45%4i@ZiBB6(#P}GN z@JVdEM%t39yh?WjL4IF>I+1fzd8lcvvkdcbh78M)03>}D=?sBP{Ye)|Ah%P2e2UM` zfMiwH`Bvi`Ic0@Anyh$L7ta6grixr>anQh|J)&Pbvt8ptvMu`U53TTKG_B9)Q) zMMmzY0{JqXk^05bJRl$sF99NZTLPh93$3y=PvUl{QIE{YKA~rdp86Xa7F?vLoj_KL fOP<98Rndp|iuMBeZPW8L{fmJjNzc&5Iff$?3=9m83?dV`^qJWiI3}ku)=z%JD67jAoL^d$oa&aDlgh}z>6@6D zrk}b*qR|-lb+NM8ItA7Miv=l4dhG=!aPQA9t2vr#8Mp!8gE2GQd!S@>FK8S z1$V0%3^No~gyX0Z_qIzfg<~sM%;YeFQw9nqMlr@P+9#HLv_qvA47GAsJaS3O(%Y#% z?}56;tChYM3RHH{!~{+=Ot`!y>dLdZ-jsTmR)OZ84#<9aH4g7h652dtVhU#&jL41S zh1{Opv7O3>foWnSyXrH&&gx*!#K?WAXfGj;Iv3wfWa=4Bg25yF}y~Qy5_Z~@aU$unQ zb=K|nGPkwz4;bF|_AVxN^;hVAI3k#BDAnq;t0!CBgB%N7KWK|S^xo=^Uy$g8V~IL< zoTk)*+H07Ro14qOnNQq0|ul-D4OgY!LHw>BDqIlFZZL&SN1;ynr$)gfB)B ki66+b??g)C5&;QZ#ub_~M7>Jy5^mEjN2@!yhbkt21Nyxo#Q*>R diff --git a/homework-java/target/classes/com/example/Student.class b/homework-java/target/classes/com/example/Student.class new file mode 100644 index 0000000000000000000000000000000000000000..2c119bc57959f19c123a4b627c672375cff603cf GIT binary patch literal 2293 zcmZ`)&sQ5&6#gb5nGh!Y2oQc$+W=}wQb@IGi@{K&v_(^@rcj|)9VYLDsgns#CY~O5 zUAl1LamUVO7oKCSfTicu#q9iR`~y7dy))A!q|?p3_wIZ5-tWHqeQ*By_xKrrWqcJ! z2w@pL3L=O~7`&%`tL6>Wtmbd-+!LBDA-brWx?PkIp3Q8=5ks$xxPm??5{9*UEidk? zwLL@R%XYIOO!6433R76BEjCR3o2KyXYZVD2vzbymL)o@;vs&n-nEeU{Fest7;RWHt z$>5_&1;c!_$5d;AeMc3f*dVKwiX|Eiwv8*8U|U4gRNY|9DFv_KRVqiTH?4*sETvBH zE3UN=!x;&PV+zwUW)!@J*Cq73kejw{o#=Ll-EAu4N?hJ*pHNY}S4>_Q*rk(Y5^!JBwXLZY3Tb}5=xH*Hln$#ZnJ z<9@tm6*AlG|F(j6*f~rW62nCa(|6Rl@0RDbou8eD&M(em=h%7ReDD0={N(IAkDMRV zcXM$p;5``y1&et91P?s)gt?~L+OFu%>^Cv9En|r?wY$4!7^12g%T~2nBU-H9*TkN! z*UcD~B@|bUv{|q1Sb~Q1UQ<*=noDEiq)q3zCaiiRZR%-FwN%X()Yr6V>LVDdVbyq4w=vR~x%@gK?}POf)O&Ra3Q_7V%)_WCs>IZq<)gEJ#@B zylvn9;>i~+nN4EqO1(mf21>dq)|<5*Vck-946-Ckbxk!kRZHi!Z|t#mb-v^i^z=1E zKtei6BT=?h?du!rp6{bnh20^uURrvDmXIQP1`wU4);=^g8+3-T$0*b)Ylx=g;7{XZ zUG~&QY9M=SA=Az}36uCjW^Wc-)C~U(iI+)dnz*WS`HByDp4&u{iP2jGL@~)CfrRU{ z3SkXNejD653Ev$_@9sz%cSlk-jS2FJ;6wU;M5_nn+e712_6SlodkFaeiEQowL)mi& z7|G5ZU@R*gVDgb0qD0@*km)-}ZbMKg?GU{*DU9G0Mvb7-#UY zThu4y5rgy({~{JB_opocd0KHfk?ikCaFURlgsTP4cEFGLK_!%Ni*~s+oz9cp&bdJ6 z4Q%?(MZfka_p+mT{3qkk5uER+DcWjOl;3}fA>npl6=U5%E(8Mk3|E4HjI~?o0l7#( zF1-W@vx9+b1p*oA22uzFvKWawibTP&bg3Kp>yDfb0;txCs-v zkMO~tuJRb0$Ht^9qig6Tl@F6<$B7s$FOP{6t*%Y@@?s{EpoWQ# jcj<}ncr@c?1Nxp~b?XS%9wWmUqz)>|wEBW`oq>^ol|cM3urzA zgEY`nGGO&$U_KkvY>>T*402#6>4BXFaUv7kiAw8%+L4_okJVa!puZvhvjc_(D5Ti5 f?A5n2C~bsmhqy!;=n@qiE>U4n1-rxmtj7=l-qA3B literal 1827 zcmaJ?+j1L45IrNwT1gp8MvgDRAvTE<%Q9pMccNfOBuqpU=OQ_m;%O{R*&DBRRlB1U z{uBO!OJRo!ReS&+MWttUZOPHX%iOlR&*{@Wv;X}2`fmWY@vMLp(iSotQ^+#Rybv#i z?Fw(tez5yOb`?YRmg6~UlObJMe^NjWc?$)ObKnfKUB7S3pG1G)O1mRPcV7k!Rw&iB z=u3vVN^2Cbtpdl}t3^SI93{*!f05$?-et%sKLTYqe`0BJi>c%(n~NOp;Sv#15&dS5p*+c2 zo33!YuT3)^C8rOraIE4gNfgEzu!a^Woks=h7OET@_~4AF?ZZ&XK56L>N!qyx$MNll zB#k0gQuHZ<9IkWNIs?8ZRjg~XSEiEP;P@DyFf8=Nfvo#pSE#3s+NV{hgr`D=Ye||< zCRD&@_}s!59ABDB8lBHFp-K)kFV|z3Pl!s@A~EWIk1AbiIiB1e_IG8_5xXv(lv{pR zxKBjj=zV;cQTq;YoNFaCPL1#=-KcZ&v^wbvYCI}@rY{^rIFDzhcJ%GaI!^SFAkVT5y+y4jWCYRmTzhJ)HBBvy(7O41_{@;{tMwA!b zn;bnfK$=FnZnR42yJTj%LNw>V=n49Y#+$TzPL>&(OVw9k)s16V)ygrZe=`m>8q4N$ zfyQ&lgQJLP+@kXpawIo=jZK>MO2aU-(m*K#lZ|0+oBavQpLpjO3rAQQ!4yrnBEggh zV#Yx5I9vq5^hJ%s*)(gYsp=nC`jr+bXs#L!m>qMTiuo~oljywsw(~-wGrhqv@+LuP zeY4e#BP@^j>*pO*AE2wBr#{0q6~uW+sPJJzTbK75UjfMa|*iXN3| xjhd)}1+0%DETVz$C`OJLZc$Ir(~Iv-PIu8X=L{`6{Q-|@SD;lJJ9vrr&fB6#f>BWo#9wAtVlI>a>JFAW=!uG+;_01`4gY1QVw;y)E*_EXa~aT4ze1 zq_5HbfJ~U_1N5OfJ!=V&fil&McD1|b`kil&{{H9vUjXK@pGF5d4J1r-A<59U$KP_x z;cm@Z-`NwkVo1(NSE^Zt&e5@offPf(?bR*uE3Y>kVU<<0DqNL9nxS_wpq1pV68Qxw zeoMim%_4UkkuNuG9`O9+qZE1=y6apzb9zX_K%e&hA;Z*Y>CAsw`O>Ww{?Cq%tDhko zkE`f4{XnE}jWSqNyV4Glb5AH|deX=ur(ND;7`(*g!dNAPTlmPpZ4)0O&(PBftEr@8 zm1IDmba-zVhU2;+T!pbP-c!+nw)BZM^C<;5dg0i>U51GvxM8E ziAQ+MaJ|m=MbUF@u3kyCOJ9MangFoT9~2qtPNrZW#bE8FQiexjDasr%;GEJXRBK6G7LsTYd9_$xg<(Wp?RuM(Tk(M zC3LY9MXxG|$R+8DwPt-s_*;C(p`C2Wv$<2@zSQezGeKk{Czt4HDfv2)*Nj-H5&+rIUA)S4-P#d5Xq=#S?_6**ZQf2&o+U>k zS4u{?Yr(5cZiUGfv}A6x=_*+l6&Xk>g=kQrClCXel|?h7x$FKB*dMLqB8~bO$Y6m+GZergmT1NBHJx^7WoD3}6z#n@hOwRP z&StV798m{2Ms_9I;5B}rIYqla)B7U?t~!a literal 0 HcmV?d00001 From a66cdc6c0f16c14b8b2026bfe5576f39f5042d08 Mon Sep 17 00:00:00 2001 From: Francisco Ismael Farrando <121203370+franciscofarrando@users.noreply.github.com> Date: Tue, 15 Apr 2025 17:07:43 +0200 Subject: [PATCH 16/36] id course --- .../src/main/java/com/example/Course.java | 21 ++++++++++++++++++- .../src/main/java/com/example/Student.java | 2 +- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/homework-java/src/main/java/com/example/Course.java b/homework-java/src/main/java/com/example/Course.java index ac2c3b5e..5cf2088c 100644 --- a/homework-java/src/main/java/com/example/Course.java +++ b/homework-java/src/main/java/com/example/Course.java @@ -1,8 +1,13 @@ package com.example; +import java.util.HashSet; +import java.util.Random; +import java.util.Set; import java.util.UUID; public class Course { + + private static final Set usedIds = new HashSet<>(); private String courseId; private String name; private double price; @@ -19,11 +24,25 @@ public Course(String name, double price) { //Constructor vacio para UUID public Course() { - this.courseId = UUID.randomUUID().toString(); + this.courseId = generateUniqueStudentId(); + } //getters y setters + + private String generateUniqueStudentId() { + String id; + Random random = new Random(); + do { + int number = random.nextInt(900) + 100; + id = "C" + number; + } while (usedIds.contains(id)); + + usedIds.add(id); + return id; + } + public String getName() { return name; } diff --git a/homework-java/src/main/java/com/example/Student.java b/homework-java/src/main/java/com/example/Student.java index 58ec1b7d..3f9e3585 100644 --- a/homework-java/src/main/java/com/example/Student.java +++ b/homework-java/src/main/java/com/example/Student.java @@ -2,7 +2,7 @@ import java.util.HashSet; import java.util.Random; import java.util.Set; -import java.util.UUID; + public class Student { private static final Set usedIds = new HashSet<>(); From 36ba82b86f6c32b2e5e0a35b69874fddfdca4276 Mon Sep 17 00:00:00 2001 From: Irenevn16 Date: Tue, 15 Apr 2025 17:16:15 +0200 Subject: [PATCH 17/36] while --- .../src/main/java/com/example/Menu.java | 86 ++++++++++++++----- .../src/main/java/com/example/School.java | 12 +-- .../src/main/java/com/example/Teacher.java | 20 ++++- 3 files changed, 88 insertions(+), 30 deletions(-) diff --git a/homework-java/src/main/java/com/example/Menu.java b/homework-java/src/main/java/com/example/Menu.java index 31a09edc..326e2038 100644 --- a/homework-java/src/main/java/com/example/Menu.java +++ b/homework-java/src/main/java/com/example/Menu.java @@ -5,7 +5,7 @@ import java.util.Scanner; public class Menu { - private School school; + private School school; public static void main(String[] args) { @@ -20,19 +20,19 @@ public static void main(String[] args) { int numberOfTeachers = Integer.parseInt(myScanner.nextLine()); for (int i = 1; i < numberOfTeachers; i++) { - System.out.println("\nEnter the details for teacher " + i); + System.out.println("\nEnter the details for teacher " + i); - System.out.println("Name: "); - String name = myScanner.nextLine(); + System.out.println("Name: "); + String name = myScanner.nextLine(); - System.out.println("Salary: "); - double salary = Double.parseDouble(myScanner.nextLine()); + System.out.println("Salary: "); + double salary = Double.parseDouble(myScanner.nextLine()); - Teacher teacher = new Teacher(name, salary); - school.addTeacher(teacher); + Teacher teacher = new Teacher(name, salary); + school.addTeacher(teacher); - System.out.println("Teacher " + i + " added."); - } + System.out.println("Teacher " + i + " added."); + } System.out.println(numberOfTeachers + "teachers created for " + schoolName); System.out.println("Now, we need some courses. How wany should be created? Please enter a number."); @@ -77,19 +77,65 @@ public static void main(String[] args) { System.out.println(numberOfStudents + "students created for " + schoolName); //comandos - while(true) { - System.out.println("Enter a command from the next list: "); - var input = myScanner.nextLine(); - String [] parts = input.split(" "); - if(parts[0].equalsIgnoreCase("Enroll")&& parts.length == 3) { + boolean continueRunning = true; + while (continueRunning) { + System.out.println("Enter a command from the next list: \n ENROLL [STUDENT_ID] [COURSE_ID] \n ASSIGN [TEACHER_ID] [COURSE_ID] \n SHOW COURSES \n LOOKUP COURSE [COURSE_ID] \n SHOW STUDENTS \n LOOKUP STUDENT [STUDENT_ID] \n SHOW TEACHERS \n LOOKUP TEACHER [TEACHER_ID] \n SHOW PROFIT "); + var input = myScanner.nextLine(); + String[] parts = input.split(" "); + + if (parts[0].equalsIgnoreCase("ENROLL") && parts.length == 3) { + // school.enrollStudent(parts[1], parts[2]); + } else if (parts[0].equalsIgnoreCase("ENROLL")) { + System.out.println("ENROLL command needs to follow this format: ENROLL [STUDENT_ID] [COURSE_ID]"); + } + + if (parts[0].equalsIgnoreCase("ASSIGN") && parts.length == 3) { + // school.enrollStudent(parts[1], parts[2]); + } else if (parts[0].equalsIgnoreCase("ASSIGN")) { + System.out.println("ENROLL command needs to follow this format: [TEACHER_ID] [COURSE_ID]"); + } + + if (parts[0].equalsIgnoreCase("SHOW") && parts.length == 2 && parts[1].equalsIgnoreCase("COURSES")) { + // school.enrollStudent(parts[1], parts[2]); + } + + if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("COURSE") && parts.length == 3) { + // school.enrollStudent(parts[1], parts[2]); + } else if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("COURSE")) { + System.out.println("LOOKUP COURSE command needs to follow this format: LOOKUP COURSE [COURSE_ID]"); + } + + if (parts[0].equalsIgnoreCase("SHOW") && parts.length == 2 && parts[1].equalsIgnoreCase("STUDENTS")) { + // school.enrollStudent(parts[1], parts[2]); + } + + if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("STUDENT") && parts.length == 3) { // school.enrollStudent(parts[1], parts[2]); - } else { - //System.out.println("ENROLL command needs to follow this format: ENOLL [sadlf]"); - } + } else if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("STUDENT")) { + System.out.println("LOOKUP STUDENT command needs to follow this format: LOOKUP STUDENT [STUDENT_ID]"); + } - break; - } + if (parts[0].equalsIgnoreCase("SHOW") && parts.length == 2 && parts[1].equalsIgnoreCase("TEACHERS")) { + // school.enrollStudent(parts[1], parts[2]); + } + + if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("TEACHER") && parts.length == 3) { + // school.enrollStudent(parts[1], parts[2]); + } else if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("TEACHER")) { + System.out.println("LOOKUP TEACHER command needs to follow this format: LOOKUP TEACHER [TEACHER_ID]"); + } + + if (parts[0].equalsIgnoreCase("SHOW") && parts.length == 2 && parts[1].equalsIgnoreCase("PROFIT")) { + // school.enrollStudent(parts[1], parts[2]); + } + System.out.println("Do you want to perform another action? (yes/no)"); + String response = myScanner.nextLine().trim().toLowerCase(); + if (!response.equals("yes")) { + continueRunning = false; + System.out.println("Thank you for using the School Manager. Goodbye!"); + } } } +} \ No newline at end of file diff --git a/homework-java/src/main/java/com/example/School.java b/homework-java/src/main/java/com/example/School.java index 539d962b..928c05a5 100644 --- a/homework-java/src/main/java/com/example/School.java +++ b/homework-java/src/main/java/com/example/School.java @@ -21,7 +21,7 @@ public List getTeachers () { return teachers; } - public void showTeachers() { + /*public void showTeachers() { if (teachers.isEmpty()) { System.out.println("No teachers have been added yet."); } else { @@ -30,7 +30,7 @@ public void showTeachers() { System.out.println(" #" + (i + 1) + " - " + teachers.get(i)); } } - } + }*/ public void addCourse (Course course){ courses.add(course); } @@ -38,7 +38,7 @@ public List getCourses () { return courses; } - public void showCourses() { + /*public void showCourses() { if (courses.isEmpty()) { System.out.println("No courses have been added yet."); } else { @@ -47,14 +47,14 @@ public void showCourses() { System.out.println(" #" + (i + 1) + " - " + courses.get(i)); } } - } + }*/ public void addStudent (Student student){ students.add(student); } public List getStudents () { return students; } - + /* public void showStudents() { if (students.isEmpty()) { System.out.println("No students have been added yet."); @@ -64,6 +64,6 @@ public void showStudents() { System.out.println(" #" + (i + 1) + " - " + students.get(i)); } } - } + }*/ } diff --git a/homework-java/src/main/java/com/example/Teacher.java b/homework-java/src/main/java/com/example/Teacher.java index 249efca7..fad4526e 100644 --- a/homework-java/src/main/java/com/example/Teacher.java +++ b/homework-java/src/main/java/com/example/Teacher.java @@ -1,19 +1,31 @@ package com.example; -import java.util.UUID; +import java.util.*; public class Teacher { - private String teacherId; //UUID + private String teacherId; private String name; private double salary; public Teacher (String name, double salary) { - this.teacherId = UUID.randomUUID().toString(); + this.teacherId = generateUniqueTeacherId(); setName(name); setSalary(salary); } public Teacher(){ - this.teacherId = UUID.randomUUID().toString(); + this.teacherId = generateUniqueTeacherId(); + } + private static final Set usedIds = new HashSet<>(); + private String generateUniqueTeacherId() { + String id; + Random random = new Random(); + do { + int number = random.nextInt(900) + 100; // genera número entre 100 y 999 + id = "S" + number; + } while (usedIds.contains(id)); + + usedIds.add(id); + return id; } public String getTeacherId() { From 4ee06f2b5606379f7475135228da07b2c18617b7 Mon Sep 17 00:00:00 2001 From: Francisco Ismael Farrando <121203370+franciscofarrando@users.noreply.github.com> Date: Tue, 15 Apr 2025 18:30:16 +0200 Subject: [PATCH 18/36] command handler ok? --- .../src/main/java/com/example/Command2.java | 146 ------------------ .../main/java/com/example/CommandHandler.java | 99 +++++++++++- .../src/main/java/com/example/Teacher.java | 3 + 3 files changed, 97 insertions(+), 151 deletions(-) delete mode 100644 homework-java/src/main/java/com/example/Command2.java diff --git a/homework-java/src/main/java/com/example/Command2.java b/homework-java/src/main/java/com/example/Command2.java deleted file mode 100644 index 5049ad1c..00000000 --- a/homework-java/src/main/java/com/example/Command2.java +++ /dev/null @@ -1,146 +0,0 @@ -package com.example; -import java.util.*; - -public class Command2 { - private List students; - private List teachers; - private List courses; - - public Command2(List students, List courses, List teachers) { - this.students = students; - this.courses = courses; - this.teachers = teachers; - } - - public void executeCommand(String wholeCommand){ - String[] commandPart = wholeCommand.split(" "); - String command = commandPart[0]; - switch (command){ - case "ENROLL": - enrollStudent(commandPart[0],commandPart[1]); - break; - case "ASSIGN": - assignTeacher(commandPart[0], commandPart[1]); - break; - case "SHOW": - handleShow(commandPart); - break; - case "LOOKUP": - handleLookUp(commandPart); - break; - default: - System.out.println("Can't recognize command"); - - } - } - - public Student findStudentById(String student_id){ - Student student = null; - for(Student s: students){ - if(s.getStudentId().equals(student_id)){ - student = s; - return student; - } - } - return null; - } - - public Course findCourseById(String course_id){ - Course course = null; - for(Course c: courses){ - if(c.getCourseId().equals(course_id)){ - course = c; - break; - } - } - return null; - } - - - public Teacher findTeacherById(String teacher_id){ - Teacher teacher = null; - for(Teacher t: teachers){ - if(t.getTeacherId().equals(teacher_id)){ - teacher = t; - return teacher; - } - } - return null; - } - private void enrollStudent(String student_id, String course_id) { - Student student = findStudentById(student_id); - Course course = findCourseById(course_id); - - if (student != null && course!= null) { - student.setCourse(course); - } else { - System.out.println("Couldn't assign the course"); - } - - assert course != null; - updateMoneyEarned(course); - } - - - public void assignTeacher(String teacher_id, String course_id){ - Teacher teacher = findTeacherById(teacher_id); - Course course = findCourseById(course_id); - - if (teacher != null && course!=null){ - teacher.setCourse(course); - }else { - System.out.println("Couldn't assign the course"); - } - } - - private void updateMoneyEarned(Course course){ - double total = course.getMoney_earned() + course.getPrice(); - course.setMoney_earned(total); - } - - private void handleShow(String[] command) { - switch (command[0]){ - case "COURSES": - showCourses(); - break; - case "STUDENTS": - - break; - case "TEACHERS": - - break; - case "PROFIT": - - break; - } - } - - private void showCourses() { - for (Course course: courses){ - System.out.println(course.toString()); - } - - } - -//----------- comienzo lookup - - private void handleLookUp(String[] command) { - switch (command[0]){ - case "COURSES": - lookUpCourse(); - break; - case "STUDENTS": - - break; - case "TEACHERS": - - break; - - } - } - private void lookUpCourse() { - - - } - -} \ No newline at end of file diff --git a/homework-java/src/main/java/com/example/CommandHandler.java b/homework-java/src/main/java/com/example/CommandHandler.java index 01bb1f96..ecba2cd4 100644 --- a/homework-java/src/main/java/com/example/CommandHandler.java +++ b/homework-java/src/main/java/com/example/CommandHandler.java @@ -20,19 +20,20 @@ public void executeCommand(String wholeCommand){ enrollStudent(commandPart[0],commandPart[1]); break; case "ASSIGN": - + assignTeacher(commandPart[0], commandPart[1]); break; case "SHOW": handleShow(commandPart); break; case "LOOKUP": - + handleLookUp(commandPart); break; default: System.out.println("Can't recognize command"); } } +// buscadores de ID public Student findStudentById(String student_id){ Student student = null; @@ -56,6 +57,18 @@ public Course findCourseById(String course_id){ return null; } + public Teacher findTeacherById(String teacher_id){ + Teacher teacher = null; + for(Teacher t: teachers){ + if(t.getTeacherId().equals(teacher_id)){ + teacher = t; + return teacher; + } + } + return null; + } + + private void enrollStudent(String student_id, String course_id) { Student student = findStudentById(student_id); Course course = findCourseById(course_id); @@ -69,6 +82,18 @@ private void enrollStudent(String student_id, String course_id) { updateMoneyEarned(course); } + public void assignTeacher(String teacher_id, String course_id){ + Teacher teacher = findTeacherById(teacher_id); + Course course = findCourseById(course_id); + + if (teacher != null && course!=null){ + teacher.setCourse(course); + }else { + System.out.println("Couldn't assign the course"); + } + } + + private void updateMoneyEarned(Course course){ double total = course.getMoney_earned() + course.getPrice(); course.setMoney_earned(total); @@ -80,13 +105,13 @@ private void handleShow(String[] command) { showCourses(); break; case "STUDENTS": - + showStudents(); break; case "TEACHERS": - + showTeachers(); break; case "PROFIT": - + showProfits(); break; } } @@ -95,7 +120,71 @@ private void showCourses() { for (Course course: courses){ System.out.println(course.toString()); } + } + + private void showStudents() { + for (Student student: students){ + System.out.println(student.toString()); + } + } + + private void showTeachers() { + for (Teacher teacher: teachers){ + System.out.println(teacher.toString()); + } + } + + private void showProfits() { + double totalEarned = courses.stream().mapToDouble(courses ->courses.getMoney_earned()).sum(); + double totalSalaries = teachers.stream().mapToDouble(teachers -> teachers.getSalary()).sum(); + + System.out.println("Profits are: " + (totalEarned-totalSalaries)); + } + + + + private void handleLookUp(String[] command) { + String id = command[1]; + switch (command[0]){ + case "COURSE": + lookUpCourse(id); + break; + case "STUDENT": + lookUpStudent(id); + break; + case "TEACHER": + lookUpTeacher(id); + break; + default: + System.out.println("Can't recognize command"); + } } + private void lookUpCourse(String id) { + Course course = findCourseById(id); + if(course != null){ + System.out.println(id); + }else { + System.out.println("Course not found."); + } + + + } + private void lookUpStudent(String id) { + Student student = findStudentById(id); + if(student != null){ + System.out.println(id); + }else { + System.out.println("Student not found."); + } + } + private void lookUpTeacher(String id) { + Teacher teacher = findTeacherById(id); + if (teacher!=null){ + System.out.println(id); + }else { + System.out.println("Teacher not found"); + } + } } diff --git a/homework-java/src/main/java/com/example/Teacher.java b/homework-java/src/main/java/com/example/Teacher.java index 249efca7..25eac837 100644 --- a/homework-java/src/main/java/com/example/Teacher.java +++ b/homework-java/src/main/java/com/example/Teacher.java @@ -40,4 +40,7 @@ public void setSalary(double salary) { public String toString() { return "Name: " + name + ", teacherId: " + teacherId + ", Salary: $" + salary; } + + public void setCourse(Course course) { + } } From 50c4e432b0e4b06bd47e7fd840bb3cf7754eba89 Mon Sep 17 00:00:00 2001 From: Francisco Ismael Farrando <121203370+franciscofarrando@users.noreply.github.com> Date: Tue, 15 Apr 2025 18:51:59 +0200 Subject: [PATCH 19/36] command fixed --- .../src/main/java/com/example/CommandHandler.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/homework-java/src/main/java/com/example/CommandHandler.java b/homework-java/src/main/java/com/example/CommandHandler.java index ecba2cd4..b7bc460b 100644 --- a/homework-java/src/main/java/com/example/CommandHandler.java +++ b/homework-java/src/main/java/com/example/CommandHandler.java @@ -17,10 +17,10 @@ public void executeCommand(String wholeCommand){ String command = commandPart[0]; switch (command){ case "ENROLL": - enrollStudent(commandPart[0],commandPart[1]); + enrollStudent(commandPart[1],commandPart[2]); break; case "ASSIGN": - assignTeacher(commandPart[0], commandPart[1]); + assignTeacher(commandPart[1], commandPart[2]); break; case "SHOW": handleShow(commandPart); @@ -144,8 +144,9 @@ private void showProfits() { private void handleLookUp(String[] command) { - String id = command[1]; - switch (command[0]){ + String type = command[1]; + String id = command[2]; + switch (type){ case "COURSE": lookUpCourse(id); break; From a86e19fa5f56b1b4b342a887a8f3f2b9a130f619 Mon Sep 17 00:00:00 2001 From: Irenevn16 Date: Mon, 21 Apr 2025 14:46:17 +0200 Subject: [PATCH 20/36] guardando --- .../src/main/java/com/example/Menu.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/homework-java/src/main/java/com/example/Menu.java b/homework-java/src/main/java/com/example/Menu.java index 326e2038..b5bdb26e 100644 --- a/homework-java/src/main/java/com/example/Menu.java +++ b/homework-java/src/main/java/com/example/Menu.java @@ -54,7 +54,7 @@ public static void main(String[] args) { } System.out.println(numberOfCourses + "courses created for " + schoolName); - System.out.println("Let's create the students. How wany should be created? Please enter a number."); + System.out.println("Let's create the students. How many should be created? Please enter a number."); int numberOfStudents = Integer.parseInt(myScanner.nextLine()); for (int i = 1; i < numberOfStudents; i++) { @@ -84,49 +84,49 @@ public static void main(String[] args) { String[] parts = input.split(" "); if (parts[0].equalsIgnoreCase("ENROLL") && parts.length == 3) { - // school.enrollStudent(parts[1], parts[2]); + commandHandler.enrollStudent(parts[1], parts[2]); } else if (parts[0].equalsIgnoreCase("ENROLL")) { System.out.println("ENROLL command needs to follow this format: ENROLL [STUDENT_ID] [COURSE_ID]"); } if (parts[0].equalsIgnoreCase("ASSIGN") && parts.length == 3) { - // school.enrollStudent(parts[1], parts[2]); + // commandHandler.??(parts[1], parts[2]); } else if (parts[0].equalsIgnoreCase("ASSIGN")) { System.out.println("ENROLL command needs to follow this format: [TEACHER_ID] [COURSE_ID]"); } if (parts[0].equalsIgnoreCase("SHOW") && parts.length == 2 && parts[1].equalsIgnoreCase("COURSES")) { - // school.enrollStudent(parts[1], parts[2]); + commandHandler.handleShow(); } if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("COURSE") && parts.length == 3) { - // school.enrollStudent(parts[1], parts[2]); + commandHandler.findCourseById(parts[2]); } else if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("COURSE")) { System.out.println("LOOKUP COURSE command needs to follow this format: LOOKUP COURSE [COURSE_ID]"); } if (parts[0].equalsIgnoreCase("SHOW") && parts.length == 2 && parts[1].equalsIgnoreCase("STUDENTS")) { - // school.enrollStudent(parts[1], parts[2]); + // commandHandler.enrollStudent(); } if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("STUDENT") && parts.length == 3) { - // school.enrollStudent(parts[1], parts[2]); + commandHandler.findStudentById(parts[2]); } else if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("STUDENT")) { System.out.println("LOOKUP STUDENT command needs to follow this format: LOOKUP STUDENT [STUDENT_ID]"); } if (parts[0].equalsIgnoreCase("SHOW") && parts.length == 2 && parts[1].equalsIgnoreCase("TEACHERS")) { - // school.enrollStudent(parts[1], parts[2]); + //commandHandler.enrollStudent(); } if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("TEACHER") && parts.length == 3) { - // school.enrollStudent(parts[1], parts[2]); + //commandHandler.enrollStudent(parts[2]); } else if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("TEACHER")) { System.out.println("LOOKUP TEACHER command needs to follow this format: LOOKUP TEACHER [TEACHER_ID]"); } if (parts[0].equalsIgnoreCase("SHOW") && parts.length == 2 && parts[1].equalsIgnoreCase("PROFIT")) { - // school.enrollStudent(parts[1], parts[2]); + //commandHandler.enrollStudent(); } System.out.println("Do you want to perform another action? (yes/no)"); String response = myScanner.nextLine().trim().toLowerCase(); From 05ccd0917969703f8d7cf60eff71678d047697b5 Mon Sep 17 00:00:00 2001 From: Irenevn16 Date: Mon, 21 Apr 2025 15:24:34 +0200 Subject: [PATCH 21/36] cambios menu --- homework-java/src/main/java/com/example/Menu.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/homework-java/src/main/java/com/example/Menu.java b/homework-java/src/main/java/com/example/Menu.java index b5bdb26e..03336945 100644 --- a/homework-java/src/main/java/com/example/Menu.java +++ b/homework-java/src/main/java/com/example/Menu.java @@ -81,7 +81,11 @@ public static void main(String[] args) { while (continueRunning) { System.out.println("Enter a command from the next list: \n ENROLL [STUDENT_ID] [COURSE_ID] \n ASSIGN [TEACHER_ID] [COURSE_ID] \n SHOW COURSES \n LOOKUP COURSE [COURSE_ID] \n SHOW STUDENTS \n LOOKUP STUDENT [STUDENT_ID] \n SHOW TEACHERS \n LOOKUP TEACHER [TEACHER_ID] \n SHOW PROFIT "); var input = myScanner.nextLine(); - String[] parts = input.split(" "); + + commandHandler.executeCommand(input); + + + /*String[] parts = input.split(" "); if (parts[0].equalsIgnoreCase("ENROLL") && parts.length == 3) { commandHandler.enrollStudent(parts[1], parts[2]); @@ -128,6 +132,8 @@ public static void main(String[] args) { if (parts[0].equalsIgnoreCase("SHOW") && parts.length == 2 && parts[1].equalsIgnoreCase("PROFIT")) { //commandHandler.enrollStudent(); } + + */ System.out.println("Do you want to perform another action? (yes/no)"); String response = myScanner.nextLine().trim().toLowerCase(); if (!response.equals("yes")) { From b50621793fe82d8f544103e88067d0bc23df90bd Mon Sep 17 00:00:00 2001 From: Irenevn16 Date: Mon, 21 Apr 2025 15:27:29 +0200 Subject: [PATCH 22/36] merge --- homework-java/src/main/java/com/example/Menu.java | 1 + 1 file changed, 1 insertion(+) diff --git a/homework-java/src/main/java/com/example/Menu.java b/homework-java/src/main/java/com/example/Menu.java index 03336945..fc8cce32 100644 --- a/homework-java/src/main/java/com/example/Menu.java +++ b/homework-java/src/main/java/com/example/Menu.java @@ -82,6 +82,7 @@ public static void main(String[] args) { System.out.println("Enter a command from the next list: \n ENROLL [STUDENT_ID] [COURSE_ID] \n ASSIGN [TEACHER_ID] [COURSE_ID] \n SHOW COURSES \n LOOKUP COURSE [COURSE_ID] \n SHOW STUDENTS \n LOOKUP STUDENT [STUDENT_ID] \n SHOW TEACHERS \n LOOKUP TEACHER [TEACHER_ID] \n SHOW PROFIT "); var input = myScanner.nextLine(); + CommandHandler commandHandler = null; commandHandler.executeCommand(input); From 06357d3dcd5199968a1dd1282bd2afd5538d88aa Mon Sep 17 00:00:00 2001 From: Gab Caser Date: Mon, 21 Apr 2025 15:29:36 +0200 Subject: [PATCH 23/36] command handler --- .../main/java/com/example/CommandHandler.java | 67 +++++++++++++++---- 1 file changed, 55 insertions(+), 12 deletions(-) diff --git a/homework-java/src/main/java/com/example/CommandHandler.java b/homework-java/src/main/java/com/example/CommandHandler.java index 01bb1f96..deb91db4 100644 --- a/homework-java/src/main/java/com/example/CommandHandler.java +++ b/homework-java/src/main/java/com/example/CommandHandler.java @@ -17,7 +17,7 @@ public void executeCommand(String wholeCommand){ String command = commandPart[0]; switch (command){ case "ENROLL": - enrollStudent(commandPart[0],commandPart[1]); + enrollStudent(commandPart[1],commandPart[2]); break; case "ASSIGN": @@ -26,7 +26,7 @@ public void executeCommand(String wholeCommand){ handleShow(commandPart); break; case "LOOKUP": - + lookUp(commandPart); break; default: System.out.println("Can't recognize command"); @@ -56,17 +56,40 @@ public Course findCourseById(String course_id){ return null; } + public Teacher findTeacherById(String teacher_id){ + Teacher teacher = null; + for(Teacher t: teachers){ + if(t.getTeacherId().equals(teacher_id)){ + teacher = t; + return teacher; + } + } + return null; + } + + private void lookUp(String[] commandPart) { + switch (commandPart[1]){ + case "COURSE": + break; + case "STUDENT": + break; + case "TEACHER": + System.out.println(findTeacherById(commandPart[2]).toString()); + } + + } + private void enrollStudent(String student_id, String course_id) { Student student = findStudentById(student_id); Course course = findCourseById(course_id); if (student != null && course!= null) { student.setCourse(course); + updateMoneyEarned(course); } else { System.out.println("Couldn't assign the course"); } - assert course != null; - updateMoneyEarned(course); + } private void updateMoneyEarned(Course course){ @@ -78,24 +101,44 @@ private void handleShow(String[] command) { switch (command[0]){ case "COURSES": showCourses(); - break; case "STUDENTS": - - break; + showStudents(); case "TEACHERS": - - break; + showTeachers(); case "PROFIT": + showProfit(); + default: + System.out.println( "Can't recognize command"); + } + } - break; + private void showStudents() { + StringBuilder studentsString = new StringBuilder(); + for (Student student: students){ + studentsString.append(student.toString()).append("\n"); } + System.out.println(studentsString); + } + + private void showTeachers() { + StringBuilder teachersString = new StringBuilder(); + for (Teacher teacher: teachers){ + teachersString.append(teacher.toString()).append("\n"); + } + System.out.println(teachersString); + } + + private void showProfit() { + } private void showCourses() { + StringBuilder coursesString = new StringBuilder(); for (Course course: courses){ - System.out.println(course.toString()); + coursesString.append(course.toString()).append("\n"); } - + System.out.println(coursesString); } + } From 6f24c67d7f8d6bb38af8a6b8409087f721cac621 Mon Sep 17 00:00:00 2001 From: Irenevn16 Date: Mon, 21 Apr 2025 15:50:56 +0200 Subject: [PATCH 24/36] saving --- .../src/main/java/com/example/Menu.java | 2 +- .../target/classes/com/example/Menu.class | Bin 2379 -> 0 bytes .../target/classes/com/example/School.class | Bin 2053 -> 1625 bytes .../target/classes/com/example/Student.class | Bin 2293 -> 2771 bytes .../target/classes/com/example/Teacher.class | Bin 1082 -> 2235 bytes 5 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 homework-java/target/classes/com/example/Menu.class diff --git a/homework-java/src/main/java/com/example/Menu.java b/homework-java/src/main/java/com/example/Menu.java index fc8cce32..18293dfe 100644 --- a/homework-java/src/main/java/com/example/Menu.java +++ b/homework-java/src/main/java/com/example/Menu.java @@ -82,7 +82,7 @@ public static void main(String[] args) { System.out.println("Enter a command from the next list: \n ENROLL [STUDENT_ID] [COURSE_ID] \n ASSIGN [TEACHER_ID] [COURSE_ID] \n SHOW COURSES \n LOOKUP COURSE [COURSE_ID] \n SHOW STUDENTS \n LOOKUP STUDENT [STUDENT_ID] \n SHOW TEACHERS \n LOOKUP TEACHER [TEACHER_ID] \n SHOW PROFIT "); var input = myScanner.nextLine(); - CommandHandler commandHandler = null; + CommandHandler commandHandler; commandHandler.executeCommand(input); diff --git a/homework-java/target/classes/com/example/Menu.class b/homework-java/target/classes/com/example/Menu.class deleted file mode 100644 index 7d58a3190b07d486d7099758b7d1e509765eadd2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2379 zcmaJ?%W@M(6g_Rp9!ZvY$oK^T2FHK}#twNn!G`d#A&A(9M8@Da586`O8a$d&W=7b` zdyy5DRkF!4l?_$NDlBjcs`3H(qEr?kr)S1kE-P86N8Nqzx%Zwvef!UUp8f&gGQP>6 z4G9CuEZWf_uaXmArDAQ5vreCVKu03I9 zFo1&w4rTEY4hwW|<<|r$VAON~TNeMlrT^a$!CNQnRW&W?Yk=uQ>gW@(MW!oYe`vsx1mFib~;i z>ST^2Pnao;6SF97=`}RJZ{eJQi7X~@eupro-TJakmO8`mTeFq~PaB~8x|>OxSF%)5 zUIrI%NwaoYptl7h)B11*F_pzMt_oyixg2|jQfq<8$>QIz{%mlZf0B3 z@UFnn)mU=`uS%zEu6S-W*4;*6+Lj+omTj;ZVTjvR3}k6-R@TDm4cs$O*`c^7e*zWVx>r)yEG@sZ=3`VBN!u%~8~A}I zYqKh-xMe>Db}nnqT^}*mb>C2B(|6fP;*$Nar8I~Z_Y+f$n%CWRb6q-(Z6m+p*6p&n ztjrSoU7*Sr&8ReP8(oz7ROR ztEN_|8u&`!$p4#C;!#~Vh8cDPumiSX4mbI)jsN*na=gXa7{7ww_EVb>zlGcHan#%3 ztMER@Y-E5U<~d8_HWs)-XYr6g8Ls{M494PPq&Io7A0wCReS-eePjF=R83q?eHZe5E z)sd$-0mM7M1emm(eu}nhy@dIPr<@p@L!|<#U%%hGnJ(5tg zJ%q$_f^-;IF<=;2H83c6PJiQW7mKoJ(uVt3o+WExG=Z5VHl zPHZa>NbNYT6YL7ai>1Rf#*o&K(UFBNFlDt{hW*)WeQerB%{p$kn*s^fY}x#++S959 zp5rzu8YTp$Rk{;6O=HjV%r8~P4>A}>Txws_F@s>)hOt14IjtGTa6P=$Sfk&~rE`n=z+lWnr&W&F%%i4qzHOP!L(_9)93>OMu|qfWedOVl5j#UGqA>*KihV`h@nlaex)<6uv_>G? zu!HCX+f5Zq17osT=~8mEpJ{@HUI-NWxgv`sRw}&l!SSLBjz_34AXD**_R%SMo6?r( z&Mw)~y-Q_F^cfD?(ya+?i6SCgq zy=~!}YP8CA9x1L_!stlzIp;Bf1x%uh9M<^DY$%N)N{rYgS3&?%_U_1U6u>R*qz-7)VORuS~=sVN*;4GfGBR`(z}u zsA?WC_YjY`N|B3Lg%McG#9A4F^%$E}64)AwRT#ut9f|dXBHMU61S>xRYm-=8Be0&~ Wxx%Up#mWz2ZI8s-q09^A+wMPBHA!^< literal 2053 zcmaJ?+jiSj5Z%XiqS#R`xJlDAZBS{N*ba@kU+NHO+=d#Q3phA5<uEJLSLk#(afH`XGWtx{yF{~z)kF>5JOx;LPsC^ z8AkW`0ngjq+0C!->(3he?UT%xf$3s}l&2NxSNooae6b6uCFxFh7 zt;MMG17Yk4;TS|m)Qm$R7gES!Uc>V`u4AEHon9oO)l|5)^Mr(`tl4Usn)!l`7x5Cq zM1${(qU)GkZdtNUCtq?$QYB}*<+o$IDiWDgJzmlADqf>r`qtOfOKN>dncvXyCT`I4 zu28ZwrEFJtRL~R_@s@@q9dF~E-l7FlKxz)S-4g3xJi(~lkS@rGQ5p=(N?ws+E>k+~ z&`l$XVMtc2U5Cq-M*`-;n3Ew|EO$@tW;kqxr2Qnnni)@tks zZ80*O!ele6ZMe`7mV7QR!acYyxR;hB)D5;Se~nG@lZEPKlM|JBg_y8C4Zk68??#4uEm+}vN~%}8CULUl34ily`qhO!pa zH%R?oc3tU9k2hC^th+UT0Qbn6GTNvHmj=5rfKN%Dag`a@4K~t`&r`S$u3<;D-DH^Q zEECH)aQA851k)4_`U*Ft>(N*HZTE;rj$z(A+^N~ZpDDZUeydqHJwsiVp1{q+rZ~g> zUYGwFlN&)4xouZ0DX8pv$#H~Nw7F0FN&`**wNskTqN<_JF#U8_+R~veT%qL{qiqnU zE3Ifc#neWn59n5KzD>`xIZvKfkf3uP7U=pedDMbPz{ouY%gsN6mirAucOPTq5k@=5 zu^$4oJ9Iry(V$!j%9f-(K86w6rK2bX?-UmU@8NyAtCQkHGlVi$>8di`B1Xzf&;5+i z`6Eoku+>3V|0j@wLE_v&)K3s~tYJMs+`tFqs}S?SGtj3HACe&kMYNyHz<2- B>|6i< diff --git a/homework-java/target/classes/com/example/Student.class b/homework-java/target/classes/com/example/Student.class index 2c119bc57959f19c123a4b627c672375cff603cf..e16e87eaf69baa0c40ecb98ee419c407ed722990 100644 GIT binary patch delta 940 zcmaKq%TE(g6vn^Pp)*5m0;N_2r93Q;@~}#xi8Pu3!C2CQQWVjM4DAR*+nG8u5Lq=Q z?p)rDG2xF;qDD;Exp8Y;yYdfk;nK&MX%o7U#mwA$&Ue52`|h1zk*~4Pmp_L`0H)!* z3AIs8K`)_wTiexAJFZbqEoo-as)P`SF$NaKaMR6a)!2MiE0^C^OB`RKWWx}tl;(>T44+bwIh)MBN>6Ff+N1Rg6 ziPK7iu6P=eQ$u1-i3hK-X3EounxfJp-+P}`*F6=jiO delta 473 zcmY+9OD{uF6ouEmSM}VhLEE$?L96toni7de3=k5J*0ZV}@o3USDzr({8Zt66b7p>p zMD);v{=vz zAEA0Hy_=4firMXGGC4j%&OgM6r;~ZJr;}sG=&_ z%u&VDd0SD{1ToE_~T~?g|84%aQyl5eeY6`3ZF2gBF@zb6W1nI9%D@> zynJiHq~RH_VG7d*@5T&jL6~JFK<`k^=wm$x3)h%@)@o$6uu?#JghNeWUfv43jBzJy zbdp$*CE+tg`Ogk{s=2fVH1Z@NCGRzdd}Ok#Owyu!7XecbbG>Cw4rqdw3}#icQoq40 z%L6T78enFS88@x4@2BCiC*OoFU3zEtC^U@0jtSHu_9s*QPbQ$A-QP?q$j-r5<(}SN MW#+ZkIH-d4FRMyd8UO$Q diff --git a/homework-java/target/classes/com/example/Teacher.class b/homework-java/target/classes/com/example/Teacher.class index d8e22555279bcd43de2a7129520eccd867be5d8d..9b08f4139dcf05e3e6fa1c04748ceaa83338c328 100644 GIT binary patch literal 2235 zcmaJ?=~5d<5dKCIS|L^(!hpd?Ajq+_5X%sp0}&h>LQo=bVqu8w93ECvutwS?+L6ot zpNB}LD$kG;T)|a&fV@W@BS+8dg4Q6XC}w9y-Ti(2b@%R{{~Y}R;1)z0F~kidOmrd1 z(Epe};l(<4cZzqm9}8PDBo`dlk&6uRd|@+<6uJ$hP4vKI7__}cQ9R|1{kkY_2yX9+ zCd0^%a7B|#anE(WX^HT@Tw^$wFI3tHRoQghol-Z&>^0Gceui!t1X0G>v!)6@Yhn=R z7z|&?b>0vRL;16o0o7p>BREfC$+pVty!nhFkzX!s8W=lHwk4f<@h*33UL%cB#MN@i z#AUoj7_N9K%Py&q$d?P{ENM1j;&n_?k`2BmmOR(ya?6pswDTo*rLX9eUyCtwR<4n4U%*^*s0vx?K>?P5DHGFplOdzUI{uX*WqYpVj;m23Ne8tm6&@)6qKWIu zInHY}rR}VVx0JRCm()@hH%z>Zcc`*{C<$B6g5f=t**rZv$Qi*3tG3)BM*|BC18vT$ z+~1|F(kLNLMW{MEE|;w)m2C3mycf>KUo0^UcVI%rqg0l>8b#@=IIdW4HMT`_gKyXA zCR_1rUf<+RN1emVgxqzMVwDcvN+?NJM_^!OhL}U0mu%{GIBCI1i;#V$D!IM4#`nYU z=8lk&9yjP1^kp~gj=PSAXPN3Jy+A(NF4*;Ou+mkp)wIQmqcSkVP}h`<)T6gOPx`XS z_t%8n^=f_!lz*(sQuv%v+41ZxzVQpb$&d@`jU8%#zTBz;7e8CuNZRe33S{i z-kvB1oPuUv;kNYDoO~A*KQs(Dtdcr);pZxzx7XS)ovmHu<|W6CXZxaq`NN3)aVJNv z!VpWmUavY*PzB7gOD~wEI`@6y8z7mkoXM#ZRRcD|<^MOO>IZpYf<`4q6Q7`!UQV=& zsX@|DnjdsY47{`9lo-tetMt zI!sO==Y)Ex(%%3wbk~a|x*ew=6avfmke+I%C@{TKBw`ve8A9IFXAn#TvJKR$gY^+m zzlKo&rVf?~0b-g$!2bsdrufgk!07$wxUe=o5dZcN7yE0E7B3wUGgN*-Zt8dBWBC5x zzk>a>7`CQGO6nq=lqOx)Z^$V0m_}E!fQYv9>H+3X6S+=AW?n%=wULtV(-TD&s49v`mgJmKlG6X&5#9w(%X1^b zDjO!3!e>?N1`WN}ZgTlkvp)L=cr IHfk9C4=x_OyZ`_I literal 1082 zcmZ`&U2hUW6g|VoF3>3;v{c(FwXJqpw5z^inlv^hO-Oy9ZPLd9Hgub1*DQ|3(0XW910#Znu$Z%v~FqCh^2jTc47&z~`H*POx zFkX9s7auXCt;S^mIpj?gI99+Js=aXNxF5yvz3)2buIOF65ra8$<1;aI8P=`#qG2bF zykO8uniM%oC^O`#wj+EIePYO1C-P$jRTFC*>!>jl6@DChzH@PLdcshMM9>e1$);j8 z5`uX_OXBZyJisPHE)Ek?hP7Fx@}{Na$;~#$Lp&lOaU%b;&rtbSwJhD?cq~gZ0hyBr zdmQ_CLJ^I$14aUCOFWY=g1rg*lu4=W1@75+*ma|G(e>%1(hhsVzZ8)t_xdmsUwb1; zu)QSW76Tu+u?}1+Hfftgo~P9;P`WXhSSK7uJ@>6Axwr-$%3R4#j_w~w(?}`MDkUwd znVivVg3+Jxl*R+vT~TF*=92v#%x+F$+SU}SUlqWjv7$Z~Xk0-a97U|6LFYRJBp7To zX_hNV!_-O=r4)^!X^z!?M)L#rrr4NZYe7>~?TSQGB8sx2;JRHx!SD>5x}8I_q{`ag zu=Rx&DM+o74XEA%XSF_t=S#u$yWowbV0s#w`G}}wzJ}eLpuW&AUmdVT$!@C-wWMku zkD=pXID}L$vv;Uw=3@6V9o%+NUn+!N*jz|jMP}Fs6YSm Date: Mon, 21 Apr 2025 16:45:45 +0200 Subject: [PATCH 25/36] solucionado el merge --- .../main/java/com/example/CommandHandler.java | 85 ++++++++---------- .../src/main/java/com/example/Menu.java | 32 +++---- .../classes/com/example/CommandHandler.class | Bin 3942 -> 7560 bytes .../target/classes/com/example/Course.class | Bin 1954 -> 2935 bytes .../target/classes/com/example/Teacher.class | Bin 2235 -> 2372 bytes 5 files changed, 52 insertions(+), 65 deletions(-) diff --git a/homework-java/src/main/java/com/example/CommandHandler.java b/homework-java/src/main/java/com/example/CommandHandler.java index d4b5c63e..87d9b4b4 100644 --- a/homework-java/src/main/java/com/example/CommandHandler.java +++ b/homework-java/src/main/java/com/example/CommandHandler.java @@ -2,7 +2,7 @@ import java.util.*; public class CommandHandler { - private List students; + private static List students; private List teachers; private List courses; @@ -15,14 +15,15 @@ public CommandHandler(List students, List courses, Listcourses.getMoney_earned()).sum(); @@ -210,26 +196,27 @@ private void lookUpCourse(String id) { }else { System.out.println("Course not found."); } - System.out.println(coursesString); + System.out.println(course); } + +private void lookUpStudent(String id) { + Student student = CommandHandler.findStudentById(id); + + if(student != null){ + System.out.println(id); + }else { + System.out.println("Student not found."); } - private void lookUpStudent(String id) { - Student student = findStudentById(id); - if(student != null){ - System.out.println(id); - }else { - System.out.println("Student not found."); - } - } - private void lookUpTeacher(String id) { - Teacher teacher = findTeacherById(id); - if (teacher!=null){ - System.out.println(id); - }else { - System.out.println("Teacher not found"); - } +} +private void lookUpTeacher(String id) { + Teacher teacher = findTeacherById(id); + if (teacher!=null){ + System.out.println(id); + }else { + System.out.println("Teacher not found"); } } +} diff --git a/homework-java/src/main/java/com/example/Menu.java b/homework-java/src/main/java/com/example/Menu.java index 18293dfe..95543bc6 100644 --- a/homework-java/src/main/java/com/example/Menu.java +++ b/homework-java/src/main/java/com/example/Menu.java @@ -7,7 +7,7 @@ public class Menu { private School school; - public static void main(String[] args) { + public void main(String[] args) { Scanner myScanner = new Scanner(System.in); @@ -19,8 +19,8 @@ public static void main(String[] args) { System.out.println("Now, we need some teachers for your school " + schoolName + ". How wany teachers should be created? Please enter a number."); int numberOfTeachers = Integer.parseInt(myScanner.nextLine()); - for (int i = 1; i < numberOfTeachers; i++) { - System.out.println("\nEnter the details for teacher " + i); + for (int i = 0; i < numberOfTeachers; i++) { + System.out.println("\nEnter the details for teacher " + (i+1)); System.out.println("Name: "); String name = myScanner.nextLine(); @@ -38,8 +38,8 @@ public static void main(String[] args) { System.out.println("Now, we need some courses. How wany should be created? Please enter a number."); int numberOfCourses = Integer.parseInt(myScanner.nextLine()); - for (int i = 1; i < numberOfCourses; i++) { - System.out.println("\nEnter the details for course " + i); + for (int i = 0; i < numberOfCourses; i++) { + System.out.println("\nEnter the details for course " + (i+1)); System.out.println("Name: "); String name = myScanner.nextLine(); @@ -57,8 +57,8 @@ public static void main(String[] args) { System.out.println("Let's create the students. How many should be created? Please enter a number."); int numberOfStudents = Integer.parseInt(myScanner.nextLine()); - for (int i = 1; i < numberOfStudents; i++) { - System.out.println("\nEnter the details for student " + i); + for (int i = 0; i < numberOfStudents; i++) { + System.out.println("\nEnter the details for student " + (i+1)); System.out.println("Name: "); String name = myScanner.nextLine(); @@ -72,7 +72,7 @@ public static void main(String[] args) { Student student = new Student(name, address, email); school.addStudent(student); - System.out.println("Student " + i + " added."); + System.out.println("Student " + (i+1) + " added."); } System.out.println(numberOfStudents + "students created for " + schoolName); @@ -82,14 +82,14 @@ public static void main(String[] args) { System.out.println("Enter a command from the next list: \n ENROLL [STUDENT_ID] [COURSE_ID] \n ASSIGN [TEACHER_ID] [COURSE_ID] \n SHOW COURSES \n LOOKUP COURSE [COURSE_ID] \n SHOW STUDENTS \n LOOKUP STUDENT [STUDENT_ID] \n SHOW TEACHERS \n LOOKUP TEACHER [TEACHER_ID] \n SHOW PROFIT "); var input = myScanner.nextLine(); - CommandHandler commandHandler; + CommandHandler commandHandler = new CommandHandler (school.getStudents(), school.getCourses(), school.getTeachers()); commandHandler.executeCommand(input); + /* - - /*String[] parts = input.split(" "); + String[] parts = input.split(" "); if (parts[0].equalsIgnoreCase("ENROLL") && parts.length == 3) { - commandHandler.enrollStudent(parts[1], parts[2]); + CommandHandler.enrollStudent(parts[1], parts[2]); } else if (parts[0].equalsIgnoreCase("ENROLL")) { System.out.println("ENROLL command needs to follow this format: ENROLL [STUDENT_ID] [COURSE_ID]"); } @@ -101,7 +101,7 @@ public static void main(String[] args) { } if (parts[0].equalsIgnoreCase("SHOW") && parts.length == 2 && parts[1].equalsIgnoreCase("COURSES")) { - commandHandler.handleShow(); + CommandHandler.handleShow(); } if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("COURSE") && parts.length == 3) { @@ -111,7 +111,7 @@ public static void main(String[] args) { } if (parts[0].equalsIgnoreCase("SHOW") && parts.length == 2 && parts[1].equalsIgnoreCase("STUDENTS")) { - // commandHandler.enrollStudent(); + CommandHandler.showStudents(); } if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("STUDENT") && parts.length == 3) { @@ -132,9 +132,9 @@ public static void main(String[] args) { if (parts[0].equalsIgnoreCase("SHOW") && parts.length == 2 && parts[1].equalsIgnoreCase("PROFIT")) { //commandHandler.enrollStudent(); - } + } */ + - */ System.out.println("Do you want to perform another action? (yes/no)"); String response = myScanner.nextLine().trim().toLowerCase(); if (!response.equals("yes")) { diff --git a/homework-java/target/classes/com/example/CommandHandler.class b/homework-java/target/classes/com/example/CommandHandler.class index cd03ae83448c931385c8f2bb1efb116aff5d8fd9..8d582042721cafe35facb6bcc71c475cfc640d52 100644 GIT binary patch literal 7560 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 U#YzaVM8wGv;ai(%7i&@XF9z=_PXGV_ literal 3942 zcmai1TXYlG72P9^JhC)?AR7l0Fopt_Wf_Ap4z-AbW1C>`3uNpD(vm@**dnszNaOHm z+Vq*Gk2Gx(XhWMcB`s=R4I#lS+O-;1Khm}G*Z%gi{qJX2vr6eccl59b30~`J=G-~= z+E#^z43)l%3V!&pAu8cG}6&?5MK4cohV$Sh@Zc24G2nFz_8-?6R4yq(SY(WpUd4WJ447+7PX8EY$G#+__3 zJ*UB!TTCShw=L}MrF?Kd#@dg4dQL2^GqD~m+-=^<%@1Z~ZRO;MAFXtIc>M6h=%}b| zGVuj$=9K-!l9i%6t5@#f@)T=7>c>{<48-Fj4~_c~)}Y7tPt5oc;q2(d#K9wz0eToU z(TQyuYV342lS;*1j_!>6)2Q30#m06MJJ78mFt50d&u30)XbRuKONm$yb{Xh3aUXV9 zGIu8D*b8(yvqaujyPG95U6Ul#A#=915c8u?!##smy3J|L+KJ3uI(gP^Wz;3o0qnv3 z2Kr4rfV~6 zZmrDmLbw7rgeen8Fs;Fyv&ojq^pRN&m4*s#8u$`{tu!>Kaz20=95r!F>;!4YogE>w zetg-)S8!ZI-DAo0Y+-{3&&U?-E7Pw?uIE0+X*{Ge6r| zCz(m-hLSn!M9QXz+ED`;4Qo^=RYV4gTEp3FCL2H+UU4pKA}6p`EiKMkjy;x1+h>NY zY}zJ;Ggvb5Bv=}Cq*i@8ZmVx93x-7FjES?N;im@kK4Ht`QzpKKuX7oFtz4#uhs3>a zFrfw~jvS5;$Nl&gSI4K03=NM@QTh(0so{aa{lkYTJ;TzUJUp>)WJ>t ztjktT_WPlUA4vxIos1jJ0Dg?;4gAE!PbH)4$}|k7NEa(%*3Kof_H2ojxMMj>{7@Yy z)qKsem9?!X7HPVBDxy_Pk^b1-G^gBF923p0pKG&_0iw9GkX+@Kf7{B~?Q%OA(A_3n zH=0b_<4X%C?Cg|e1Z!tBldw|LRyHYeVN!SIlk|CAg z-zKh*l{y0a4WgEo8&HFnIU8};;{tv`iIxhuanP|d%Uwx_w@Rj^<~`q7C&K*Lw{!5D`)vU zimiXU$>)LG>(0OU>^r+%zr<&xSr2Vk#>SV?>+SXBv7Pc3C2!S5Zl&C&en=F4p7#b&1AXG$O(7)y5(p zz_^Y94db2H@sLIYoA@%O;RX)%>B4)wLs8>z*2kik^SA!4UFJ$RWm;$#*h*_{bRdi< z+R;U-cJQr-bQRrcrTdqVS4q@ca;z7>Q;vD4`v$*ylsk3s-h^r3kb(W1KjEY%C-xnI z*L()>85j7&cLTnI*1HLOr-IvsT?Bp~!R)R8{wC>?>RAc=?Go^J6qyo-BJi0aaF5(= z3&8)(t%UJ`2thqEE=lufpWgWqRyFG%!R!>GXA3Db&lI|XlNTf}|AOEjk$(6Z7C&TG zFXM@FZf#7 zIjEqxZK1vdrCx2uhD!*)$GcqVk-L0hkAG8=JtaR#6RB^IT8&$t<@!SO%It$wSK2DZnE}-Su5<5P4%)LDP*yAK6uKXX(!g|91 diff --git a/homework-java/target/classes/com/example/Course.class b/homework-java/target/classes/com/example/Course.class index c3792b3e6f30c4c3b111f5d9013abe1646532ce6..ae48e0e6e6347f72c43b20f5f4e16ac12bdeb727 100644 GIT binary patch literal 2935 zcmaJ@>sAw26#h;EnGgm+3SLkuR+JE^v1&_e0IQ*5Y7lD>Z*6r*jxdnSU^1byy85pV z(bcv3485wYuGI(Vd-O4S`OcY17+~6!HFIwJ?EUR;UnYP2{pxoBSFoKz3~>V;COVN2 z=v%k8tZdbCR$2<#B&Kc0_GSg*>G9jFp8#jxFAKj))6YGMe-1P-rCN7gM*-f`@wOkshur>qj#;Wvg>Jl_qP5x{!0=UARr0gxf5Lxzf z+~Ad9qa&?d>!wJn%;_Ol3!%*64sYzv|2ZZf!0|Z_TYVl2|80d67g_;HoeCWjQG7nK3aoIih-zKhynY zMof-`6JM=^e4i0t^(Nq?;9}FjQZ`?Y?}Dtm5yTi}~8zk#3+ z@;XCTm5tG&>uxkRbNlluw6p8t()Ol|5PukwZxwoID^QWQs@0P1Nv4NcaM&R8RjbjE z4FgSq)BAjif@0jLgJyn3?o*^ku{g4E(5X-sF3THojChEa0e8N%96b_+h3Q0`cO$2r?>ow4$?b7g(=QzG&?0{A_L}SNb zVptn6wX&YTKump>0%hM(nR4R%Yn-_M5+@fX55~WKfw%f9k7tKp;S5mx37LuCa5jc- z|M}COUyR}I#1Fg`$BuiWbnOhmj!}D>vkcB*LR-&h#|_*@Nn<-7;25H#OWM&SrSD*w zSng757sOvwX7IZvaIXzD%a!7!GxG~fWj&^?D_X#>h$7PWvop{ya32qNs)993X&rnW zq#d@@pAO&x!+KF`IOI#ULy-tVA@C5N2D-A8X#wf`p4Y=brXqoShR@qT;+lj+W{iol z7f6mkrvC$o$^^y0qew=M?`7n2BoO{r3V=)nUUX&1=kZ-Bgy4tipj-+C0 zFBS8l%R4c#qN$kLOT`UcYAUMxW1`AZQL%z@;7vF=F72gaF%pQXzlh|xv=>N;K$f(I z{XkS-P(Ui}n9MV8RdNg~R#m3*>EkoS=hCm3eML^O7vQ}Rz~O-ABxE~Qr*u{V-LEmv qDlPnsj6x|w1(0G^J<++iiZzZ0c%?=OTfaBZ;9iPr4_kPKqyGXn>_d|P literal 1954 zcmaJ?>vG#f6#mwBEXP*t;wBDlsGF9wcH9s_ffni{z1RdYlNM%jVHkce8+j*DB1;}g z>5yS~58i@yh5*waJU}0+)3dvBti%dGw0m}SF5mgiInvvAZ~g=D6yFw+LDoRd#02sT zR}T40Zn@msx4z#y6n4arUvWGqT4TsI7k4L7z@&kqi4shPs_pkJ@hk5STw!(m;~*3a zIgj^gt8R{bZAF3O?YE_M*+d0b7$ydRW0M-|7E#4j1JfpEP-7@7v*XBdt(~2XE<-Wk zUeE9AL$$f6{hlebrTvE{uHiaEA@X%BhUuZE$|ix}BNI0y_=2qfZ}cRrn z;^Y^>15fm-#L;aNA7g=Gw$G15$MV4Lr`idWy}?k*1;d5$l0(SbuyrZ>k6(q=IBMf5@y#R!Me zOiExGw?Mi-=+aQZiT(na#22}yf>t6GUF?k>Ly6vxP8E9hJV7C4K=04r6t{?YTdX@W zosza)mQ|#;kFb{T4-^%sm+BxE45%4i@ZiBB6(#P}GN z@JVdEM%t39yh?WjL4IF>I+1fzd8lcvvkdcbh78M)03>}D=?sBP{Ye)|Ah%P2e2UM` zfMiwH`Bvi`Ic0@Anyh$L7ta6grixr>anQh|J)&Pbvt8ptvMu`U53TTKG_B9)Q) zMMmzY0{JqXk^05bJRl$sF99NZTLPh93$3y=PvUl{QIE{YKA~rdp86Xa7F?vLoj_KL fOP<98Rndp|iuMBeZPW8L{fmJjNzc&5I#khd{6oxd03iv|Ett)W2Q(7#J8F8B#ZLRWeUL$!x_L#>l`F%*eqIF`0)&oiB=uA(|nEogtQo zL5U%5vLnl7mPAGd)ycUms?6*R$&(#eV;Q+N&tqj}X69fBocxl*KsyL%AQM9{LkN)O c1F|9+7#TvrWH>`SP>c)6Phd!5NMVo!0Odd#6#xJL From bebdcee4453793a8e24692f11cf8e6401355ec10 Mon Sep 17 00:00:00 2001 From: Gab Caser Date: Mon, 21 Apr 2025 17:37:44 +0200 Subject: [PATCH 26/36] WIP: cambios antes de mergear dev --- .../src/main/java/com/example/Course.java | 18 ++++++++++++++++++ .../src/main/java/com/example/Student.java | 11 +++++++++++ .../src/test/java/CommandHandlerTest.java | 5 ++--- .../classes/com/example/CommandHandler.class | Bin 3942 -> 5141 bytes .../target/classes/com/example/Course.class | Bin 1954 -> 2610 bytes .../target/classes/com/example/Menu.class | Bin 2379 -> 3896 bytes .../target/classes/com/example/School.class | Bin 2053 -> 3262 bytes .../target/classes/com/example/Student.class | Bin 2293 -> 3129 bytes .../target/classes/com/example/Teacher.class | Bin 1082 -> 1668 bytes .../test-classes/CommandHandlerTest.class | Bin 2142 -> 2367 bytes 10 files changed, 31 insertions(+), 3 deletions(-) diff --git a/homework-java/src/main/java/com/example/Course.java b/homework-java/src/main/java/com/example/Course.java index 5250ed11..bae35b0e 100644 --- a/homework-java/src/main/java/com/example/Course.java +++ b/homework-java/src/main/java/com/example/Course.java @@ -1,8 +1,13 @@ package com.example; +import java.util.HashSet; +import java.util.Random; +import java.util.Set; import java.util.UUID; public class Course { + private static final Set usedIds = new HashSet<>(); + private String courseId; private String name; private double price; @@ -11,6 +16,7 @@ public class Course { //constructor de name y price public Course(String name, double price) { + this.courseId = generateUniqueCourseId(); this.name = name; this.price = price; } @@ -20,6 +26,18 @@ public Course() { this.courseId = UUID.randomUUID().toString(); } + private String generateUniqueCourseId() { + String id; + Random random = new Random(); + do { + int number = random.nextInt(900) + 100; + id = "C" + number; + } while (usedIds.contains(id)); + + usedIds.add(id); + return id; + } + //getters y setters public String getName() { diff --git a/homework-java/src/main/java/com/example/Student.java b/homework-java/src/main/java/com/example/Student.java index 58ec1b7d..17372f8e 100644 --- a/homework-java/src/main/java/com/example/Student.java +++ b/homework-java/src/main/java/com/example/Student.java @@ -75,5 +75,16 @@ public void setName(String name) { } this.name = name; } + + @Override + public String toString() { + return "Student{" + + "studentId='" + studentId + '\'' + + ", name='" + name + '\'' + + ", address='" + address + '\'' + + ", email='" + email + '\'' + + ", course=" + course + + '}'; + } } diff --git a/homework-java/src/test/java/CommandHandlerTest.java b/homework-java/src/test/java/CommandHandlerTest.java index e0b48396..26f525cb 100644 --- a/homework-java/src/test/java/CommandHandlerTest.java +++ b/homework-java/src/test/java/CommandHandlerTest.java @@ -1,3 +1,4 @@ + import com.example.CommandHandler; import com.example.Course; import com.example.Student; @@ -26,9 +27,7 @@ public void testEnrollStudentUpdatesStudentAndCourse(){ commandHandler.executeCommand(commandWithIds); - - - + assertEquals("Ethics", student.getCourse().getName()); } } diff --git a/homework-java/target/classes/com/example/CommandHandler.class b/homework-java/target/classes/com/example/CommandHandler.class index cd03ae83448c931385c8f2bb1efb116aff5d8fd9..0d2cd306dc108315d4a14627b7a658c8932536cd 100644 GIT binary patch literal 5141 zcma)9TXj$a)!ytg$aa)OB%3*WHL!0&{zqiKnReMn@k98YE2K5LozU#2{R{z zV6SSS7tmU(g0{7>l~`ykU>SsJu~ks<+Di4o2Osp^=l1&|{(GM@lbj?#lW)(Nwa?mX z|7)#(t-a^k|1P};U?cwFhYM~M9t~dPC@9>kAJA)Kdc423WA|PoVk*d47mY{FMg{JQ z%I-PvVU7yFhFoY07Df_-wZ=hxa42TfHYElJ^?2Vlj+l{D;7ggqeMa0&(QK= zhanBss8Nt-#FL3wENsPScHA>jS9S{bY_odW-WjCFV*F`}TjViqqg{WTiy7Wz4{ zL}K60p*i?G?osgt4QtWh4CZLcGzJ-k#4tlS-`YQ#sO@BoO$O7@2OE4?uV6uw9$#UW zC5=d;KOQ|~l#vJ``F`As4JtNj*n}npMKbM915EgkFc*tY3uGo)-MMJS78P4HY(tBJ zd?$C9uBd4wbu&SZ6<1VRASJb0?D>XVY)7k#HVy6QP!O23kWnEDCcWJ_NIyyJ90j@B>7wV6gUmpZmM{Yz@{2% zl4amW4<6F+Wnm|mcC6W!J{1p7+qlar5kGpdTSFwXu|3_==L7ki)6}tZN4VJsmWUee z+PS&8y~~Fvg|6m}P1~Ax2tMu85ChX*uqPVtv)6AL70@fEGCh-^)~Tp%^#%bWp2pmRsZmXtUK8_n z%;k%hG`yUBVP{&t_@RbZ#S6b!(V0x_iJB^Y#8Apgo6>tX4M$^rM$(TlxJCRE;@e3L zo7B;o5M+iZFWk# z5GT<(N9r?tYh+uzwPuF)LbLpqHf=fy#nrZ(ljq>Hl?~J7%5JtJ>trfujmC}k;lbTT zvP<6`qc4HhL`08u>&d8)?MaV05akiI*x^@`<7g(5V&~G)q0I7;=@4%gplL{*YFVFe zsWllx;by*Z(1;A1hK-eM92rQ&CdGhdYYMmMM=o2DICnbrBwI|;EGHl<#n$1O8#eXG zzBYYG#!AIy(nuWVj#yomGdkVS=k>Z!icdYDhO2M zf1aPkTmj6Xrk|g=$fw03T1s;^XsyQu{G1Xk*?7b^v9mxq zPhxW8BEOdrv!!*0NGz>$S*^2tYk6{sZ{I}|KZ#T6<1RVWzETw^N@IRo$X(Z7z1HKZ z_m+6lSah1N(9hvHT=ViFK6_C9(FC9OrCu}t%jeodD?KOq43>BTcc!uQ1nS-O-f^s? zyj;rV9wC=eULoaTuaFBVS4uf2r`|i?dx|#JbBI6T#}bYpM>WUY!H}me=8O~f>!ml{z#{1l1IdX4c19DXOR1~ZDKziLVX$zehzwuAy3|G1#xKm2IKsl|gpaT^Mp%S%>*(!cp!?$8s4 z>yqviz&!y?MVE^0cYVr9Mcg`O1)g^k;5`=bFWnCKDq622@YND-EwAXS zcrjmtdmO-ji{H%v{`)NOYkcbj-ZKfDce+`D7v2PTuLWGc9q@JBay@}J68OE0_yz*s zMBq&h;D5j$X8`|G7Wkj})(N~f1KcHktk}T+O%oz*N2)w^ZLUVL-73fy&bcpL%U{Ij z%Ig!mKH#(Qz{l5xyet&xlbl)VZXCzrP+*UgiaeC^LxBM)dA*HGM8)y1&Uz3Iu$bdc zj%DL0W_hu!f>omI_NEbcl$X`Fw(`E)LS}Er0kq*TI%NckrKuxXrX7)mqey-Q;F~~* zHKOF@`4_ufpRkj;#4keI;Zu}EZPWyrh5hZKzK7R(s;^=}iRUT;)uJRu*=o{w)Gqrc z9Js8S2(zPgv5R)IzwV+__p?lUxXVKl-x_O&EWR4M61Xb_wOm|XA#1`-8%rTb=8@>x zb0@G|RtI_J5?5mzcekCWLc;zk$KgmzRYe-lh=$~n)tWE6+QaPgI(^ybchww#BwXqX}#jW%i@wLZj0HtKvqlYojbmh`7Q zS6t#(#4Qk84QVFgUWu56cU#1d5b>i#{1_2GPApFl@ske3qTx(O{I^>m=Fb}&aTWbk z#F*r=cm+HqHxM@FQ5EgR4)|)o1AHvvl=2x_XqZ X9&@-V>UFxS*Kg{of{%&Sg}?tF#j}}9 delta 1953 zcmZ{k`*Raj6vw~2n`D#hrfE~iP^6_iDm6)|LMd3FG_-*h+R_)TyoAt(5)26@;iYI) zeBcvhDKFoMMnP0S!+2sWynV~5a6>sW^#V}?>K^%={RY4%(w+8+B~Lpag9+lFpBIj5uM(79EdbtC6&c@1%uvQHk;16)pmmBKd`;1 zr#R;2h?ud!$-jmY?ktB3r#b55C@=+Q@V0TuIji*@TGdd@F^%_1X3vc=o+#FNaGbMw zs&_g29$NT62}qlGl8tL_8dJ5y9ZT2~pE#+K&Bs>9w#XMy76dE{a`0zSk%iY6$e})q zk}R~#Sm=2;hozUePJtkw56!r(&B;{ZDyeQ@&LrlWf|+Z0Bi_dcq)>4UAL1-YHGG4Q zIHuqn=WC$dBc@G-U4>W0$L8Nl*W7NmUZu;b{3ka{BJ%Uj-~ta3qBTlgzOPZOUPDkq zcilCtmWVK$oi2&@_BL56EIITWRV7~Ol<|W;Co?W;HOlY_vZlO^Mbt)oYNE<40H1MI zHUZsG?m}15tD=4G9S%w&^ZpaX^*JF(Mu4Jt#cr?f*LY7iGlx90H+~Kdy;YqxNy<3?#?CX>Ug)2LUP zv+xBx&zjaO3#}Oe&tcOlx6&#JcwR6qtF5{6Ja@w{e*8p6Rk78u)w210IlPpGBMVy= z%7n7hNdt7_2zpq%dT|s3%v)B}F>E&7@REyEMK?|`WzLdWXjTr#T{JLHB$vzOtgFm8c*$D=Wh`zI2$? zVYrA?NgeY6DSXc7xIoe%{{<)G@(u&Uj<1R+4MY-Ona7^P>t~=^n03k(?3#E*K@Hw{ Rj`fRyBti- diff --git a/homework-java/target/classes/com/example/Course.class b/homework-java/target/classes/com/example/Course.class index c3792b3e6f30c4c3b111f5d9013abe1646532ce6..bdd1b4a740749c272bd6cd27092d64e36cf6b083 100644 GIT binary patch literal 2610 zcmaJ@e^(Pn6upx`HiU&pgs506ik1+lvDUU?07X(u+Mw15R&A?GGKH07mnIvJo}T{K z57EhAb?) zomN{4WY?u5Tb3tR9Q(_T^ta1(f#KX_rR%@ywQOg-*hi0pCek<{kgRDJ$~F^inK5xt zS@t+qQ>vpQCbBpr(7V;LYYZ+*DICG5fukl~!!dzD9kJutjl#-Gxg?NkSx((;`ismq zq#c8zI)B{6n948dxjsw-C%4JbmN&JJ6iy(nhSMhAz=VL|$j4sUA!|Lk@?<$fjwemz zF(q)QX>F1Vr)GJ#ZEu6Kwr4qBTVRBy(b>Lf;tUFO+iA;sxlY@(Z>TX;rC037TR3On zZ4>A5j=(@SS$@@oI-X@aI!Y*pU)$p3U3LCF6BpFsxK*z!N-vryDoV|!>&PefrPXp| zJp+L`l?sJ$F&A ze34pzP3k zj&?wCl?7rp)tT@$v?J4yCTKrU^{m?Fvb7a>H`b+hje2Dv+uO5|2;d5LlD0Q|DYM@w z*CdYw8$CIlT0c#?P1Vou-Bp_3mP2JD1N^>wCplYd1TCGavf*m-s;!vm_uZUP)uGt0 zxUSdsTGrOG^fugjJBbI(eo-W`CNS&UE;g)o`>R^ewR00@(_@r@j;jv#t=rhm&FI%9itPvz!J)Q ztC5z#acQ60k6?$SYsnEKTT+8amwHiqy1{mY-f8^i6XA9*ScmE0&2 z9FLRJ6NG+}>v7)Wr*W2}N-(d}Ht-=n(%8-gI7V?86`g95Hp{q1EZ1q@2k|$Z8FVLb zV+X1#lVYVe|0{-6^q7vWhykWUdG-eW1wO`2epQv4r?skhLRY8Dmiplak@oTiS6H*Y z)lM-IK`{iXxE1&+&}JLR@DDr`268?U$O=|>fW$QkiTuPah4?@&5Xj6cfG8~}25v_( zGO(AC*+?LtL^Bf7j}PQBfh@cNi0Tjph1z6Uw0(c-=yE!f;kas3btI5_ejNiF>n literal 1954 zcmaJ?>vG#f6#mwBEXP*t;wBDlsGF9wcH9s_ffni{z1RdYlNM%jVHkce8+j*DB1;}g z>5yS~58i@yh5*waJU}0+)3dvBti%dGw0m}SF5mgiInvvAZ~g=D6yFw+LDoRd#02sT zR}T40Zn@msx4z#y6n4arUvWGqT4TsI7k4L7z@&kqi4shPs_pkJ@hk5STw!(m;~*3a zIgj^gt8R{bZAF3O?YE_M*+d0b7$ydRW0M-|7E#4j1JfpEP-7@7v*XBdt(~2XE<-Wk zUeE9AL$$f6{hlebrTvE{uHiaEA@X%BhUuZE$|ix}BNI0y_=2qfZ}cRrn z;^Y^>15fm-#L;aNA7g=Gw$G15$MV4Lr`idWy}?k*1;d5$l0(SbuyrZ>k6(q=IBMf5@y#R!Me zOiExGw?Mi-=+aQZiT(na#22}yf>t6GUF?k>Ly6vxP8E9hJV7C4K=04r6t{?YTdX@W zosza)mQ|#;kFb{T4-^%sm+BxE45%4i@ZiBB6(#P}GN z@JVdEM%t39yh?WjL4IF>I+1fzd8lcvvkdcbh78M)03>}D=?sBP{Ye)|Ah%P2e2UM` zfMiwH`Bvi`Ic0@Anyh$L7ta6grixr>anQh|J)&Pbvt8ptvMu`U53TTKG_B9)Q) zMMmzY0{JqXk^05bJRl$sF99NZTLPh93$3y=PvUl{QIE{YKA~rdp86Xa7F?vLoj_KL fOP<98Rndp|iuMBeZPW8L{fmJjNzc&5IMElU_9m=F^}NEs>%VlW0nkpLlp1P~muO$h8G?CcUy zbQKWaf{vhwD1r!r4}!RaMDaltW#JF}@X4?LmS0$cw`XU0>d)=I-RGV@_c8N(XlR^q z;o9(70JCsz(CG9{=$Mxps4)kmnUpeS+Np#zds5l7E$zu>TWY`@u#%gdc%V8Lf*;zk;nk7ffE=n7&H786RXSgdeGxUZ`H?uhA= zmV^*MeFz%bbaWFs+GVEFHha?2%1AS_R)$SGla0w_<_=wLAqb^w1wS(@7E4Rpj+#1F zvdq?m)fZPXpCyEEeYC5o{6_MF~iDlJH&1#aXKAu^g!i$0uIJne(=gV$O{0OZI13c%a`(XE-u^ zw{(3v!EdE|ZD*JN$%-+_Y+|)c&tFp*2UU*ZiO1?(@`q`U^S6I8eeP5TlJteMH!v}G zl#z?1)w5QnO)^=kj7`>YjOU3mh2!F|#LP7*#_0HpFy3fQW;lZ9$BfAgXJxy$g;FTc zH-s?-Ew|8~AdIB~#$(O#x8c#AB$)q0>(xu~o?^XTMz;{>m0k~Zhu$$7h76p+u)s(V zRrrB0;pP}PLG8T%C&EOB#5iL@dn&a)%QN+hb4{y_J%8LeHt|AUgy}VYw)M@65C(_fS0kAy;5w$c0S=?-#I1H8Vl(w@=pt`E0Tza2*vYAM)ip9 zn;OdGv2ia(NA$DW0cc0yQ`PoCRr>;_I21~VZ4qvcm$fz zjW_WYxBs$-6D-ff+lGJ6;X$p2Rb193ez`MLNSXvnGA?IKe z)$w0dQ47{J9`EzDV0B}$8+(|VXAK|l4vajH53!dgv7FA}BgU2BK|0|MxetxB5Br$K zk3ll=v69L)I*k3i)9?w$*Fe9{d1wNk3J8Iez@`e~slSS)|1cBXT;=E*Zqxw|D#2$s v$m>kbjlUNha_wQ)9&zoLu08JBuU-4CYX@EXoom0xkIZ3k{8{{rUlI8ifQ!$K delta 506 zcmXAkOHWf#6otRj+uKuaOPWxPuLP^HMvad+A#r3#OiT=@NJUf>4!sx9R$5A{))$T$ zXvp~k&Kx*mq;cR6(4k}JjvX0e#MR4W?X%a~YwdkLjeZ-6zW)3C1sLb`b~F|E<6$+h zO!}YUuYA^Zme&nszZI6fvzPV^Pj_9tG3nYhx7bW93zii>AMW)(>}m7JNBLFL^8I{u ze9cg*C9b}bbSlQhaT1@+qo{qRyUVUu>Yc=Olen_f(nu*sFXAyzEKiG^pzq%feb2ry zRQ*;o8XcQxwHm#)<&}REorx#N=wc(h$~C<*dWYnM*VUat$l4>XhEAq~}o@^qEjOmQ{Ec8VRINspvG=Or5)_z&tUTbBR; diff --git a/homework-java/target/classes/com/example/School.class b/homework-java/target/classes/com/example/School.class index a085b5ec015391aa7f33d10367e3c254415e0bd7..5b2d741131fbed8cd47114714d0fa58d37635a23 100644 GIT binary patch literal 3262 zcma);YkLz#6vzLQv`v~UZ4E7f7HE)Cl2jVGiIQ3_0i;?kn%W9@VVf+?(quPgH-+L| z(a)f7eZyOCh~V@10etV5@$pgrv%5()X$pNanVCK3%>Vr6%uN3L_sJgs&fuE}0tklC zqo5ak0z5M1xa0ZfK)P(c!@He&g8%hoEi zGV6>!;)d1D%vC0D6M?2yvSCaKBrcnYMuLfwx~3(THO)v+j#f;pYxZ;mhcF#NM!}0X z+(6bIiL$CPZrSKa!DF3TjB$sLDmaGY0`ZEvs^v_hpxR5iU1HC&RbmsE^rzqO^%3!= zB##pcUdAijU`xNp4Q4&e$?2?u8NABziYC)e&ZT_r9?%F*;dBUR6r4q_9hy@b%w|n3 z*R?CRIutcF#23<26obHdncf9~gUPv#27VcyPZ$>k#!26+kgo7!JQ7F4c*EVNMuBZ& z8pKh7{=B|osCK#5tHis+)C)A;8~CYwYvjKPd-DX=Os5cDn&LOB};EZH?VAMw8PS?woaA}8<(Xw zqM&DCYxqe;4z`wSB+s%bXcu%@9#MDKr{xXF(|Oi3ZOg8y)k~UPGK*FiTx%$jXh2V> zc0!yCqt4w=>=%hc2@%E})?FmwrQERKok_pOs_yJyA3loUV|)_Ar}F%MCNR-@Ds*Gb zT;*fpTnp}vbwMrIW{sh~_1{&Vp)2vCY81(jyuWDV)Z}{xH zTtQxloLVmDbz75k=L|!u<;tqXhbM$D1rBV;shiXg?hEXFx+$yF%?tbZ$_03>_ps#y z%w9mgm%IrtIsMBV^IdF?uW-yKu{pkq2>ZP_%=S%sSP0Srm`Xo_NKZXPDE&LOU3-MV zhZt&ghg;qFkIq7Gu^mMp+bG2-=;s4Ii~)>e5NQk{&o4XN&{)9R9B~mxG7l>jvE&Ij zM;j?XN&kYOsmB-%V5zl&{Br^(7-b5rh)Oe}f_HF@kp!;e25n_Z8D|Xi%7{O3A^<72 zkJG@26Gn0Ry4{(-UehEFn5r8wn znK9S!C4uiT!LMUIH|5OOW1I}&H_Sf4Imhz85D)(QOJ*2!WbH+W{aqwDia2&-5_@o* ze^;*ZcahuO$U2E>ypInY;Y*(IoAitz82<-D;&1+85KytqRwm%*8sCKLesY~?uE0I; zaV?<8NCH|{uJKN;lbdqA#ULwPxyJomU+dsH=i^Gl4zBSna!oU*DRMnTuG8e2A=hbg zJ<`m2Yg|jvyKo)egzGVKJ>FcQo$GC^I$XvV9uDNE`Tj3gn$x02NiVyia$|HA=N!6UzcG@+ky^GKJ OU0z&Y;46HMUH=2(BH~E^ delta 794 zcmYk4%Tp6U5XQgRO|oPeAqE49QCKC>5F`;IihvIgltd68Xarw`xQ4_B6bV*om2y#U zQc`pB>V=c#1Iv;e@b1Bj<=^4Kn`NmzLsTxa{rLLVJ-xFQcVk3o;LOt`TV%?3goVeAq~mS7R_ zfQ750Xf?2hqYW|flJ&awaPwYGx1xQJGuDiRKd=cdQ9}M~y2Va7yHB3TTj%x+o0z6o)I@S;4Gt;4HtAe{-l;U_%o2R%a_X^LpLh;jPXkad;x R6Y9K7e@UttY~+wf;16ymbO-IAwd4`e6Oq`ie)VlB- zH(hkm(@l@(bkSuOJ*U>9EuPaZvg`lRKcgS_%}ii~u?rWOdGF5s_}zDZ_rCo3&*tv{ zX7C`65W-P3C}>24q3t$b5SdhU)t+Vu52hF6h@mNpxPm=U7&;0@ zc~q?PazzuPdAnK^I$3m=gf2{Oiz~W%rz$*ow#d*qn9glS$lIo>mnNFXXN!VXv@tYU zt`n)82v$uf=#Z)nIxh=pyH`P%6hwKkXbQ`cvV97Aq^wbtxvELYeg$u!m(nR1RnroL zCFch}=SU}_c(Z;8Ra@0YFLAwSl;h|_SUwIYIEVoXrHgetD|2la%%-ymI?KZfj$n|I zFY{F~XXpiPUsdfDT3I&NZHr+qsRpN%Q80vIa$B`TF1#a?!EvVcnVO2yy<(jaL#xadK$>dY=w0-ALM??G_$7uy;aF&p-ajhyY++sNF z*R7w~Zu0~f&dD-=$e{a8JomdTUQZIhk|-7!+PABImRl>ti#T!!Q`h9xlFsd_Nwhxb z#;kK=ayNwO35N04gr8m{%Fh`^3e=iYb#cC0UKZwMzO0cXkuwThTjZuH_nxr9UQs1E zUg|b)BoL5@?s#BeS%#2GZ67h6p4;kwUmucwbKd5K)dgPh+$$wv`vy!CZQWL8=%Qg0 z(Bg8)Y%6sS2I=mPE#h}x{?o>|%WDh++uf<^YsRV^<#IB+Q|vS~nql5$ z_}0%EPtgT=mMTX5H;^-o)oNv8H|2bimkcl8t%v~i>puN}cJy4#aZSsswjfq0S)C@t zoW?CnSWytzL%VVcf*QqrhQ9w-B}Te=p`Wgi5RLi>l5$?tG`K*!5I#ae-d@g{t|sSA zHo3Mp3-mQ0~vUXKVn za3UU@lk`PuHT&Ughi)NtU>`Z}q0mVul;RqAp+fRcf#>WyFSoH5=)3kDsfFS8@S|tw zZ!6xM?%l*8AonxUL%(4pgvbB><*wfj;p)&&6eSFqY?4k|rW~WxItX$S2XGhzI7a66 zL_6p}uHs_{+n9$VNhq&5DaYtAmT;Z0d_ta@!2Tv@QF6&}V+-mi?PT7KnP1Q>qlcX6 z@>qbhFV9BLKf|Z^jK0bm`i+x2jYk5FZ-RTq(-g`flq|Zh%JNSc=%#PPnB$?#)!M3P zME;c_9}LTZS#<9Nay$@70jGk1bZ^((1u{-RPP_t$q>%(t3 zoPNs^z0MI$b40!cAI6@os`Yq%D5*%D*Fj)cw!ogD)Fj_}B?;-*PQOn2b<;2TE9N(m z1$HKJ(U(N87bgal+Qud4K_>-Z&kN+J3C}-8TEb>Ne#Z#PZIXqs3XR?^w7NqYW#?(& PbCShrzm9wO0zLl$&Rdx} delta 1055 zcmZ`&O-~b16g_W-cFMFB+mew^6iSPhnQE%CP(vabK|lsjYemGbCJ?RBlHjPzE?l~N zJAZ{0DWHk&b>q))>4u$A?|U<}wHY=q@7{OMJ?GrHvpcYt(7*lp^aa3WJZk8DY$bvr z2Iv?@Rzog^5gcbY^tAG-Qhe!FpB2mH*+~X{qf%R4f9?gzQOo(iU|ityF^nR{5OLQ_ z?nbrtc=Ii*F;l};hD5u5rt;!RY0cF!#lNdxRi(PhcX}G!4UL%8Bm#xRg<+zAlVF&k zNWm;$)U0Tn;t;OUImh2`AoDZ-HyEvub-QQo{eN4ep;XPHU zaOgBh9xzBzMo!c~mTox+Cd2FIGpQJ=<2nu#{SA7Ifc=K5;R3}sTM~*C2?rtjBjSRE zl+ziO$-M09=@0o`8A`ZCuR?z(*z5)u2)wrMzKt&9wvWE(yARuiEtvk)sH-kr6v^l5 z4p(8HUuZjuW7LCT$+N+K^cwlL>ajr8cQ7e|o%iEaVgeAPOjy=*SdO$e^5B~uy COL)rw diff --git a/homework-java/target/classes/com/example/Teacher.class b/homework-java/target/classes/com/example/Teacher.class index d8e22555279bcd43de2a7129520eccd867be5d8d..5d51a8a0588e6b66fee3ed0c8f6a54ece3647659 100644 GIT binary patch literal 1668 zcmaJ>+foxj5IsXe7Q#Ycxht1|L6U&1cZJ{u5-F*Q_`t;npN2363!7bPccA1?{0p^8 z(Bi=l@S`kyb{AMk^dURllkPsJ&-BdiKj*&yEa6QWEl6lc>S#rZp?jYnbJOO|uK9j@ zU(_T+YSD5m`H~@#FKngJhIS2U9Uagax`OZ{Y1!uH=4yo@?Qv(vt%r`0FI2AwlvI9~ zjtsgP+N8TKJp1tUL#F4hI9<$7K7#sxyI{)p+Daksd_UoqGJ?eRF-1bxy`*3hGf1{*ivM&Iwlm8 zq(fEI#vL6wOp!!>6v`?F$vUkgj{?JBogav@>(sdXV97nQe90Z@Gt4(3&`7Bg$ro>k zVW3Ga5hPk=cZZtGR4qrW9o4smx52k<+A*qbjoVw?vy>lgCgq+*O!})$WGyl1yFx}H zD`_=yL+#qhx=@BDLY?`#d*s!`ilwmhC}~a|Jk8Ux>q=jG{P3NSd+v_khUW|us?8jKE9G52w46)zR zXxhThRbBVs=&;nNcWmcc;>O9LXcGQ079U=gQvAT85@l}N>y{Ks(^bb2UfJfpFMJJ4 z3{wp~HKVGb%rN%(CFb9)XWhqb= zSPHf!08K@pOMwq$u7h4dbp_=z1l3IdJpqIsl*>dA4EO23um_V?1=U*oj-Ib%v_SDy zXh2^qx%D#nLDS^%o5@2>lj%K)kY5s%Qae?gImP%DfAy{cBP7^pP+=g9x|Ams$;0pv zkD^*8#awhT`GwNsU1XaQp~vcyNFtCdRh&M>@!|;HEr<7%L-cE`i4Z_a}Hts~Wa>`aQ!d^3r6z#xg1x{tHtcMOFX+ literal 1082 zcmZ`&U2hUW6g|VoF3>3;v{c(FwXJqpw5z^inlv^hO-Oy9ZPLd9Hgub1*DQ|3(0XW910#Znu$Z%v~FqCh^2jTc47&z~`H*POx zFkX9s7auXCt;S^mIpj?gI99+Js=aXNxF5yvz3)2buIOF65ra8$<1;aI8P=`#qG2bF zykO8uniM%oC^O`#wj+EIePYO1C-P$jRTFC*>!>jl6@DChzH@PLdcshMM9>e1$);j8 z5`uX_OXBZyJisPHE)Ek?hP7Fx@}{Na$;~#$Lp&lOaU%b;&rtbSwJhD?cq~gZ0hyBr zdmQ_CLJ^I$14aUCOFWY=g1rg*lu4=W1@75+*ma|G(e>%1(hhsVzZ8)t_xdmsUwb1; zu)QSW76Tu+u?}1+Hfftgo~P9;P`WXhSSK7uJ@>6Axwr-$%3R4#j_w~w(?}`MDkUwd znVivVg3+Jxl*R+vT~TF*=92v#%x+F$+SU}SUlqWjv7$Z~Xk0-a97U|6LFYRJBp7To zX_hNV!_-O=r4)^!X^z!?M)L#rrr4NZYe7>~?TSQGB8sx2;JRHx!SD>5x}8I_q{`ag zu=Rx&DM+o74XEA%XSF_t=S#u$yWowbV0s#w`G}}wzJ}eLpuW&AUmdVT$!@C-wWMku zkD=pXID}L$vv;Uw=3@6V9o%+NUn+!N*jz|jMP}Fs6YSm+G;uJdloF^yp%_FujYk6hnEtUU$r;(A*B+#?I-SAZKuyi;6*K(2Jl)Y5rf6`D(+W-cb9Tegxj{)|)?ki#h3U7dRxR}0K(Ofs zPRp{Ju9a)IomSxbURz<i^S@<7^S3E z>1MTsP9~YrdR!V#XM5y(T>Z%P$S_W1c!u4ALkzNyQTAh!W`YA`8DW|XMGnb^hsAu1 zvUH=ti#z6j2M@~lyWEonM&(!T^FWp`nc*RiWX1%Y3p|!|KrE+uB3VLWmZ#XVZ&9pQ z#8{&u#-<2%q)uNNDWCmQRzXGF4+c~Y?1i`S(JGw delta 449 zcmX|+J5R!37=_Q*LO-aDC1{L<1UfO`V018XFaZHY<&JmpQU$e2T!h8N!O79|2lyL^ zgNcLguFkqU`Ui}sU>JJNd-fv~B`0 z1k8-xZnvy@x7T@8REf0vson|u$@YDV_5+kEBy d=nh@QE>*!E8uS3Chy3=@VyCk@#W^kz`2$&NJ8l2~ From 99cbc6ec6fb3f76658caee3400192a326627fb1d Mon Sep 17 00:00:00 2001 From: Gab Caser Date: Mon, 21 Apr 2025 22:50:08 +0200 Subject: [PATCH 27/36] CommandHandler fixed --- .../main/java/com/example/CommandHandler.java | 51 ++++++++++++++---- .../src/main/java/com/example/Course.java | 12 ++++- .../src/main/java/com/example/Menu.java | 31 +++++------ .../src/main/java/com/example/Student.java | 14 ++--- .../src/main/java/com/example/Teacher.java | 1 + .../classes/com/example/CommandHandler.class | Bin 5141 -> 6040 bytes .../target/classes/com/example/Menu.class | Bin 3896 -> 4586 bytes .../target/classes/com/example/School.class | Bin 3262 -> 1625 bytes .../target/classes/com/example/Student.class | Bin 3129 -> 3285 bytes .../target/classes/com/example/Teacher.class | Bin 1668 -> 2235 bytes 10 files changed, 77 insertions(+), 32 deletions(-) diff --git a/homework-java/src/main/java/com/example/CommandHandler.java b/homework-java/src/main/java/com/example/CommandHandler.java index deb91db4..8093acdb 100644 --- a/homework-java/src/main/java/com/example/CommandHandler.java +++ b/homework-java/src/main/java/com/example/CommandHandler.java @@ -20,17 +20,15 @@ public void executeCommand(String wholeCommand){ enrollStudent(commandPart[1],commandPart[2]); break; case "ASSIGN": - + assignTeacher(commandPart[1],commandPart[2]); break; case "SHOW": + System.out.println(command); handleShow(commandPart); break; case "LOOKUP": lookUp(commandPart); break; - default: - System.out.println("Can't recognize command"); - } } @@ -70,13 +68,27 @@ public Teacher findTeacherById(String teacher_id){ private void lookUp(String[] commandPart) { switch (commandPart[1]){ case "COURSE": + Course course = findCourseById(commandPart[2]); + if (course != null) + System.out.println(course.toString()); + else + System.out.println("Course not found."); break; case "STUDENT": + Student student = findStudentById(commandPart[2]); + if (student != null) + System.out.println(student.toString()); + else + System.out.println("Student not found."); break; case "TEACHER": - System.out.println(findTeacherById(commandPart[2]).toString()); + Teacher teacher = findTeacherById(commandPart[2]); + if (teacher != null) + System.out.println(teacher.toString()); + else + System.out.println("Teacher not found."); + break; } - } private void enrollStudent(String student_id, String course_id) { @@ -86,37 +98,55 @@ private void enrollStudent(String student_id, String course_id) { if (student != null && course!= null) { student.setCourse(course); updateMoneyEarned(course); + System.out.println(student.toString()); } else { System.out.println("Couldn't assign the course"); } } + public void assignTeacher(String teacher_id, String course_id){ + Teacher teacher = findTeacherById(teacher_id); + Course course = findCourseById(course_id); + + if (teacher != null && course!=null){ + course.setTeacher(teacher); + System.out.println(course.toString()); + }else { + System.out.println("Couldn't assign the course"); + } + } + private void updateMoneyEarned(Course course){ double total = course.getMoney_earned() + course.getPrice(); course.setMoney_earned(total); } private void handleShow(String[] command) { - switch (command[0]){ + System.out.println(Arrays.toString(command) + "del handle"); + switch (command[1]){ case "COURSES": showCourses(); + break; case "STUDENTS": showStudents(); + break; case "TEACHERS": showTeachers(); + break; case "PROFIT": showProfit(); - default: - System.out.println( "Can't recognize command"); + break; } } private void showStudents() { + System.out.println("llego a show students"); StringBuilder studentsString = new StringBuilder(); for (Student student: students){ studentsString.append(student.toString()).append("\n"); } + System.out.println("Student usando el toString() es:"); System.out.println(studentsString); } @@ -129,7 +159,10 @@ private void showTeachers() { } private void showProfit() { + double totalEarned = courses.stream().mapToDouble(courses ->courses.getMoney_earned()).sum(); + double totalSalaries = teachers.stream().mapToDouble(teachers -> teachers.getSalary()).sum(); + System.out.println("Profits are: " + (totalEarned-totalSalaries)); } private void showCourses() { diff --git a/homework-java/src/main/java/com/example/Course.java b/homework-java/src/main/java/com/example/Course.java index bae35b0e..22ef0fef 100644 --- a/homework-java/src/main/java/com/example/Course.java +++ b/homework-java/src/main/java/com/example/Course.java @@ -12,7 +12,7 @@ public class Course { private String name; private double price; private double money_earned; - // private Teacher teacher; + private Teacher teacher; //constructor de name y price public Course(String name, double price) { @@ -72,6 +72,14 @@ public void setMoney_earned(double money_earned) { this.money_earned = money_earned; } + public Teacher getTeacher() { + return teacher; + } + + public void setTeacher(Teacher teacher) { + this.teacher = teacher; + } + @Override public String toString() { return "CourseClass{" + @@ -81,4 +89,6 @@ public String toString() { ", money_earned=" + money_earned + '}'; } + + } diff --git a/homework-java/src/main/java/com/example/Menu.java b/homework-java/src/main/java/com/example/Menu.java index 03336945..72dacc77 100644 --- a/homework-java/src/main/java/com/example/Menu.java +++ b/homework-java/src/main/java/com/example/Menu.java @@ -19,8 +19,8 @@ public static void main(String[] args) { System.out.println("Now, we need some teachers for your school " + schoolName + ". How wany teachers should be created? Please enter a number."); int numberOfTeachers = Integer.parseInt(myScanner.nextLine()); - for (int i = 1; i < numberOfTeachers; i++) { - System.out.println("\nEnter the details for teacher " + i); + for (int i = 0; i < numberOfTeachers; i++) { + System.out.println("\nEnter the details for teacher " + (i+1)); System.out.println("Name: "); String name = myScanner.nextLine(); @@ -31,15 +31,15 @@ public static void main(String[] args) { Teacher teacher = new Teacher(name, salary); school.addTeacher(teacher); - System.out.println("Teacher " + i + " added."); + System.out.println("Teacher " + (i+1) + " added."); } System.out.println(numberOfTeachers + "teachers created for " + schoolName); System.out.println("Now, we need some courses. How wany should be created? Please enter a number."); int numberOfCourses = Integer.parseInt(myScanner.nextLine()); - for (int i = 1; i < numberOfCourses; i++) { - System.out.println("\nEnter the details for course " + i); + for (int i = 0; i < numberOfCourses; i++) { + System.out.println("\nEnter the details for course " + (i+1)); System.out.println("Name: "); String name = myScanner.nextLine(); @@ -57,8 +57,8 @@ public static void main(String[] args) { System.out.println("Let's create the students. How many should be created? Please enter a number."); int numberOfStudents = Integer.parseInt(myScanner.nextLine()); - for (int i = 1; i < numberOfStudents; i++) { - System.out.println("\nEnter the details for student " + i); + for (int i = 0; i < numberOfStudents; i++) { + System.out.println("\nEnter the details for student " + (i+1)); System.out.println("Name: "); String name = myScanner.nextLine(); @@ -72,7 +72,7 @@ public static void main(String[] args) { Student student = new Student(name, address, email); school.addStudent(student); - System.out.println("Student " + i + " added."); + System.out.println("Student " + (i+1) + " added."); } System.out.println(numberOfStudents + "students created for " + schoolName); @@ -82,13 +82,14 @@ public static void main(String[] args) { System.out.println("Enter a command from the next list: \n ENROLL [STUDENT_ID] [COURSE_ID] \n ASSIGN [TEACHER_ID] [COURSE_ID] \n SHOW COURSES \n LOOKUP COURSE [COURSE_ID] \n SHOW STUDENTS \n LOOKUP STUDENT [STUDENT_ID] \n SHOW TEACHERS \n LOOKUP TEACHER [TEACHER_ID] \n SHOW PROFIT "); var input = myScanner.nextLine(); + CommandHandler commandHandler = new CommandHandler (school.getStudents(), school.getCourses(), school.getTeachers()); commandHandler.executeCommand(input); + /* - - /*String[] parts = input.split(" "); + String[] parts = input.split(" "); if (parts[0].equalsIgnoreCase("ENROLL") && parts.length == 3) { - commandHandler.enrollStudent(parts[1], parts[2]); + CommandHandler.enrollStudent(parts[1], parts[2]); } else if (parts[0].equalsIgnoreCase("ENROLL")) { System.out.println("ENROLL command needs to follow this format: ENROLL [STUDENT_ID] [COURSE_ID]"); } @@ -100,7 +101,7 @@ public static void main(String[] args) { } if (parts[0].equalsIgnoreCase("SHOW") && parts.length == 2 && parts[1].equalsIgnoreCase("COURSES")) { - commandHandler.handleShow(); + CommandHandler.handleShow(); } if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("COURSE") && parts.length == 3) { @@ -110,7 +111,7 @@ public static void main(String[] args) { } if (parts[0].equalsIgnoreCase("SHOW") && parts.length == 2 && parts[1].equalsIgnoreCase("STUDENTS")) { - // commandHandler.enrollStudent(); + CommandHandler.showStudents(); } if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("STUDENT") && parts.length == 3) { @@ -131,9 +132,9 @@ public static void main(String[] args) { if (parts[0].equalsIgnoreCase("SHOW") && parts.length == 2 && parts[1].equalsIgnoreCase("PROFIT")) { //commandHandler.enrollStudent(); - } + } */ + - */ System.out.println("Do you want to perform another action? (yes/no)"); String response = myScanner.nextLine().trim().toLowerCase(); if (!response.equals("yes")) { diff --git a/homework-java/src/main/java/com/example/Student.java b/homework-java/src/main/java/com/example/Student.java index 17372f8e..03717972 100644 --- a/homework-java/src/main/java/com/example/Student.java +++ b/homework-java/src/main/java/com/example/Student.java @@ -78,13 +78,13 @@ public void setName(String name) { @Override public String toString() { - return "Student{" + - "studentId='" + studentId + '\'' + - ", name='" + name + '\'' + - ", address='" + address + '\'' + - ", email='" + email + '\'' + - ", course=" + course + - '}'; + return "\n📘 Student Info\n" + + "------------------------\n" + + "🆔 ID : " + studentId + "\n" + + "👤 Name : " + name + "\n" + + "🏠 Address : " + address + "\n" + + "📧 Email : " + email + "\n" + + "📚 Course : " + (course != null ? getCourse().getName() : "Not enrolled") + "\n"; } } diff --git a/homework-java/src/main/java/com/example/Teacher.java b/homework-java/src/main/java/com/example/Teacher.java index fad4526e..3fc9dbc1 100644 --- a/homework-java/src/main/java/com/example/Teacher.java +++ b/homework-java/src/main/java/com/example/Teacher.java @@ -7,6 +7,7 @@ public class Teacher { private String name; private double salary; + public Teacher (String name, double salary) { this.teacherId = generateUniqueTeacherId(); setName(name); diff --git a/homework-java/target/classes/com/example/CommandHandler.class b/homework-java/target/classes/com/example/CommandHandler.class index 0d2cd306dc108315d4a14627b7a658c8932536cd..db7cab3a663f318629c695ac591ad90def8dcd66 100644 GIT binary patch literal 6040 zcma)A33MCP6}=-%8buy2QDTFW;3{bn+p-)7hZwMfOX4_*!Io3Yb{3k3i8Qg5$QmP! zl9*EH!oDwU*_RfGTb2TWh>%c9pwKqmSi3-5TA=$v_Z~P6>HRY!S+X61&l%19Kkxs4 z-~IQ!_s56c-~SYV<@m1`4iw37DsaIqp?sUVLv4(!iNVI6E!(t+A;G;YmWUZ`5{hc; z2ByJ-X)?SDilIoD714(qwO#7)NL*`d*N2DIM05?WxR#XQNg3&=mM~JBw#%G1ZN%b@ zU9ptWD&{FwP$njkBYHZS(o&*tx&oi*^B9^M8Pbv|4`xb`{9aVzI2p$)sKTrQm|-Is zOAJbIrAFd0!mX*b)-rvtUbfbqHMvjBI7h(=sOD-zYHFxmk7}lqogVnjet z%~SAE%x9N&PFjuAor?T5ES_5HHhQp-Hp|1|&eb6gY9%)L*{mehxDBiDr=`8 zy3VveU7^}&?~d#G_WqG#v}2`=4h5^QT0&`|Jh&q*EY>glxmTZ_?& zGi02ppbOm+eB(1@P3Q>sHKgq#8`SPbF``GoT6~;alQ6qyX6MdRe5;HwnaNkSy-8m5 zqF=!P)=5wXHF9d|yE7`Ga3Y&285;;Jf1-9%>0YeISqeTO<|*bpR&Qri#wRB%+-F6B z7n^Xl0yVp^-Q5}WAVNypd-{9B9Uf4=a=5R5Wk;yb1BQg$*Ri~PO-HZTub6^u*iNRm z#u8C$!4;zdd2POyvs>IX88oG{9>WR}0))rVEmIFhBuuyF^Cxt}zg15sqKm|eNd+m8 z`ZBSiO_jA|-7%N6&ADbThCQIPe0JA_MMf2zi%;2$*tC4uMQn2}vPmp*J{PgO3Kr?b zXB2!EpOY{xmE9`|$JI{7k)`zu694vs-bo332n4PO(rz%*CkAvq$?gx)EIs> zm5L1}{Kk;xkK~kbnS#r41zn;t%%Ph#bF3-im0}mJQgF4f@X&(69nnPRwF<7o^&Cc! zg~Ob+D+R7E;EOW8BsTEIY}zm*YI!oLjxwp$6a;TJt4&TpJ{FFf72JYb$-=O@U2E49 z5!F~1GnhgXDMK|g{=zBu*bLJA%rV%|(u+MP5GA+q3E!u zY4u<~i=NkmCnfl^!cV7|X?4FA_h*Bzw$87mT0}~JO62ozPRQ5UEgYb7!_=8-q?1e$ zHF?=o)Z%3YLbg|HZEHQ2Wj1_-<-!k~)7l<$$|W`r<0pX$BU>l7>j>Xz)#kFUSV9Y> zhqq|SK6Oi+zWBQIh#DVIlQGe@JDtW*jC!6^;8)?{gpex>hmMY9hwq#S@n{51Kw4;) z^Z5g<#yJ#jmTJ4SNZMdPnFlF~c;}EFA8-1sx$@(O0l-u(j$LcjB$MroDGD$H%(mgF zBW$RV?cM5#$(4*3s55d^QNUGJ10p6Y*>8?f!?NAr5LTU;1w(9iskDfh$jkw5>zVfE zd4wQxXT_}JT*9zwoVA4A;Bn5-4K>c8E6Iz!aLTGV5~?NODq(*wl_?K z5p7jW2xx}QwS8z^Bm$e+afPlMDI=+lbZf?t9_1`Qu3;me`?h*BULjR(f2eMtGVTm2gvjCa?{yRV)mt`CU9ArAO>Q$lvTduL}nD zQM^-_=Sv}*3nov|uJRDd(-uQQ=}aWFWP6-tNlVH2r-TKQe3}ZXjDJh0{$Nw)Ld!4A zWtMiZh7|Fa9}$r7G+PcFc3G zf#6=01RD0D{1NsS;d%a6as)7qmR|lAqm(nw;7s3UZ@?Ol@8G*^aV8s&coHiMlrv3C zML5J~Kj*Zp4ibrF^=!`S8NPj*y$*bjZ@-Tg{t~Bj7FThz|6sjuMg|q#!J?*6LyObV z?5c8RF#CSK!XPi_#fxq~m-mfW_|jqC&q&>Eyu*9Txr?28Dp+}sXOW$SM==}wFb4-v zO-knGk$o^n_CfprKO{vm_Txu*fwUDPgBRIXgqJw`e0Y!Gbhu@BWK_y{+5D{}?`36W zO10uBeV4>a;*4n#jr%!=*z9JhJMb9fC$K_7sNo5$k#IBS@gXFn*4yF~y!X|c)Of0# z-NA>)j=U~C%#oI4s)T}-s>HRBs)f7>4&aY@u*$Fhy^+@g4Gzs8l2DX;VW?_KMcBXBSN?fJ-C;j$B*)(>j1)d z3jJh$fT?U9Uc&~w$uCxsHcw)djWV)@NSqv1ZR*^`ce5e*7s>9eTs*vGMz>@}!BP|- zMv#Flm6Ukr{13BbtbY&Q!yL%aco*LH`NYRfNBH9~BmZSi<`Dleu_d>UEfM6W1SqF- zLLxDd&4%YOS1>xKLGXD2Q)LF9Cj-o37HcLQ7Z=bmk97#xOt@#W9&BNyh;W~xm-WR4eqqUKcdTEHvFYe^u3d&W?~+ZZE= zxBJFe!!vkrT(SZB1|-Qqis;iUG&^u7cHwRca5vM?eK-#fQpk_+16}M@C4HvHIfnMI zpu9jn#BR(KLgW9Og!oFl)o!=@U1D;G&qaGzp0pVYiP(9VR2{&c4Uglou3S0k4%+3U znh#bv3DsL7+v|HGgT3pPwjLF6EA0#(#rd zj&59$+vf(JR7Cj@tc7fU%4zu~L(B4~RH$o~j6FYW9yitIPh)!!V|)gt_sSRMEse$Tsy*#E@q5BNJ B!9D;0 literal 5141 zcma)9TXj$a)!ytg$aa)OB%3*WHL!0&{zqiKnReMn@k98YE2K5LozU#2{R{z zV6SSS7tmU(g0{7>l~`ykU>SsJu~ks<+Di4o2Osp^=l1&|{(GM@lbj?#lW)(Nwa?mX z|7)#(t-a^k|1P};U?cwFhYM~M9t~dPC@9>kAJA)Kdc423WA|PoVk*d47mY{FMg{JQ z%I-PvVU7yFhFoY07Df_-wZ=hxa42TfHYElJ^?2Vlj+l{D;7ggqeMa0&(QK= zhanBss8Nt-#FL3wENsPScHA>jS9S{bY_odW-WjCFV*F`}TjViqqg{WTiy7Wz4{ zL}K60p*i?G?osgt4QtWh4CZLcGzJ-k#4tlS-`YQ#sO@BoO$O7@2OE4?uV6uw9$#UW zC5=d;KOQ|~l#vJ``F`As4JtNj*n}npMKbM915EgkFc*tY3uGo)-MMJS78P4HY(tBJ zd?$C9uBd4wbu&SZ6<1VRASJb0?D>XVY)7k#HVy6QP!O23kWnEDCcWJ_NIyyJ90j@B>7wV6gUmpZmM{Yz@{2% zl4amW4<6F+Wnm|mcC6W!J{1p7+qlar5kGpdTSFwXu|3_==L7ki)6}tZN4VJsmWUee z+PS&8y~~Fvg|6m}P1~Ax2tMu85ChX*uqPVtv)6AL70@fEGCh-^)~Tp%^#%bWp2pmRsZmXtUK8_n z%;k%hG`yUBVP{&t_@RbZ#S6b!(V0x_iJB^Y#8Apgo6>tX4M$^rM$(TlxJCRE;@e3L zo7B;o5M+iZFWk# z5GT<(N9r?tYh+uzwPuF)LbLpqHf=fy#nrZ(ljq>Hl?~J7%5JtJ>trfujmC}k;lbTT zvP<6`qc4HhL`08u>&d8)?MaV05akiI*x^@`<7g(5V&~G)q0I7;=@4%gplL{*YFVFe zsWllx;by*Z(1;A1hK-eM92rQ&CdGhdYYMmMM=o2DICnbrBwI|;EGHl<#n$1O8#eXG zzBYYG#!AIy(nuWVj#yomGdkVS=k>Z!icdYDhO2M zf1aPkTmj6Xrk|g=$fw03T1s;^XsyQu{G1Xk*?7b^v9mxq zPhxW8BEOdrv!!*0NGz>$S*^2tYk6{sZ{I}|KZ#T6<1RVWzETw^N@IRo$X(Z7z1HKZ z_m+6lSah1N(9hvHT=ViFK6_C9(FC9OrCu}t%jeodD?KOq43>BTcc!uQ1nS-O-f^s? zyj;rV9wC=eULoaTuaFBVS4uf2r`|i?dx|#JbBI6T#}bYpM>WUY!H}me=8O~f>!ml{z#{1l1IdX4c19DXOR1~ZDKziLVX$zehzwuAy3|G1#xKm2IKsl|gpaT^Mp%S%>*(!cp!?$8s4 z>yqviz&!y?MVE^0cYVr9Mcg`O1)g^k;5`=bFWnCKDq622@YND-EwAXS zcrjmtdmO-ji{H%v{`)NOYkcbj-ZKfDce+`D7v2PTuLWGc9q@JBay@}J68OE0_yz*s zMBq&h;D5j$X8`|G7Wkj})(N~f1KcHktk}T+O%oz*N2)w^ZLUVL-73fy&bcpL%U{Ij z%Ig!mKH#(Qz{l5xyet&xlbl)VZXCzrP+*UgiaeC^LxBM)dA*HGM8)y1&Uz3Iu$bdc zj%DL0W_hu!f>omI_NEbcl$X`Fw(`E)LS}Er0kq*TI%NckrKuxXrX7)mqey-Q;F~~* zHKOF@`4_ufpRkj;#4keI;Zu}EZPWyrh5hZKzK7R(s;^=}iRUT;)uJRu*=o{w)Gqrc z9Js8S2(zPgv5R)IzwV+__p?lUxXVKl-x_O&EWR4M61Xb_wOm|XA#1`-8%rTb=8@>x zb0@G|RtI_J5?5mzcekCWLc;zk$KgmzRYe-lh=$~n)tWE6+QaPgI(^ybchww#BwXqX}#jW%i@wLZj0HtKvqlYojbmh`7Q zS6t#(#4Qk84QVFgUWu56cU#1d5b>i#{1_2GPApFl@ske3qTx(O{I^>m=Fb}&aTWbk z#F*r=cm+HqHxM@FQ5EgR4)|)o1AHvvl=2x_XqZ X9&@-V>UFxS*Kg{of{%&Sg}?tF#j}}9 diff --git a/homework-java/target/classes/com/example/Menu.class b/homework-java/target/classes/com/example/Menu.class index 8edff5ff1edcff5b5536163122a3eb483078946b..ee4459a4e3e093735d84b5acaaf9c7ff68ed2ea9 100644 GIT binary patch delta 1940 zcmZ`(Yj6`)6#h<|WRuPEu$>@9C|fMjA|+S`l!79ZLOTS4O-rXOj4a90rX;&1*#H$Z zqWIzs>#K;ORRJFe1t|yuDn3zBK@kOqKhEgj@JIcHAfDaE;W7GS&)$2^cfb3c$L_xT zb2p1e|K5KHzy$o%DV8`WZZ6ICn@x_xbjcjzEKG}X#q{c6ARsq}YHBA{Os~1OYSL`E zu{>B?9jdU`qC6oKs+uxgZmg-8P+nP4{U3->Ww1`}J`<8fIS>p^t(}o^Tt{X@Gk1k# zzCQ!bxUSV9$~HW6@m16r&$XH|=o!_)$yGJ7fH1p8xXli=TyVv#X^oJr+9xocN-iqJps|9u=wa3|DctF9$gfX&Or)Py?Yy$WX%brzx#9%G{VLV262H7*2;w(XG*YW}AC3ePC{O`|>{| z+(<^Isd6}>Dux=7t$fIhkIm!m!ako8dUa2OOtKP*sFC4r95p4+P4tCX2vxV9jM=h9G}xM$BcN#_jb(LkI6t6`Yw0U*2`PWPVYd5x_mC5 zvjcS&)Wy)V-T-Yghe=jU@CiOw2j*EZfnyC)AZ^h!chd+=({7&|wjWX3=djMS+ZX4w z@Kv{VA-~Lh0I~X#E@=ED_(|=>;xbR3C(qr5C44^Tfef+>4|d^^GBHogdAtiNHlinM zumEcqu=VmbE{lk4SamsvGV`KTkPadbb?ArL=noYGpkW}EK;}mT7n=y^HV+QTSJ+ueabPyprf?7I-nRFH_=ohS{ zKd_1}VKtA#nk+XqWO;cWtOoy%zMRNNJcmu(c#Ttd9xrh7m%xY3c#&H^hT|`xgWG)u zw=pigiNohP-@7%dNoc9Cfqk5qN`Z=V8e{Y`0EWQ--&&gXMa&D2<)yX!o3%QyhwAXQrJBq6Be$UgF0Rikp2fW^e;-qo!gHCEa|w7yfFNL*fI-9!xqw-h zn367_A@h!2L~r^Fby++J`%!OwMhEaNQ{2VczF{c`ZF|_Z@7wl>Z9lT@C${~}wx8Sf TOWS^h@0mm7^QTzi8RY!~W2x;# delta 1233 zcmZ9KU2GIp7>3`kJ2PiGJKNPZ+jd3Tr4$Qwp+D#vDgxR7R@w_}A!3bY=nhM9*llO0 zXa!wGRPYDTBPb$LTCrICp@3^yw5TM;5HBz$UKwspjF(=KD1JL_lz8)=bH4MQC+|7m z`F;LWjdA7g!Zd*Uae2~MtjL{#W|>khQN3(X>zC@-PN0~93x$Jvd}J*^X2? zh`R@C%deH9&58>3mlf! z#uEBat~Jv1k<1$l?mETr9^2~MYP&ItS;?fGT%u!wP(|KMIUDP9ZOgNhu`L<)==em2 zgY}i45yI`6AvbH^bncAo2+pCi(he@DI?v>8ZzyS}y_+0)c_KKsY|6j|6a+4sSctFW zkHMemk{mG`m2U|(vc;^DVN=LIOf&fmN&pb+EeJc?v~dKA zw+^6q>nmuLUU*)v3sG#qZRo}A=)+t%sKqd1?5V@+sKi^S#|ZAgDKuabi*ON*_yKWT z#bW%zPkIf__zkW26H9R&cay*(3gI4_gJm=yZ4}3HO5i?f$4XjB;5U#6QWLiLXu+{+@iy-Y4p)goILv7N8F+_hVCVOE7f1NtRMQ2#$G#HGqci@O z3?M;Aag+lpn4}oq&lR)sBb~%Co@w}i0deRz_#&FXaRDKa5vU{nqu24sUreI^MmrSe zc8>6w5}d#&k1P0Y{JSyc>q%e7ef`+i)4qP{>*uVs#9b{OIOppZ_?jUGucz@1zC-jM DIcE;* diff --git a/homework-java/target/classes/com/example/School.class b/homework-java/target/classes/com/example/School.class index 5b2d741131fbed8cd47114714d0fa58d37635a23..ff606244ede8ab7297707f9943c4d9ef0e91f124 100644 GIT binary patch delta 610 zcmZ`#%TB^j6r8rSLb(co+E@}J$U`hDs8oEQ#>B*xZe95gegSUWxx7Cji5p$;0dCxx zxN&9TUl`|J2v$wgYRm_lUqsCg7cDjGl;9dz1YnG}48O*}N z9F~wnh&)#K;!_1^p@~)gRj0fSej$4*adt|MVu|np`PL&!CN77>CX|D#-wNC-#uNpb zR})ErHLPpN4YWyCl5LFvTS?wewH%Itd99;TkT6MB)|?J!o7iHl%lFJ;^y6Qpf9<#b z)P5UXZWxHh_Oj#p`Zi;?MxxsecY4@WZgh`d!ArP8mnouz6nog$DGpSMvwv6c{$8P% Mn5$2nLw%2Vr6%uN3L_sJgs&fuE}0tklC zqo5ak0z5M1xa0ZfK)P(c!@He&g8%hoEi zGV6>!;)d1D%vC0D6M?2yvSCaKBrcnYMuLfwx~3(THO)v+j#f;pYxZ;mhcF#NM!}0X z+(6bIiL$CPZrSKa!DF3TjB$sLDmaGY0`ZEvs^v_hpxR5iU1HC&RbmsE^rzqO^%3!= zB##pcUdAijU`xNp4Q4&e$?2?u8NABziYC)e&ZT_r9?%F*;dBUR6r4q_9hy@b%w|n3 z*R?CRIutcF#23<26obHdncf9~gUPv#27VcyPZ$>k#!26+kgo7!JQ7F4c*EVNMuBZ& z8pKh7{=B|osCK#5tHis+)C)A;8~CYwYvjKPd-DX=Os5cDn&LOB};EZH?VAMw8PS?woaA}8<(Xw zqM&DCYxqe;4z`wSB+s%bXcu%@9#MDKr{xXF(|Oi3ZOg8y)k~UPGK*FiTx%$jXh2V> zc0!yCqt4w=>=%hc2@%E})?FmwrQERKok_pOs_yJyA3loUV|)_Ar}F%MCNR-@Ds*Gb zT;*fpTnp}vbwMrIW{sh~_1{&Vp)2vCY81(jyuWDV)Z}{xH zTtQxloLVmDbz75k=L|!u<;tqXhbM$D1rBV;shiXg?hEXFx+$yF%?tbZ$_03>_ps#y z%w9mgm%IrtIsMBV^IdF?uW-yKu{pkq2>ZP_%=S%sSP0Srm`Xo_NKZXPDE&LOU3-MV zhZt&ghg;qFkIq7Gu^mMp+bG2-=;s4Ii~)>e5NQk{&o4XN&{)9R9B~mxG7l>jvE&Ij zM;j?XN&kYOsmB-%V5zl&{Br^(7-b5rh)Oe}f_HF@kp!;e25n_Z8D|Xi%7{O3A^<72 zkJG@26Gn0Ry4{(-UehEFn5r8wn znK9S!C4uiT!LMUIH|5OOW1I}&H_Sf4Imhz85D)(QOJ*2!WbH+W{aqwDia2&-5_@o* ze^;*ZcahuO$U2E>ypInY;Y*(IoAitz82<-D;&1+85KytqRwm%*8sCKLesY~?uE0I; zaV?<8NCH|{uJKN;lbdqA#ULwPxyJomU+dsH=i^Gl4zBSna!oU*DRMnTuG8e2A=hbg zJ<`m2Yg|jvyKo)egzGVKJ>FcQo$GC^I$XvV9uDNE`Tj3gn$x02NiVyia$|HA=N!6UzcG@+ky^GKJ OU0z&Y;46HMUH=2(BH~E^ diff --git a/homework-java/target/classes/com/example/Student.class b/homework-java/target/classes/com/example/Student.class index 7262cef49159e479fae872ac27339dfe4dc870f2..075e98b2deab14a16235e2d1cc9438ba0f43c953 100644 GIT binary patch delta 1399 zcmZ`&OHUI~6#i~sGYmz95}*~yh!1Sl6i8e^f{K6w3W)UuKCs$Rz&?N$#Ah}B1Fj3> ziiHVVn`(*p+PTn;i7{?ny6M6npm^?`u{5MidS~W-_nh;6=k%L5_20eP=fA5T0CeGT zM*D43RUC8UIQsYx$L>B21301Jq#J{9GgMzs#Dc~`I5r(Mg58O^*`&ds+%!@{;h3Rf zn87`iNa;p=HW7^)k!moExY3N${D?hSe}EB4ngAgtA}km5i@B z&hc^QP3u%?Ob?~zB1Sx=_s4G}v;&)56#Ooqd#d;M=;qa-Gg%<> zLKpfZXkzd3AD8s5NMzPXCUyOPTy|OSjkSa)qav~ZKG)4gEv(Xoc@4L*px};Z?Jjq_ zzOe`Vrz_w{Gc@uUR~;XADSW@upq!(*+Hjr^D?#T48pbGpqO`Fwo>O*KUZk@C9CY7- zOSsH`DSmyFc84j0(X%430u~75pu9#!h5#GJc&qB!CKBCdh)9$t+T9Uda^p$U7i3oY1<|HK|BxPo!mDYDI~8KVk=cwNn9A$i1j+1mx28uNTHGp z5tEGIAnk-!XW$hoUeXI`Ow+?9QNN@zr8+GFCaguLqSNARpOsxmK2S2*zzr+;5OLW= zbYS0W_^kQRUTcwXE1cAnXtmZ1v-pL!25hGy3^%QzeJ!hP7DF>tA1p~cfgVB3E3`T} zU`9{i*Az7@m2{DkqnjwHwUp2&Yz?n? z@>Ls^^p;d|tDuB8l{d>7R7>~vlQ{;+WGBfwgGCCwg^7FVR9H$F$qweB*Jwe?A_*53 z@(T;ms-jgxtB#iM6G1uj=FqYJn6w5yC;K9W@0KFVIv2iX7x1)Dz0Vkq%HS1v*naAmJhQ z3-|~SL=+Prz+3e}xHcNs-ZLppQ!e&t?Y-9jtuL zhA_;aY?-;DHMzvlb%mb$zOu@2k_h7A=*_^vwTrU=EE5&xgK@>FDa1;~;)fS%%{$%fXk7BTGKC7gZNlMR$ zhy0_G3``OHH2v}+I=$k zkfyl~ewv%fF@_Lyh%h17L4=X-YNTbF@2Pipg^!LP&8<+;h6a+;(Sa^pLN_i;e}T~e z1yAuzM(_0^>7+A*3lv=?)aQ6X46_vJJlJ0{DHM`n&J`nbl1_p=V0=RD9&LztmzJQk zCdyC)o&du<7U)*wUGA-W-X-VjRh?hL^qg;#mQTDkt{y@^t(Mj;%{>U9SB8kX&pds> zb`dQUgyEG}w012T7e#ZaZ&Vdt#62O*=d~tTU`41kVp%1d53iAv%&pjm~fJ9v=|< E52{I*NB{r; diff --git a/homework-java/target/classes/com/example/Teacher.class b/homework-java/target/classes/com/example/Teacher.class index 5d51a8a0588e6b66fee3ed0c8f6a54ece3647659..9b08f4139dcf05e3e6fa1c04748ceaa83338c328 100644 GIT binary patch literal 2235 zcmaJ?=~5d<5dKCIS|L^(!hpd?Ajq+_5X%sp0}&h>LQo=bVqu8w93ECvutwS?+L6ot zpNB}LD$kG;T)|a&fV@W@BS+8dg4Q6XC}w9y-Ti(2b@%R{{~Y}R;1)z0F~kidOmrd1 z(Epe};l(<4cZzqm9}8PDBo`dlk&6uRd|@+<6uJ$hP4vKI7__}cQ9R|1{kkY_2yX9+ zCd0^%a7B|#anE(WX^HT@Tw^$wFI3tHRoQghol-Z&>^0Gceui!t1X0G>v!)6@Yhn=R z7z|&?b>0vRL;16o0o7p>BREfC$+pVty!nhFkzX!s8W=lHwk4f<@h*33UL%cB#MN@i z#AUoj7_N9K%Py&q$d?P{ENM1j;&n_?k`2BmmOR(ya?6pswDTo*rLX9eUyCtwR<4n4U%*^*s0vx?K>?P5DHGFplOdzUI{uX*WqYpVj;m23Ne8tm6&@)6qKWIu zInHY}rR}VVx0JRCm()@hH%z>Zcc`*{C<$B6g5f=t**rZv$Qi*3tG3)BM*|BC18vT$ z+~1|F(kLNLMW{MEE|;w)m2C3mycf>KUo0^UcVI%rqg0l>8b#@=IIdW4HMT`_gKyXA zCR_1rUf<+RN1emVgxqzMVwDcvN+?NJM_^!OhL}U0mu%{GIBCI1i;#V$D!IM4#`nYU z=8lk&9yjP1^kp~gj=PSAXPN3Jy+A(NF4*;Ou+mkp)wIQmqcSkVP}h`<)T6gOPx`XS z_t%8n^=f_!lz*(sQuv%v+41ZxzVQpb$&d@`jU8%#zTBz;7e8CuNZRe33S{i z-kvB1oPuUv;kNYDoO~A*KQs(Dtdcr);pZxzx7XS)ovmHu<|W6CXZxaq`NN3)aVJNv z!VpWmUavY*PzB7gOD~wEI`@6y8z7mkoXM#ZRRcD|<^MOO>IZpYf<`4q6Q7`!UQV=& zsX@|DnjdsY47{`9lo-tetMt zI!sO==Y)Ex(%%3wbk~a|x*ew=6avfmke+I%C@{TKBw`ve8A9IFXAn#TvJKR$gY^+m zzlKo&rVf?~0b-g$!2bsdrufgk!07$wxUe=o5dZcN7yE0E7B3wUGgN*-Zt8dBWBC5x zzk>a>7`CQGO6nq=lqOx)Z^$V0m_}E!fQYv9>H+3X6S+=AW?n%=wULtV(-TD&s49v`mgJmKlG6X&5#9w(%X1^b zDjO!3!e>?N1`WN}ZgTlkvp)L=cr IHfk9C4=x_OyZ`_I literal 1668 zcmaJ>+foxj5IsXe7Q#Ycxht1|L6U&1cZJ{u5-F*Q_`t;npN2363!7bPccA1?{0p^8 z(Bi=l@S`kyb{AMk^dURllkPsJ&-BdiKj*&yEa6QWEl6lc>S#rZp?jYnbJOO|uK9j@ zU(_T+YSD5m`H~@#FKngJhIS2U9Uagax`OZ{Y1!uH=4yo@?Qv(vt%r`0FI2AwlvI9~ zjtsgP+N8TKJp1tUL#F4hI9<$7K7#sxyI{)p+Daksd_UoqGJ?eRF-1bxy`*3hGf1{*ivM&Iwlm8 zq(fEI#vL6wOp!!>6v`?F$vUkgj{?JBogav@>(sdXV97nQe90Z@Gt4(3&`7Bg$ro>k zVW3Ga5hPk=cZZtGR4qrW9o4smx52k<+A*qbjoVw?vy>lgCgq+*O!})$WGyl1yFx}H zD`_=yL+#qhx=@BDLY?`#d*s!`ilwmhC}~a|Jk8Ux>q=jG{P3NSd+v_khUW|us?8jKE9G52w46)zR zXxhThRbBVs=&;nNcWmcc;>O9LXcGQ079U=gQvAT85@l}N>y{Ks(^bb2UfJfpFMJJ4 z3{wp~HKVGb%rN%(CFb9)XWhqb= zSPHf!08K@pOMwq$u7h4dbp_=z1l3IdJpqIsl*>dA4EO23um_V?1=U*oj-Ib%v_SDy zXh2^qx%D#nLDS^%o5@2>lj%K)kY5s%Qae?gImP%DfAy{cBP7^pP+=g9x|Ams$;0pv zkD^*8#awhT`GwNsU1XaQp~vcyNFtCdRh&M>@!|;HEr<7%L-cE`i4Z_a}Hts~Wa>`aQ!d^3r6z#xg1x{tHtcMOFX+ From c5a01ede4ee62c033f1a873a32993df06afd71d2 Mon Sep 17 00:00:00 2001 From: Gab Caser Date: Mon, 21 Apr 2025 23:07:20 +0200 Subject: [PATCH 28/36] Better formats --- .../main/java/com/example/CommandHandler.java | 13 +++++++++---- .../src/main/java/com/example/Course.java | 18 ++++++++++-------- .../src/main/java/com/example/Teacher.java | 8 +++++++- .../classes/com/example/CommandHandler.class | Bin 6040 -> 7401 bytes .../target/classes/com/example/Course.class | Bin 2610 -> 3108 bytes .../target/classes/com/example/Teacher.class | Bin 2235 -> 2418 bytes 6 files changed, 26 insertions(+), 13 deletions(-) diff --git a/homework-java/src/main/java/com/example/CommandHandler.java b/homework-java/src/main/java/com/example/CommandHandler.java index 8093acdb..93fa441f 100644 --- a/homework-java/src/main/java/com/example/CommandHandler.java +++ b/homework-java/src/main/java/com/example/CommandHandler.java @@ -159,10 +159,15 @@ private void showTeachers() { } private void showProfit() { - double totalEarned = courses.stream().mapToDouble(courses ->courses.getMoney_earned()).sum(); - double totalSalaries = teachers.stream().mapToDouble(teachers -> teachers.getSalary()).sum(); - - System.out.println("Profits are: " + (totalEarned-totalSalaries)); + double totalEarned = courses.stream().mapToDouble(Course::getMoney_earned).sum(); + double totalSalaries = teachers.stream().mapToDouble(Teacher::getSalary).sum(); + + System.out.println("===== FINANCIAL REPORT ====="); + System.out.println("Total income from courses: $" + totalEarned); + System.out.println("Total expenses (teachers' salaries): $" + totalSalaries); + System.out.println("------------------------------"); + System.out.printf("Net profit: $%.2f%n", (totalEarned - totalSalaries)); + System.out.println("=============================="); } private void showCourses() { diff --git a/homework-java/src/main/java/com/example/Course.java b/homework-java/src/main/java/com/example/Course.java index 22ef0fef..a5a6354a 100644 --- a/homework-java/src/main/java/com/example/Course.java +++ b/homework-java/src/main/java/com/example/Course.java @@ -80,15 +80,17 @@ public void setTeacher(Teacher teacher) { this.teacher = teacher; } + @Override public String toString() { - return "CourseClass{" + - "courseId='" + courseId + '\'' + - ", name='" + name + '\'' + - ", price=" + price + - ", money_earned=" + money_earned + - '}'; + return String.format( + "📚 Course Info:\n" + + "🔢 ID : %s\n" + + "📖 Name : %s\n" + + "💵 Price : $%.2f\n" + + "💰 Money Earned : $%.2f\n" + + "👨‍🏫 Teacher : %s", + courseId, name, price, money_earned, teacher + ); } - - } diff --git a/homework-java/src/main/java/com/example/Teacher.java b/homework-java/src/main/java/com/example/Teacher.java index 3fc9dbc1..cf69ab04 100644 --- a/homework-java/src/main/java/com/example/Teacher.java +++ b/homework-java/src/main/java/com/example/Teacher.java @@ -51,6 +51,12 @@ public void setSalary(double salary) { @Override public String toString() { - return "Name: " + name + ", teacherId: " + teacherId + ", Salary: $" + salary; + return String.format( + "👨‍🏫 Teacher Info:\n" + + "📛 Name : %s\n" + + "🆔 ID : %s\n" + + "💰 Salary : $%.2f", + name, teacherId, salary + ); } } diff --git a/homework-java/target/classes/com/example/CommandHandler.class b/homework-java/target/classes/com/example/CommandHandler.class index db7cab3a663f318629c695ac591ad90def8dcd66..384c9d1ad108238906dce2593b7a0beae1a07a03 100644 GIT binary patch literal 7401 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 literal 6040 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 B!9D;0 diff --git a/homework-java/target/classes/com/example/Course.class b/homework-java/target/classes/com/example/Course.class index bdd1b4a740749c272bd6cd27092d64e36cf6b083..bfef26dc4483e257a082abf43c0d9e0da2868c79 100644 GIT binary patch literal 3108 zcmai0+fx%)82_CFvLP%)BA{Z`MW8~U#-eS7P%08FX#-vYShQA`53=_7waFW))4Aqy@oGwiv2m*4rm-}jyT{`a$A0gT~x z1OWsU)TyXPh+)SyeN|5sbaOFrX8sz_*$kl(!!+zshG1{sYy@F6D2S+Ngvt=hS;Yju zp%+&QJTY!nN@dQ_zQ|2p(rrFt8rLh_*-qyfT6_C4HTzk+WSEP|2C~?!B8nXh;hZ!f zWMlr4F%>(7WSyxOxlnCW(T-gV^(!SKN6uL)f<5R^uvf(^*vHT;JyvX^keHcCrx+q7 z-OO7>XA!GH+7L(z{R1jAalf!_IWQF*tOiF)o|iTv=tNL_dQ`lMLkx<^Z`f&*qE^?N z?n}og#(gT{=x5kf)R!q1W=^*+81@p)%C>IWWrj8q^}p?FDh?w-W-Dc$Pv=QC>Ig~< zS#BpA@j3<-993})Z!k2~E=#8}pr)-Gru5?R;p8^icTwoSrQ*0y4(j>52+U%`xFFRY+|wonQtgyPs%hTC z`#=0~`>XZ4zpVfEqvqmsj7ZxUM@qpd6{qoTHNTSlDXTJHAUY|ldZEJ4EQlH5N_Xu9OIFm!n*z$H>dJMw3*aK1fo1vqai)D^FIU8N=jLmEt@vP3tlYv5b|| z3$uF35Nmg{&R#NzSgo5l;G~Abdz(wStC%XNwXop0WW zkc`V8s%7dLe#EEdLW&z=yL)}5B;t`=!ELLNEH%9xKWzxUH9Dvci)0g>PFj{-woCfT zB)6BWd^rpXcwn4GL#RZsijNiC5dGyQL$~CIB(GtvTFX4)u*YdRr}dm|l}PLxZwOsM z$M^)bv;r@8XDn;EvXXq6I-Z?Piqkh&xR3b%aN9L8t``bf!{)>QHEq(nF<#KiWnNbB z8AH!Yck+X(;0uQR|1C=FbMA#s>Tm(-%OP}#<_d;$vBaXhjR! zXs;c!w5yR3GJy;DfJQMB5SW|^5CQ2j|G*iTMtu9~H}J>;qb&Dbkl zsM1{2brBHnw`=ZOGAC{@_#B;cPtY|v&=UOeF}io;ua53}hF&1^00aF$<46E^{`u3H zzZt-V{(Gbqgt%M>#S=I{vF#-22Wj0!FJcdl&{teAF0ZX%4i_c1K^I2{cH@$~YM5j` z#AU+r5y>}z{YAzUGRJUb1FA@uh)R9@5n6=zfb=c`0}OcXS?}6sxC)(4MW#kcT4r8m zrxq>o69|N~p58)%wcU~0NJhv_2E#mZuB`;gRDrbqL`q&D$9#e0i7HhfK^cTl{Lm(b zI6#gQkfCjW2rh^SEciyGX=_AAe1RRGfGzzVL@7^YL3{!93TRuP(g KiqCNid;SFoeSj|j delta 1071 zcmZ`%U2hUW6g>moU06yHA(XZcr7;bNMErUX3lsz@)wbH!FZ`-2tO!!7peDu`;t%j? z9)0x(SZia_CO#XVH2$6%?+hE-Q2Ma5vv zVMLK;xD;8a8*hww!)R9HtFKzMW|c3izFaz9^5g;_WjY8vZiclV-IE1M}63$1T7&9`f&(Q2BN6npPc zQPE-IsfMbs_Kg2g{ti87nC5%Rv|YnG|E-?)Dj3IU#HoSH)Q}B1?$@SVZu(Y`r?tR~ zT7=EjVG=J_XWk`?%_7K+bNZA6}oVTc$jXMH50! ziGG9k3vFx=zEoL^9q^-A{0z%0SfS$r!O{e`33&9>HoTj?>${kj)PH*th+fW{y?zH>N%4n^SZk03eF z$=$&Txci-C$Vv7HCmt(-Qa1sBuju~peg^r0%J;e%@Q?ba%&VJpk#y#d(3!D14)r?D zSmOH(zG7P czvCeu(R+lhlnJpWR|7Sw>GWMk15J$m2d$)nb^rhX diff --git a/homework-java/target/classes/com/example/Teacher.class b/homework-java/target/classes/com/example/Teacher.class index 9b08f4139dcf05e3e6fa1c04748ceaa83338c328..9f92485569365911facabae8694da8f627dfc740 100644 GIT binary patch delta 1090 zcmZ{i%TE(g6vn?hOgnXGfl{S{uK~fp5UoXm(kiG_1g)SBJ}N#Ka9Y5OC1Ozp0^IL7mGRMZPg4Ul;PsLPzy7XEbFmsmXd}3PDG|3yK zl~-DS!WA{ml{ZW87c|4nnuTZLD5fxBB&KFY zvlfFgYi4Jx!8F6Z=0r=9N9+uUtJL>J1wDQwaLGkD0YG}$kWds&Ukic;jBBhFOLBdrFjNeJ%7!g-aC%lCQ zZ_gahse_l+8u+juA=J{o4##j1CviyR>qHAd!42FL^fs4NNAU)#h~5)KZWCz_ z*l&^)LNVNNijf?l9q-(ue?VY?{!qtr^zaI`en+bww*bT4U9+QZ_EvJ!uE`NDO=NU1WiF>0h_?xvCArnavkW~|}- zwmZ%=bkO^Z<1jjSt&9MIM%EbzAMOh7fMy{T37EuoQn#l&Pe_Y2VkJP>z& Yh)4AF(dj7tMleo0KHw90f*fl90*1w;^#A|> delta 891 zcmZ{i+fEZv6o&sjZD;CG3T>qvG%#wxT1bW}o(fb8sGt=OBPw_tVFH-SMXe@!(}$P` z&^JJW!~_y=O^A0siQa4c_nyHRgPCOQ*=w)$|KDCSKhirXbNAQwX8;v=8>XT4r6F)W zfuksK%~zkhuU)(5t}WY6qrSSf?0=7D#FXD2>F630NU7sjjn$ex?Y>-byoQO<&GAT8 zl#Fz>!(^g;%n~kk#)y^=~yuF01pj3lHQN~_t9@r zSD@ej8tso5SoGh;<}zh+YPbNCj4@nftoVkWADm!5%M5rDMGF#qQfOr^iAiQHL>N0U zg-iZ|-X|*lTfNtoT}gG)#;$hNBdZhC1-n_zRa1J>>5D$uls!Gr89NZCVg_B@cVhsD zFpR^>tw6O53|z()rG7G0>S66PeFQrTn88(QU!&3ih@VUulo6;Z`wG)GcM>F4_=wgI ze9O*TfjVgG5P_q$r0diMDYL2&c)j0PFN$Sn2S3aokd;azMw_#etR`jLv_; r_$G3aO+fw*fkc|zx4F~c;11VhFJI?bGNj5OX&U$6_jG> From 42e46ebc2714b2f0f6de72e9b5bb7950fa5d701a Mon Sep 17 00:00:00 2001 From: Francisco Farrando <121203370+franciscofarrando@users.noreply.github.com> Date: Tue, 22 Apr 2025 11:23:25 +0200 Subject: [PATCH 29/36] finalizado --- .../src/main/java/com/example/Course.java | 4 ++-- .../classes/com/example/CommandHandler.class | Bin 7401 -> 7641 bytes .../target/classes/com/example/Course.class | Bin 3108 -> 3032 bytes .../target/classes/com/example/Teacher.class | Bin 2418 -> 2555 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/homework-java/src/main/java/com/example/Course.java b/homework-java/src/main/java/com/example/Course.java index a5a6354a..89d2e492 100644 --- a/homework-java/src/main/java/com/example/Course.java +++ b/homework-java/src/main/java/com/example/Course.java @@ -20,10 +20,10 @@ public Course(String name, double price) { this.name = name; this.price = price; } - //Constructor vacio para UUID + //Constructor vacio con id public Course() { - this.courseId = UUID.randomUUID().toString(); + this.courseId = generateUniqueCourseId(); } private String generateUniqueCourseId() { diff --git a/homework-java/target/classes/com/example/CommandHandler.class b/homework-java/target/classes/com/example/CommandHandler.class index 384c9d1ad108238906dce2593b7a0beae1a07a03..bd51d031fe8715071db5d228f0f20888426919d3 100644 GIT binary patch delta 1859 zcmaJ>TTmNi6#mYJWRtKY+XX_C5V{mXxMP7*E(Ob!w$l+q2ioaqA2g*4MFU}yP>YV@ zi!VOtO!v7n)_Qlm08U4k(dmpj&e)gwE4@kU`8Od}JDQpN`~T;h?>pZ) z|Jgm?@ky8agX@cL1L&nqv+g~vdM8d1O1s5R-?}~88{NFUw_hLJvSVOyr*4@w*l5>Q?Cp+HjjiS-1r9H%J@#fd3;Y$ z?~5IXHN|5SqfLE@sl9Q7ARmaur;LFSLUDCpP5;dSr6QusjSl>%;3xb{a7-r0Cej?c zvDzH;)VGW!nsx}wP&#SE#=D&Om8Dvh{O2-%*cFf@qWOhJq3Y~*G`pg+)H7Fs&I(l8a2{Gv3M*wtx~mlS_#ISR7(i$ zOr&FReQaVlF>dH1$;7xmoR~_cj1+f-oK#PUWI~LClg0$w_3E?{8{TguQxQES2*-?6 zjR^KSsL@SLbel};_(rJN{IK9XPpg~OQ=3d16l$lA`DZ+Zl(&%(HV3>RPpYy%k+^?q zQl=hmgD{ykHPrGOkAQ^V`L96%A#=XKXYWnti}0||jz8GGWDcoex@1nPLGNWo*YX?y zMYw{i=25kL!!2d2S*0=7?4H3TclP32BFmF0!;k#oM}sv{r7xG|EUM&%;x^6NT9EK7u50 z4vsmSEBLI{dSb33-+B*;dza9FMoZdm-*zTG;*0EBAqLuW(DrPv*hZpeiK&~dWHuC_ zE+fFIUV*fXCK;PreL<^_#3Pe1b@{Ezj?gG&rSHW zqL8EY8W3T%5(735hrNetXZCA_mS=_@=DV#FT{4$O!I0c-ePg%htKjMw?D zXVJ#p?Z$kLRP;fN?!Wu6I@1Sc;n81)CS!r$rK_mmuZ5qj5(Oy8&uZAIfjeDFE$k^H doyx^-EpIC*V!3LpwT?PD+|8j~)J?a;{}=F%X+!`3 delta 1720 zcmZ`(U2GI(6g_vg-PumJyR$#-c6VFc(w4ScN~wiXX-aHbgCqovMq+ef5T{k_KHGz0xGf zvG@HUkrwL8c<;Mlqs#p+H%x3%i!tAf;=5yK#1WYijVLIV=l}wUkBqFZiickM@NN@c`FmDmTBv$&}O23 z8LHiuM@=ArKk=8%y2HWmz~45$hIROdSwTDKQbP;Y*y08wTL?T6X>fpn zPN%dp=aq^naT?sX)o$iO8Jcqh=B#*SlqAe#7cht8gd@TB6(%y!CEGiWxC;|PD&t}V@t<9Ozjt?444J~fXU>5hSe z9PB5csAPxKbf}niGvOJxh-hq~aiV%`L$*ghrifUqwOUnHFaw-+Do=9|XL)YU+8wK* zBg%s4=P}gExuFk|JaY>P?W7MbQ#dJ(?)D}?74r8=cU5tC;ca10! zG46rq;KB2##|t#``w;sur=^(xJ;`@a zHi0vONnSimz)Dor-`~)*XA)lnE3>>FnuQ_B0l%o(uqqu3Q@Qhz{ zu3Qv&GAD4Rs!-tT6nKIH-=M%ZDexo(zU5$2p#7SZk%a<1|0mEi)HhQZ$%dlx2gz1e%NkjW=zlNnS>pfz diff --git a/homework-java/target/classes/com/example/Course.class b/homework-java/target/classes/com/example/Course.class index bfef26dc4483e257a082abf43c0d9e0da2868c79..cb3b69e469be93b31278f043401bee30360a32fd 100644 GIT binary patch delta 1429 zcmZ{jNmCP15Xb*-CYi}H$ZFU`KtN!K0tu^N00AWukVS)_DA6E-7#0I^%f&BXy_=Rd z4_+)qWD%-7Tb^91EWdys1GV2w3Stb0dE30#{p){szs&oY>-hY8_alHVtUYyn>r|1? zkTDlp4b`qhXXk52LXq&oLkIF8i{XTZBAjGUBhzb9eD-y3xaf@&voc*JT&$-S{N$GFxOTkZn} zshg!MAo2(nR4fX(CH~d=-9pS2eBW9jt61euPc6@dr*VudF zGeOcmo!(e+nZ|zJr&h55Us4Ox2k1`;WEyiZh%5ZLS{&=AT?g4^G^gp?V7k5qbrWgp zbRZ!><1yn&J}fAJhC&E4n)yJOG445y6JhKHy|U2k*+bs=HVOvZnevk@6lR2{d_}t` z1_JL;R`UUs5}y6Z{$*~?NEoYmOV4Bk_@J#gCYttux6d#(g6s5K#N(su63vQU zvx&?@RUF1?9m!m8m~ff5;wI=mp$kNYaZCtX+-G;igr273hLnzP;O2o}*$7(ED>spo z?6-ydwjSYEl!Wj*`M&}&k{~Tvg7%aow^A#RP#2~GokY@g1c@kCL2}zv0Ekg{nYAX8 zQTHY(89gaUrc!HCm#j%2k@$}w5$!=FF@$i379z2UW#LWMB#@HiF2eE0|5SxHnPiAa zhEtK0Q1V5G3Q?vH(lZ?|32#<2Uvw74T1UqfAF>-Mqv((|#L=5xv&0(329khCc I6+A}%UtEr&v;Y7A literal 3108 zcmai0+fx%)82_CFvLP%)BA{Z`MW8~U#-eS7P%08FX#-vYShQA`53=_7waFW))4Aqy@oGwiv2m*4rm-}jyT{`a$A0gT~x z1OWsU)TyXPh+)SyeN|5sbaOFrX8sz_*$kl(!!+zshG1{sYy@F6D2S+Ngvt=hS;Yju zp%+&QJTY!nN@dQ_zQ|2p(rrFt8rLh_*-qyfT6_C4HTzk+WSEP|2C~?!B8nXh;hZ!f zWMlr4F%>(7WSyxOxlnCW(T-gV^(!SKN6uL)f<5R^uvf(^*vHT;JyvX^keHcCrx+q7 z-OO7>XA!GH+7L(z{R1jAalf!_IWQF*tOiF)o|iTv=tNL_dQ`lMLkx<^Z`f&*qE^?N z?n}og#(gT{=x5kf)R!q1W=^*+81@p)%C>IWWrj8q^}p?FDh?w-W-Dc$Pv=QC>Ig~< zS#BpA@j3<-993})Z!k2~E=#8}pr)-Gru5?R;p8^icTwoSrQ*0y4(j>52+U%`xFFRY+|wonQtgyPs%hTC z`#=0~`>XZ4zpVfEqvqmsj7ZxUM@qpd6{qoTHNTSlDXTJHAUY|ldZEJ4EQlH5N_Xu9OIFm!n*z$H>dJMw3*aK1fo1vqai)D^FIU8N=jLmEt@vP3tlYv5b|| z3$uF35Nmg{&R#NzSgo5l;G~Abdz(wStC%XNwXop0WW zkc`V8s%7dLe#EEdLW&z=yL)}5B;t`=!ELLNEH%9xKWzxUH9Dvci)0g>PFj{-woCfT zB)6BWd^rpXcwn4GL#RZsijNiC5dGyQL$~CIB(GtvTFX4)u*YdRr}dm|l}PLxZwOsM z$M^)bv;r@8XDn;EvXXq6I-Z?Piqkh&xR3b%aN9L8t``bf!{)>QHEq(nF<#KiWnNbB z8AH!Yck+X(;0uQR|1C=FbMA#s>Tm(-%OP}#<_d;$vBaXhjR! zXs;c!w5yR3GJy;DfJQMB5SW|^5CQ2j|G*iTMtu9~H}J>;qb&Dbkl zsM1{2brBHnw`=ZOGAC{@_#B;cPtY|v&=UOeF}io;ua53}hF&1^00aF$<46E^{`u3H zzZt-V{(Gbqgt%M>#S=I{vF#-22Wj0!FJcdl&{teAF0ZX%4i_c1K^I2{cH@$~YM5j` z#AU+r5y>}z{YAzUGRJUb1FA@uh)R9@5n6=zfb=c`0}OcXS?}6sxC)(4MW#kcT4r8m zrxq>o69|N~p58)%wcU~0NJhv_2E#mZuB`;gRDrbqL`q&D$9#e0i7HhfK^cTl{Lm(b zI6#gQkfCjW2rh^SEciyGX=_AAe1RRGfGzzVL@7^YL3{!93TRuP(g KiqCNid;SFoeSj|j diff --git a/homework-java/target/classes/com/example/Teacher.class b/homework-java/target/classes/com/example/Teacher.class index 9f92485569365911facabae8694da8f627dfc740..f4621363b39b02d318b0709062eba7a0d0c4e50e 100644 GIT binary patch delta 257 zcmew)^jnzg)W2Q(7#J8F8HzS?xw5!$7N?dt=a&{0r!q2#YxpGR=jx|cB<2?6r0PS2 ztu@0K8Q7AcN<^@!nC#19BM#Kh6wJua#*og%kin42&XC2!pu~_pc>&91mOMrV)yZdA zRGHZs3MS8Ijb-HC{Fhah*^QAQh9Q=Lk--P(AX6Y_0%FFEV1_S{WCKbuFgP&y0ZB24 zB!fRg0FVb%#t_F44h*KDHfIKcBE0-akp^!lm E0C2H0*#H0l delta 123 zcmew@{7H!G)W2Q(7#J8F8S*xAxw1^2%3>v+$jHDH%*fBikj%x9!jQ_&kjBHH#E?Gu z8OvqHtjW7rwODc(8RRDKWtE%E#%9CFwb_|XmYJD@A!hP2P6O3gplM7DaSZW5nuCFn WAqj{R7&3r7E+8wDA)6tWK@tFc@)>{t From c99f1267b9cf719cdc737d827c0c5a205bd34168 Mon Sep 17 00:00:00 2001 From: Irenevn16 Date: Tue, 22 Apr 2025 21:30:19 +0200 Subject: [PATCH 30/36] retoques --- .../src/main/java/com/example/Menu.java | 54 +----------------- .../classes/com/example/CommandHandler.class | Bin 7560 -> 7641 bytes .../target/classes/com/example/Course.class | Bin 2935 -> 3032 bytes .../target/classes/com/example/Student.class | Bin 2771 -> 3285 bytes .../target/classes/com/example/Teacher.class | Bin 2372 -> 2555 bytes 5 files changed, 2 insertions(+), 52 deletions(-) diff --git a/homework-java/src/main/java/com/example/Menu.java b/homework-java/src/main/java/com/example/Menu.java index aa1962af..df7f3fc1 100644 --- a/homework-java/src/main/java/com/example/Menu.java +++ b/homework-java/src/main/java/com/example/Menu.java @@ -7,7 +7,7 @@ public class Menu { private School school; - public void main(String[] args) { + public static void main(String[] args) { Scanner myScanner = new Scanner(System.in); @@ -50,7 +50,7 @@ public void main(String[] args) { Course course = new Course(name, price); school.addCourse(course); - System.out.println("Course " + i + " added."); + System.out.println("Course " + (i+1) + " added."); } System.out.println(numberOfCourses + "courses created for " + schoolName); @@ -84,56 +84,6 @@ public void main(String[] args) { CommandHandler commandHandler = new CommandHandler (school.getStudents(), school.getCourses(), school.getTeachers()); commandHandler.executeCommand(input); - /* - - String[] parts = input.split(" "); - - if (parts[0].equalsIgnoreCase("ENROLL") && parts.length == 3) { - CommandHandler.enrollStudent(parts[1], parts[2]); - } else if (parts[0].equalsIgnoreCase("ENROLL")) { - System.out.println("ENROLL command needs to follow this format: ENROLL [STUDENT_ID] [COURSE_ID]"); - } - - if (parts[0].equalsIgnoreCase("ASSIGN") && parts.length == 3) { - // commandHandler.??(parts[1], parts[2]); - } else if (parts[0].equalsIgnoreCase("ASSIGN")) { - System.out.println("ENROLL command needs to follow this format: [TEACHER_ID] [COURSE_ID]"); - } - - if (parts[0].equalsIgnoreCase("SHOW") && parts.length == 2 && parts[1].equalsIgnoreCase("COURSES")) { - CommandHandler.handleShow(); - } - - if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("COURSE") && parts.length == 3) { - commandHandler.findCourseById(parts[2]); - } else if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("COURSE")) { - System.out.println("LOOKUP COURSE command needs to follow this format: LOOKUP COURSE [COURSE_ID]"); - } - - if (parts[0].equalsIgnoreCase("SHOW") && parts.length == 2 && parts[1].equalsIgnoreCase("STUDENTS")) { - CommandHandler.showStudents(); - } - - if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("STUDENT") && parts.length == 3) { - commandHandler.findStudentById(parts[2]); - } else if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("STUDENT")) { - System.out.println("LOOKUP STUDENT command needs to follow this format: LOOKUP STUDENT [STUDENT_ID]"); - } - - if (parts[0].equalsIgnoreCase("SHOW") && parts.length == 2 && parts[1].equalsIgnoreCase("TEACHERS")) { - //commandHandler.enrollStudent(); - } - - if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("TEACHER") && parts.length == 3) { - //commandHandler.enrollStudent(parts[2]); - } else if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("TEACHER")) { - System.out.println("LOOKUP TEACHER command needs to follow this format: LOOKUP TEACHER [TEACHER_ID]"); - } - - if (parts[0].equalsIgnoreCase("SHOW") && parts.length == 2 && parts[1].equalsIgnoreCase("PROFIT")) { - //commandHandler.enrollStudent(); - } */ - System.out.println("Do you want to perform another action? (yes/no)"); String response = myScanner.nextLine().trim().toLowerCase(); diff --git a/homework-java/target/classes/com/example/CommandHandler.class b/homework-java/target/classes/com/example/CommandHandler.class index 8d582042721cafe35facb6bcc71c475cfc640d52..bd51d031fe8715071db5d228f0f20888426919d3 100644 GIT binary patch literal 7641 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 literal 7560 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 U#YzaVM8wGv;ai(%7i&@XF9z=_PXGV_ diff --git a/homework-java/target/classes/com/example/Course.class b/homework-java/target/classes/com/example/Course.class index ae48e0e6e6347f72c43b20f5f4e16ac12bdeb727..cb3b69e469be93b31278f043401bee30360a32fd 100644 GIT binary patch literal 3032 zcmai0-BS}+6#v~MWJB19L_o!Aw*oZ;YY=R!grW#q(gweRShQA`xg<7rcd;g5i^pQWIALriPBuiXcX0rF|+;e{CoZmT@-~WE`D}X87 zi6VfYf{=XL32tWp$v5EP#`RP4tA z2F2ue?2Jhch7y^fOq{}@sdx(q8FrWSHG*yCb^D58uhOh)>!w|0=pj*mU;`=!@iwWg zRe2#(AlXhwP-4h&JKcc7lFQ{t*=^aXF|L z3c~xNDn^C(YRNMB-5Xr5m|PwlQ}Hg|BRDqK^Q*i<(6ioL%{$xa2#zy+zj^=F=Hq*s zlPN7@E?eVKvG?RVEiHVzsyuo8wRVm&&^&6KJlfDMh*UI=#ov~_5MasOgt`}?k z{IbZ>j5kY;Kst(3m{M?B#WZHNXmFTFOkcJtC7l>?BH>AZ%hPL~t$I#8TdtIXvkYC$ z)XwVFRZ4yoXAop)&lxMGZr3UVx8J#3C&0w(x+c?9OFl?uh8Bpl(^i4BbY=~cpR1LY zcx7IfVTfm~yk1<;D~4FRn<0DEAYyfI;eeBFG7>hW0xF&iL%^Ww3s+>(G|JFZNF*Q2 z*?N9$PA|LKl@)FaHc$?#^;wS(aDh8QvXURNpHLnmbj95WQQkD9EvNgO z)$_Jhxy$g4H=3@XqkNVURpixytYxj$%IVix7rh(@~Q%=p263A@`I{io#DWLixLqXzbIG{dZ>Uf`b3`v!z`@=$k30T4mqcX zL5}nu$dNju9H|k~*hzQV@DY7KrWHpJAsTllpMfQlPoZoemK@$dS2D4I?uYVXmcG4o z35b*ME~w~67kX%~7jv|$krGmYb2v|&IE{nG#PeHo|J2l8IQ@Pp&e4$UNY22 zhW1GVs#F$p4FtrS>ni(}lnMN!FR^Fw8T#f9cLl$EihVl^Hz)VMz?(q!5&DOJ#-RZ2 z{qv_YeGT^xP%ie8eA zMo1=ydBSp;F+wBdrmc@da|z zKO!ToKxPR@W*Z=)Fa;1DOY{|K_HtybH6mGGAbAwr%Ud`y)(YeT0lByh5YZU~5Z*`) zrLkd4<4YkVqTLErtYlbBlt)-Oq6%w-~0`h@2@j8_PY%$tG;4lozO=u9IgA z9{6J}K_gg}hJ^3^lDa_0OPrxn{_rvSg%8YACGAAL71|466$XtFIxW)g7Amxg(yWRa IKF8jF0jBI}VE_OC literal 2935 zcmaJ@>sAw26#h;EnGgm+3SLkuR+JE^v1&_e0IQ*5Y7lD>Z*6r*jxdnSU^1byy85pV z(bcv3485wYuGI(Vd-O4S`OcY17+~6!HFIwJ?EUR;UnYP2{pxoBSFoKz3~>V;COVN2 z=v%k8tZdbCR$2<#B&Kc0_GSg*>G9jFp8#jxFAKj))6YGMe-1P-rCN7gM*-f`@wOkshur>qj#;Wvg>Jl_qP5x{!0=UARr0gxf5Lxzf z+~Ad9qa&?d>!wJn%;_Ol3!%*64sYzv|2ZZf!0|Z_TYVl2|80d67g_;HoeCWjQG7nK3aoIih-zKhynY zMof-`6JM=^e4i0t^(Nq?;9}FjQZ`?Y?}Dtm5yTi}~8zk#3+ z@;XCTm5tG&>uxkRbNlluw6p8t()Ol|5PukwZxwoID^QWQs@0P1Nv4NcaM&R8RjbjE z4FgSq)BAjif@0jLgJyn3?o*^ku{g4E(5X-sF3THojChEa0e8N%96b_+h3Q0`cO$2r?>ow4$?b7g(=QzG&?0{A_L}SNb zVptn6wX&YTKump>0%hM(nR4R%Yn-_M5+@fX55~WKfw%f9k7tKp;S5mx37LuCa5jc- z|M}COUyR}I#1Fg`$BuiWbnOhmj!}D>vkcB*LR-&h#|_*@Nn<-7;25H#OWM&SrSD*w zSng757sOvwX7IZvaIXzD%a!7!GxG~fWj&^?D_X#>h$7PWvop{ya32qNs)993X&rnW zq#d@@pAO&x!+KF`IOI#ULy-tVA@C5N2D-A8X#wf`p4Y=brXqoShR@qT;+lj+W{iol z7f6mkrvC$o$^^y0qew=M?`7n2BoO{r3V=)nUUX&1=kZ-Bgy4tipj-+C0 zFBS8l%R4c#qN$kLOT`UcYAUMxW1`AZQL%z@;7vF=F72gaF%pQXzlh|xv=>N;K$f(I z{XkS-P(Ui}n9MV8RdNg~R#m3*>EkoS=hCm3eML^O7vQ}Rz~O-ABxE~Qr*u{V-LEmv qDlPnsj6x|w1(0G^J<++iiZzZ0c%?=OTfaBZ;9iPr4_kPKqyGXn>_d|P diff --git a/homework-java/target/classes/com/example/Student.class b/homework-java/target/classes/com/example/Student.class index e16e87eaf69baa0c40ecb98ee419c407ed722990..075e98b2deab14a16235e2d1cc9438ba0f43c953 100644 GIT binary patch delta 1398 zcmZ`&OHUI~7(KVIDMJBik=jOa3^vj#sgSq;M1z2UB8o+@C~Bp{%RaE3B0j5sfpI}x zu`pp_Vk9Ugh`Mv(mbmmM5PyN)#{WGz-SU3?&O@<>{W;!+5CSi!7 zTEIDNIuY)TWv3#lCL^-yu~sp?$2RQF8g2|uEo~gr-`mdSGYpmpb3$WSkhhk;ZmljV z5iJ*2Q<~D3nn=ry`&>lc*jjt7^mQr5)v7Qdu<};nk0n3@+t~WPq;$mN88w?#lpWsc zveKPA9h**YW&wPo81*r+DhK9dJi@$$$Gjp>bY|bQJ!c5$jrM?5LVm%~E)CP0uwX>* zas)S!T7xwY3HGS!uHXou;fhKwx)q6|OT{6i7 zBZ*!khp3Ux%icV1B%|KGLcM+P2shp|Rxl44CJMF-6q2_Y?%nMyoGtIeW6D-^GsW6F})h3~(@Y^P1f!Yg@ zu^?hnbTIGHdeJ>V`4>c@pK)UqL0)K9)TvGilp@T6KpL~OsHA0%C=bP)#Z$s$`u_|s H@DjfNo*C66 delta 1022 zcmZ`%>rN9v6#iywJL|R;Yq8jk8UeNG8dGTE4~%F~t3XS=)LRwMs+Ei2g;xLeA?5{q z1PCIDCO&|F(dY01jK*(fH>DxVpEEOO&v!Xz&#&yxQRm0MuipVopta%rwp@uD0;%Q3 z$422pdugRG*=Q}+nr#QA%|DSop<@@m|f!aXCpv3sdTo%*T@uh+>+ttbWR(s3>U<_sy`v!vV%Y zRB=m<+4*XjuPej}o=I;T!t=gBZXvnBgoO&@Aw(FD5tu~+E;LQT2WT2o7dM%*TDPxt zG{!}Y@g!`VLYi_ehHw_AF@iG&uWh6uaT|9Gdof^gsdE>H$!^nX4fp8bKA8?e{AEg# zQs99v#&m%%?L6vzMsl4OI_~g@nQXqtYBUfKc!)>*s{8Imy8*fjJ|7CM<8c7KOf5@S zd*`;`?oP`YG3imxzi22jep#Tey&cC1k_bErhBoMAa(ZaK>kFa6v$(E>)x0xc2J9Ht zF{)hLMc~t^U3Jj)%(5`?55*+i!;r_xChxoJ`Qk)qR{~0w+&Houu|UDTO+D z)^(y<@tm2#5wpuvT#jijQ-!ND)8io9op_dC^-AeQia?~fNDVV=y#&L?J`n$gQhggY nH<8!93A6hCAF+vg&YXo8c*)a-$Y6mbO|0_i@b(7pu!ih^EX->q diff --git a/homework-java/target/classes/com/example/Teacher.class b/homework-java/target/classes/com/example/Teacher.class index 2490552c0b3d1c039620cd8dbd66f561bcc15486..f4621363b39b02d318b0709062eba7a0d0c4e50e 100644 GIT binary patch delta 1110 zcmZ`&OHZ=84-KdlUjb7J_93M(7S zLN|k6SluaXto?kpQdr$Ce0ilz=-Ny|&nm;|cqS~HyPGeSQ7xq_))7_$iv({M-oH?W zBQ~fgHoQ}Kv#zLGQp-N&TVbU!aH>5nqX*|DTyUco7a6MNwPkH8l+@C*p-5(FI;k^A z%UW_tAB!^_Y>Bi+O-3o9M<(BwBn-F_!DU;*BB;6STzZy4jAybbEyvK^VtjS9)mwOv zgewfyTyH5imkbSQiwRZF$r#*R5S}w1^%hiCDPmSe0&^1P-DtpLqu=qvk!A=ODMz48 z!V{y$t(y+ifL3@l{ljmJ2~lV3M?NlF~k~Uj#`c#c<1NMsSE$rV(fGEy~yF zM!-lDO(I9@ORPHW1`M}ttK*Wl*|chL1AB5kI6z8KV@2}u$C9Z5&`L1|Ip53IqOEOe zo#EygVz^^g5<5hkzaBeY6F?q|ZBOpm)<-E=#l4h{`Ci0ezWE(GHj3qzlQweF{vRh@ zI7=c7Q^m9<>}PGLIVbKwh?P-lZEDP6hNs5N3_G?ER=3b+M@ikRm)`|{o_>%zbd~sR zC`Ni0_iVqN+#taIIkocbD{;w+c`@9_11fdlA@^qHb)08PpXnzI#y((Z6OE==Co74~ cL!oHA)ih>kc9BM$u184HN~XIMGFU+EAN3%lJOBUy delta 950 zcmZ`$+int36kTUv2Al$I!P1M0qY}kw6F{l9(4zEatF~THYrT&x7EJX4(Zm<|2j>U; z1e@BJU^G7Xd(9HH=IoPk$QDpoiXcoMkPz%SK{!hW#izfC(@E2Ke+N$X*Du>{{@!4q^`T?i=Hv zD7c@ESW==w>Q66GeF`I|1LOtKoaU-2KB*M+&DJGm1P1E>{A7$^i2Gq2#Xh94U#Zz- zi@=8koKx&4T1+FHU8Ig6(#8_blluah_CWk(%SRf4i%P!0c9J`3M7Q4|_?90UX6jrF z)wPsV)2iMQ5LoVtPPfo)aJ(xxg1w}c(s^oWa@ro#?rFgAC@6ut!B^*vEE}=@3>rDe9*Gqk9Uc$susLoxl{Y zLFN~(Gr+VAk#DAf3Ei|AI%=M0vcrvNryx+oHA4NkE^lj9 zWqL#%0qFUF+}e9g?;tMOgbKFF7UtP+D5+K4OV From 00dec7b611f0fb2cdb4c7913ed04b972f186c7cd Mon Sep 17 00:00:00 2001 From: Irenevn16 Date: Tue, 22 Apr 2025 22:18:09 +0200 Subject: [PATCH 31/36] excepciones --- .../main/java/com/example/CommandHandler.java | 27 ++++++++++++------ .../src/main/java/com/example/Menu.java | 19 ++++++++++-- .../classes/com/example/CommandHandler.class | Bin 7641 -> 7610 bytes .../target/classes/com/example/Menu.class | Bin 4586 -> 4747 bytes 4 files changed, 35 insertions(+), 11 deletions(-) diff --git a/homework-java/src/main/java/com/example/CommandHandler.java b/homework-java/src/main/java/com/example/CommandHandler.java index 93fa441f..4f5e1562 100644 --- a/homework-java/src/main/java/com/example/CommandHandler.java +++ b/homework-java/src/main/java/com/example/CommandHandler.java @@ -12,26 +12,35 @@ public CommandHandler(List students, List courses, ListnL9w* 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 Zu}(D83~SWAPHZN9i0vyyo7jfR{|Cx8T9E(% literal 7641 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 diff --git a/homework-java/target/classes/com/example/Menu.class b/homework-java/target/classes/com/example/Menu.class index ee4459a4e3e093735d84b5acaaf9c7ff68ed2ea9..a00434a61db0f24818472d875cc6a4f13e3bccf2 100644 GIT binary patch delta 1310 zcmY*ZYg83w6y0Zlnaj)w2_4ULak^yB81NGj*(%uiXr@f=HpSG%hJr)^sW@MH9nElOn&OT?(-rvmpRNPyl z9-0_E0N?`rIINy7YbrtrD~RZ56N{8WUkFhh9VjAbcI1*srxmR;J1hk;Q7RY7ojNw6 zOI#|K&hOT71G)(6HI`i$iA6iC4i&R-la7QF);PS%GX2+DQI6ZVMMnlUiCyx!Gi_|v zaT|IFS=L6&AG58xNGN260|alGs7lLQ)a1b(gsPRXV25S+V`i{D)@nr!+wuoZqs@$( zMm!RXbHp@S!?qQ+&1f)ESy}19U1CC>o9Dq6LRyzIQ3zXgY{NZblTu9gi9uyP-M?o{ z>7nU*+zhq`{(UqxiI&Wr)2B7qrvJKnvu%~RKFGTFiUPHg-Vn>wFuf&`YRSBJ2su;A z3^L3>zzXn#-y`IcJtf%iM=jH~0>;&ms6iea64~19(~c0bPdar<-G^eiHiJGEmR6Gg zDR*wLV*wU)3ga`;ug%Q*LdBQ(O2OAU%J7Xiq8+90#16eY{Rcv!sM7OAwyububv+;; z@%a+t19*_{B)-pp%=i%R&gPYP%_vWShTZhTj7}O*@Cc)Rl7K#J=UpZq#bX@d;`DBA zq;tm#(LC({HHsNoOLNj&MzID+qF}R3Lz9CdlGUGxk03X91IH?oC`=-lM0<^AKkUXi zNyPcOp068IxVa|Nm+A8)aci~eRr`?Vl-)j6wsvSTL_(wSJFkV+Ae%F*W9dICPI!#Q{yPq5u#{#JINpDpi(7f)g*8@-V8Pho&f z9-HDR_=S0c%=2KJc|&*_Dqfo6$t+-r+t0%i=HeOdoXH|)V;A44l<47-XYm{~T7V61 zYlY`;#`B!^u!?1P0lT^6IBM}ChN1HGUW{;7b50q1u$S%BBm?{SfC&Xs9#Wi@P$a4D z>y?IT`i%z~KsxqO94|ZLv(JBE6axv!Y+V=jb87{!aI3{oCt0Sf;8g{Rf{=n)#Bbg> zn*Zj14*j>bo*EcHAZ@1GDhu1R z^Pt5;4jtyQKv79MYaAY-SXI->o02QtRAs!`4f2@aZ_WN}J6#Ul^q3>oBw1(vw#wy+ z-BW{W#2gIu=F4IsQk9O^-aS9wxG;W4oolhftguUE&}^|Aa^4qWrZGIul!n9OJ`_fe z_>M^|o=CWf(jW)Tg7A3x*wlw7mwzgZI=A8T2#18RQhP3jSZ&IUr`<$sX)+a)AYc5i ze^T|oQvIrQOTukPpEv%s84gc~eq(c#Z!NxaxP)V7igQ$cFlU`9IX?+SMj}P##)xy_ zibi6v3XLwe>LTq4TmJ2yEbk0!$#|%UU zrP{Pc=SBxu1Q`lC0ifqP1NinFK@Z_re-Lr2=1e<=F$ue`lR$}*~6-eP+_Pr zm|=C6dH)DA!vh%}uCNR3yhk&1ZY1iTZec&sj?I|kEAETPuB9zD&u9RYC zN(mKG#w?k|RWgrjq>9;6!*vp;QkF4ClFXGBu9psOkWS{w2IX#IzHDcK?Br(Y=N8#d zl^oz!InE;anNInIE;&uNoS{b}TSo4wrT@d9diw#N&qqa@Q9#2sCALzputpET3 From 021d2163d8110a8b97273a6d8cd48c0ca199c1ea Mon Sep 17 00:00:00 2001 From: Francisco Farrando <121203370+franciscofarrando@users.noreply.github.com> Date: Tue, 22 Apr 2025 23:01:54 +0200 Subject: [PATCH 32/36] v3 --- .../src/test/java/CommandHandlerTest.java | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/homework-java/src/test/java/CommandHandlerTest.java b/homework-java/src/test/java/CommandHandlerTest.java index 26f525cb..8f525f1b 100644 --- a/homework-java/src/test/java/CommandHandlerTest.java +++ b/homework-java/src/test/java/CommandHandlerTest.java @@ -3,14 +3,14 @@ import com.example.Course; import com.example.Student; import com.example.Teacher; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; - import java.util.List; - import static org.junit.jupiter.api.Assertions.*; public class CommandHandlerTest { @Test + @DisplayName("Test sobre comando ENROLL") public void testEnrollStudentUpdatesStudentAndCourse(){ Student student = new Student("Studiant Diez", "Calle Su casa 12", "mail@mail"); @@ -30,4 +30,31 @@ public void testEnrollStudentUpdatesStudentAndCourse(){ assertEquals("Ethics", student.getCourse().getName()); } + + @Test + @DisplayName("Test sobre comando ASSIGN") + public void testAssignTeacher(){ + + Teacher teacher = new Teacher("Ana Paula", 20000); + Course course = new Course("Physics", 30.00); + + var teacherList = List.of(teacher); + var courseList = List.of(course); + List studentList = List.of(); + + CommandHandler commandHandler = new CommandHandler(studentList, courseList, teacherList); + + String commandWithIds = "ASSIGN "+ teacher.getTeacherId()+ " " + course.getCourseId(); + System.out.println(commandWithIds); + + commandHandler.executeCommand(commandWithIds); + + assertEquals("Ana Paula", teacher.getName()); + + } + + } + + + From 4bc1c07171ff332b8d400511813c6a6c1f6368c6 Mon Sep 17 00:00:00 2001 From: Francisco Farrando <121203370+franciscofarrando@users.noreply.github.com> Date: Tue, 22 Apr 2025 23:22:25 +0200 Subject: [PATCH 33/36] fail --- .../classes/com/example/CommandHandler.class | Bin 7401 -> 7641 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/homework-java/target/classes/com/example/CommandHandler.class b/homework-java/target/classes/com/example/CommandHandler.class index 384c9d1ad108238906dce2593b7a0beae1a07a03..bd51d031fe8715071db5d228f0f20888426919d3 100644 GIT binary patch delta 1859 zcmaJ>TTmNi6#mYJWRtKY+XX_C5V{mXxMP7*E(Ob!w$l+q2ioaqA2g*4MFU}yP>YV@ zi!VOtO!v7n)_Qlm08U4k(dmpj&e)gwE4@kU`8Od}JDQpN`~T;h?>pZ) z|Jgm?@ky8agX@cL1L&nqv+g~vdM8d1O1s5R-?}~88{NFUw_hLJvSVOyr*4@w*l5>Q?Cp+HjjiS-1r9H%J@#fd3;Y$ z?~5IXHN|5SqfLE@sl9Q7ARmaur;LFSLUDCpP5;dSr6QusjSl>%;3xb{a7-r0Cej?c zvDzH;)VGW!nsx}wP&#SE#=D&Om8Dvh{O2-%*cFf@qWOhJq3Y~*G`pg+)H7Fs&I(l8a2{Gv3M*wtx~mlS_#ISR7(i$ zOr&FReQaVlF>dH1$;7xmoR~_cj1+f-oK#PUWI~LClg0$w_3E?{8{TguQxQES2*-?6 zjR^KSsL@SLbel};_(rJN{IK9XPpg~OQ=3d16l$lA`DZ+Zl(&%(HV3>RPpYy%k+^?q zQl=hmgD{ykHPrGOkAQ^V`L96%A#=XKXYWnti}0||jz8GGWDcoex@1nPLGNWo*YX?y zMYw{i=25kL!!2d2S*0=7?4H3TclP32BFmF0!;k#oM}sv{r7xG|EUM&%;x^6NT9EK7u50 z4vsmSEBLI{dSb33-+B*;dza9FMoZdm-*zTG;*0EBAqLuW(DrPv*hZpeiK&~dWHuC_ zE+fFIUV*fXCK;PreL<^_#3Pe1b@{Ezj?gG&rSHW zqL8EY8W3T%5(735hrNetXZCA_mS=_@=DV#FT{4$O!I0c-ePg%htKjMw?D zXVJ#p?Z$kLRP;fN?!Wu6I@1Sc;n81)CS!r$rK_mmuZ5qj5(Oy8&uZAIfjeDFE$k^H doyx^-EpIC*V!3LpwT?PD+|8j~)J?a;{}=F%X+!`3 delta 1720 zcmZ`(U2GI(6g_vg-PumJyR$#-c6VFc(w4ScN~wiXX-aHbgCqovMq+ef5T{k_KHGz0xGf zvG@HUkrwL8c<;Mlqs#p+H%x3%i!tAf;=5yK#1WYijVLIV=l}wUkBqFZiickM@NN@c`FmDmTBv$&}O23 z8LHiuM@=ArKk=8%y2HWmz~45$hIROdSwTDKQbP;Y*y08wTL?T6X>fpn zPN%dp=aq^naT?sX)o$iO8Jcqh=B#*SlqAe#7cht8gd@TB6(%y!CEGiWxC;|PD&t}V@t<9Ozjt?444J~fXU>5hSe z9PB5csAPxKbf}niGvOJxh-hq~aiV%`L$*ghrifUqwOUnHFaw-+Do=9|XL)YU+8wK* zBg%s4=P}gExuFk|JaY>P?W7MbQ#dJ(?)D}?74r8=cU5tC;ca10! zG46rq;KB2##|t#``w;sur=^(xJ;`@a zHi0vONnSimz)Dor-`~)*XA)lnE3>>FnuQ_B0l%o(uqqu3Q@Qhz{ zu3Qv&GAD4Rs!-tT6nKIH-=M%ZDexo(zU5$2p#7SZk%a<1|0mEi)HhQZ$%dlx2gz1e%NkjW=zlNnS>pfz From 81d1fabc599e8e9242f279ffa7b10afa4deef8bd Mon Sep 17 00:00:00 2001 From: Francisco Farrando <121203370+franciscofarrando@users.noreply.github.com> Date: Wed, 23 Apr 2025 00:46:31 +0200 Subject: [PATCH 34/36] menu fixed --- .../main/java/com/example/CommandHandler.java | 31 ++-- .../src/main/java/com/example/Menu.java | 168 +++++++++++------- .../src/main/java/com/example/School.java | 34 +--- .../src/main/java/com/example/Teacher.java | 6 +- .../classes/com/example/CommandHandler.class | Bin 7641 -> 7613 bytes .../target/classes/com/example/Menu.class | Bin 4586 -> 6342 bytes .../target/classes/com/example/School.class | Bin 1625 -> 1625 bytes .../target/classes/com/example/Teacher.class | Bin 2418 -> 2418 bytes 8 files changed, 124 insertions(+), 115 deletions(-) diff --git a/homework-java/src/main/java/com/example/CommandHandler.java b/homework-java/src/main/java/com/example/CommandHandler.java index 93fa441f..4b9daefd 100644 --- a/homework-java/src/main/java/com/example/CommandHandler.java +++ b/homework-java/src/main/java/com/example/CommandHandler.java @@ -6,29 +6,35 @@ public class CommandHandler { private List teachers; private List courses; + final String ROJO = "\u001B[31m"; + final String RESET = "\u001B[0m"; + public CommandHandler(List students, List courses, List teachers) { this.students = students; this.courses = courses; this.teachers = teachers; } - public void executeCommand(String wholeCommand){ + public boolean executeCommand(String wholeCommand){ String[] commandPart = wholeCommand.split(" "); String command = commandPart[0]; switch (command){ case "ENROLL": enrollStudent(commandPart[1],commandPart[2]); - break; + return true; case "ASSIGN": assignTeacher(commandPart[1],commandPart[2]); - break; + return true; case "SHOW": - System.out.println(command); + //System.out.println(command); handleShow(commandPart); - break; + return true; case "LOOKUP": lookUp(commandPart); - break; + return true; + default: + System.out.println("❌ Comando no reconocido."); + return false; } } @@ -123,8 +129,8 @@ private void updateMoneyEarned(Course course){ } private void handleShow(String[] command) { - System.out.println(Arrays.toString(command) + "del handle"); - switch (command[1]){ + //System.out.println(Arrays.toString(command) + "del handle"); + switch (command[1].toUpperCase()){ case "COURSES": showCourses(); break; @@ -141,12 +147,12 @@ private void handleShow(String[] command) { } private void showStudents() { - System.out.println("llego a show students"); + //System.out.println("llego a show students"); StringBuilder studentsString = new StringBuilder(); for (Student student: students){ studentsString.append(student.toString()).append("\n"); } - System.out.println("Student usando el toString() es:"); + // System.out.println("Student usando el toString() es:"); System.out.println(studentsString); } @@ -162,12 +168,13 @@ private void showProfit() { double totalEarned = courses.stream().mapToDouble(Course::getMoney_earned).sum(); double totalSalaries = teachers.stream().mapToDouble(Teacher::getSalary).sum(); - System.out.println("===== FINANCIAL REPORT ====="); + + System.out.println(ROJO + "===== FINANCIAL REPORT =====" + RESET); System.out.println("Total income from courses: $" + totalEarned); System.out.println("Total expenses (teachers' salaries): $" + totalSalaries); System.out.println("------------------------------"); System.out.printf("Net profit: $%.2f%n", (totalEarned - totalSalaries)); - System.out.println("=============================="); + System.out.println(ROJO +"==============================" + RESET); } private void showCourses() { diff --git a/homework-java/src/main/java/com/example/Menu.java b/homework-java/src/main/java/com/example/Menu.java index 72dacc77..2ae8b6b0 100644 --- a/homework-java/src/main/java/com/example/Menu.java +++ b/homework-java/src/main/java/com/example/Menu.java @@ -1,11 +1,14 @@ package com.example; +import java.sql.ResultSet; import java.util.ArrayList; import java.util.List; import java.util.Scanner; public class Menu { private School school; + public static final String ROJO = "\u001B[31m"; + public static final String RESET = "\u001B[0m"; public static void main(String[] args) { @@ -16,8 +19,26 @@ public static void main(String[] args) { var school = new School(schoolName); - System.out.println("Now, we need some teachers for your school " + schoolName + ". How wany teachers should be created? Please enter a number."); - int numberOfTeachers = Integer.parseInt(myScanner.nextLine()); + System.out.println("Now, we need some "+ROJO+"TEACHER/S"+ RESET +" for your school " + schoolName + ". How wany teachers should be created? Please enter a number."); + + int numberOfTeachers = 0; + boolean validInput = false; + + while (!validInput) { + String input = myScanner.nextLine(); + try { + numberOfTeachers = Integer.parseInt(input); + if (numberOfTeachers < 0) { + System.out.println("The number of teachers cannot be negative. Please enter a valid positive integer."); + } else { + validInput = true; + } + } catch (NumberFormatException e) { + System.out.println("Invalid input. Please enter a valid whole number (e.g., 3) for the number of teachers."); + } + } + + for (int i = 0; i < numberOfTeachers; i++) { System.out.println("\nEnter the details for teacher " + (i+1)); @@ -25,8 +46,20 @@ public static void main(String[] args) { System.out.println("Name: "); String name = myScanner.nextLine(); - System.out.println("Salary: "); - double salary = Double.parseDouble(myScanner.nextLine()); + double salary = 0.0; + boolean validSalary = false; + + while (!validSalary) { + System.out.println("Salary: "); + String salaryInput = myScanner.nextLine(); + + try { + salary = Double.parseDouble(salaryInput); + validSalary = true; // Sale del bucle si el valor es correcto + } catch (NumberFormatException e) { + System.out.println("Invalid input. Please enter a valid number (e.g., 3500.50 or 3000) for the salary."); + } + } Teacher teacher = new Teacher(name, salary); school.addTeacher(teacher); @@ -35,8 +68,24 @@ public static void main(String[] args) { } System.out.println(numberOfTeachers + "teachers created for " + schoolName); - System.out.println("Now, we need some courses. How wany should be created? Please enter a number."); - int numberOfCourses = Integer.parseInt(myScanner.nextLine()); + System.out.println("Now, we need some "+ROJO+"COURSE/S"+ RESET + " How wany should be created? Please enter a number."); + int numberOfCourses = 0; + boolean validInput2 = false; + + while (!validInput2) { + String input = myScanner.nextLine(); + try { + numberOfCourses = Integer.parseInt(input); + if (numberOfCourses < 0) { + System.out.println("The number of courses cannot be negative. Please enter a valid positive integer."); + } else { + validInput2 = true; + } + } catch (NumberFormatException e) { + System.out.println("Invalid input. Please enter a valid whole number (e.g., 3) for the number of courses."); + } + } + for (int i = 0; i < numberOfCourses; i++) { System.out.println("\nEnter the details for course " + (i+1)); @@ -44,18 +93,51 @@ public static void main(String[] args) { System.out.println("Name: "); String name = myScanner.nextLine(); - System.out.println("Price: "); - double price = Double.parseDouble(myScanner.nextLine()); + double price = 0.0; + boolean validPrice = false; + + while (!validPrice) { + System.out.println("Price: "); + String priceInput = myScanner.nextLine(); + + try { + price = Double.parseDouble(priceInput); + + if (price <= 0) { + System.out.println("Price must be a positive number greater than 0. Please try again."); + } else { + validPrice = true; // Valor correcto, salimos del bucle + } + } catch (NumberFormatException e) { + System.out.println("Invalid input. Please enter a valid number (e.g., 199.99 or 150) for the price."); + } + } Course course = new Course(name, price); school.addCourse(course); - System.out.println("Course " + i + " added."); + System.out.println("Course " + (i+1) + " added."); } System.out.println(numberOfCourses + "courses created for " + schoolName); - System.out.println("Let's create the students. How many should be created? Please enter a number."); - int numberOfStudents = Integer.parseInt(myScanner.nextLine()); + System.out.println("Let's create the "+ROJO+"STUDENTS/S"+RESET+". How many should be created? Please enter a number."); + int numberOfStudents = 0; + boolean validInput3 = false; + + while (!validInput3) { + String input = myScanner.nextLine(); + try { + numberOfStudents = Integer.parseInt(input); + if (numberOfStudents < 0) { + System.out.println("The number of students cannot be negative. Please enter a valid positive integer."); + } else { + validInput3 = true; + } + } catch (NumberFormatException e) { + System.out.println("Invalid input. Please enter a valid whole number (e.g., 3) for the number of students."); + } + } + for (int i = 0; i < numberOfStudents; i++) { System.out.println("\nEnter the details for student " + (i+1)); @@ -80,66 +162,14 @@ public static void main(String[] args) { boolean continueRunning = true; while (continueRunning) { System.out.println("Enter a command from the next list: \n ENROLL [STUDENT_ID] [COURSE_ID] \n ASSIGN [TEACHER_ID] [COURSE_ID] \n SHOW COURSES \n LOOKUP COURSE [COURSE_ID] \n SHOW STUDENTS \n LOOKUP STUDENT [STUDENT_ID] \n SHOW TEACHERS \n LOOKUP TEACHER [TEACHER_ID] \n SHOW PROFIT "); - var input = myScanner.nextLine(); + var input = myScanner.nextLine().toUpperCase(); CommandHandler commandHandler = new CommandHandler (school.getStudents(), school.getCourses(), school.getTeachers()); - commandHandler.executeCommand(input); - /* - - String[] parts = input.split(" "); - - if (parts[0].equalsIgnoreCase("ENROLL") && parts.length == 3) { - CommandHandler.enrollStudent(parts[1], parts[2]); - } else if (parts[0].equalsIgnoreCase("ENROLL")) { - System.out.println("ENROLL command needs to follow this format: ENROLL [STUDENT_ID] [COURSE_ID]"); - } - - if (parts[0].equalsIgnoreCase("ASSIGN") && parts.length == 3) { - // commandHandler.??(parts[1], parts[2]); - } else if (parts[0].equalsIgnoreCase("ASSIGN")) { - System.out.println("ENROLL command needs to follow this format: [TEACHER_ID] [COURSE_ID]"); - } - - if (parts[0].equalsIgnoreCase("SHOW") && parts.length == 2 && parts[1].equalsIgnoreCase("COURSES")) { - CommandHandler.handleShow(); - } - - if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("COURSE") && parts.length == 3) { - commandHandler.findCourseById(parts[2]); - } else if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("COURSE")) { - System.out.println("LOOKUP COURSE command needs to follow this format: LOOKUP COURSE [COURSE_ID]"); - } - - if (parts[0].equalsIgnoreCase("SHOW") && parts.length == 2 && parts[1].equalsIgnoreCase("STUDENTS")) { - CommandHandler.showStudents(); - } - - if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("STUDENT") && parts.length == 3) { - commandHandler.findStudentById(parts[2]); - } else if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("STUDENT")) { - System.out.println("LOOKUP STUDENT command needs to follow this format: LOOKUP STUDENT [STUDENT_ID]"); - } - - if (parts[0].equalsIgnoreCase("SHOW") && parts.length == 2 && parts[1].equalsIgnoreCase("TEACHERS")) { - //commandHandler.enrollStudent(); - } - - if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("TEACHER") && parts.length == 3) { - //commandHandler.enrollStudent(parts[2]); - } else if (parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("TEACHER")) { - System.out.println("LOOKUP TEACHER command needs to follow this format: LOOKUP TEACHER [TEACHER_ID]"); - } - - if (parts[0].equalsIgnoreCase("SHOW") && parts.length == 2 && parts[1].equalsIgnoreCase("PROFIT")) { - //commandHandler.enrollStudent(); - } */ - - - System.out.println("Do you want to perform another action? (yes/no)"); - String response = myScanner.nextLine().trim().toLowerCase(); - if (!response.equals("yes")) { - continueRunning = false; - System.out.println("Thank you for using the School Manager. Goodbye!"); + boolean validCommand = commandHandler.executeCommand(input); + if (!validCommand) { + System.out.println("Pulse cualquier tecla para volver a intentarlo..."); + myScanner.nextLine(); // Espera que el usuario pulse algo + continue; // vuelve al principio del while } diff --git a/homework-java/src/main/java/com/example/School.java b/homework-java/src/main/java/com/example/School.java index 928c05a5..6f953dd0 100644 --- a/homework-java/src/main/java/com/example/School.java +++ b/homework-java/src/main/java/com/example/School.java @@ -21,16 +21,7 @@ public List getTeachers () { return teachers; } - /*public void showTeachers() { - if (teachers.isEmpty()) { - System.out.println("No teachers have been added yet."); - } else { - System.out.println("\n Teachers at " + name + ":"); - for (int i = 0; i < teachers.size(); i++) { - System.out.println(" #" + (i + 1) + " - " + teachers.get(i)); - } - } - }*/ + public void addCourse (Course course){ courses.add(course); } @@ -38,32 +29,13 @@ public List getCourses () { return courses; } - /*public void showCourses() { - if (courses.isEmpty()) { - System.out.println("No courses have been added yet."); - } else { - System.out.println("\n Courses at " + name + ":"); - for (int i = 0; i < courses.size(); i++) { - System.out.println(" #" + (i + 1) + " - " + courses.get(i)); - } - } - }*/ + public void addStudent (Student student){ students.add(student); } public List getStudents () { return students; } - /* - public void showStudents() { - if (students.isEmpty()) { - System.out.println("No students have been added yet."); - } else { - System.out.println("\n Students at " + name + ":"); - for (int i = 0; i < students.size(); i++) { - System.out.println(" #" + (i + 1) + " - " + students.get(i)); - } - } - }*/ + } diff --git a/homework-java/src/main/java/com/example/Teacher.java b/homework-java/src/main/java/com/example/Teacher.java index cf69ab04..ecba6ef5 100644 --- a/homework-java/src/main/java/com/example/Teacher.java +++ b/homework-java/src/main/java/com/example/Teacher.java @@ -22,7 +22,7 @@ private String generateUniqueTeacherId() { Random random = new Random(); do { int number = random.nextInt(900) + 100; // genera número entre 100 y 999 - id = "S" + number; + id = "T" + number; } while (usedIds.contains(id)); usedIds.add(id); @@ -53,10 +53,10 @@ public void setSalary(double salary) { public String toString() { return String.format( "👨‍🏫 Teacher Info:\n" + - "📛 Name : %s\n" + "🆔 ID : %s\n" + + "📛 Name : %s\n" + "💰 Salary : $%.2f", - name, teacherId, salary + teacherId, name, salary ); } } diff --git a/homework-java/target/classes/com/example/CommandHandler.class b/homework-java/target/classes/com/example/CommandHandler.class index bd51d031fe8715071db5d228f0f20888426919d3..4f27e6104dbf3056cbc43cc253b69504f6fd4611 100644 GIT binary patch literal 7613 zcmcIp3v^V+dH!a#yLVY#kXR5#2;@ZuB&{TbC6KX%6$?p#Y(0o1M1ZFD)#?f@>_geT z0^}x5oTuB^&a<_h*oht6;Kn$9B*+FgZtONrOG(nCPSYlB)7a_zkv@~y4JO~r++FSJ z0XaRV;@rJ=X8xJ~``mjIvkP%tu^%XnvnuvD!opYKe5h%1m^o#%!gro&f5o!|wjUf!kdT2L^85w>L-$ zuQRb7*9$DQlj&4EKBRTDFz)%NYe(c7Z6PNkTHYn@rrU0w$yQsELo^ z;{r=ESz8HQRkM(ebU1#}#BWLZ#-9y0McNf96g zV?Aoi&PPl*LVuBCl$D1axps_S%Y zJ;|2qb!Z-Ed`XtN;tcbdcA1RqpE2>Q>^Eh5k(Ws8VPZ+~p!0=`aO8I@NBDzeE&B{JRH$S{&gH^fcBH%
fc zHa0iNzwoY}{*M06o{rw|VE5jE!Qrs#mK&82w@g1Y@hV=UbP4OI-I+>8EoXnsVcAb+ z982v|%ILiFOKu27_+bElCs5gN*}nk(fl0XEcEXd&v0B3$Hg0Yj-8+< z;@=9YYSvK3F)Kc04~$E%D8Qfzm}vU&?UX@o=6mQ0onB`m#%j5? zKu&IP^7hL_wyJRI^kjDW@wpHeQ`j7&g=9G$T$XB9r&7#i_6a*W<AY75Pr(PGTN+X=sum$BG{9V`h*#GlZX+PHvJ5)RlD$ znR@l+=av|=sNps^g3mUD;?xAc{wBTJh7v^X1e2AWEF8Tf)-2oxj|fi6 zvErQCMb)^BGg=^la;;ajozs1837~10xl81Ti`7cHGE)JnHDtx}!#!wimf4OuVP`7kWSq1$*=IWwsj*C{sG4K0Y&dt7_;7!z*tqCUf&`+P zTN6=Zidvabm&hHbL^oY3c(Pe+N6-}z4NSkoQc2-hlB%`C=UenJhz2wvg)Z0XIv%JO5zf~xHc%7M6)5bnqr%15vZCikg?>k)KR;!*Gi0zS(Mru zx1!v(Ps=Kk-@1^W=G;kINm_-O4ZS?OOij9ho@c=Po`Q+P49@@Cpk{gbx%oB3W!q`- zq{o9v8&$GBD6SW+hTtLYRk1^0!#tH}_tPb6S5_(a{{O2%^KCnn7YSLX%j=pe60=87 zGRYlYoSRZRV~Dq~D$kQ?A&VKJgGKf7q^x(^yxddDix2S9!z1q(xC8hfwmkR=AKn?{ z+COER_X@f8&rm9_JJ^0*(Hm^@#v<1)QQtni!Fm5nij#bM`3^^(g@}ZVGguM{m7Kxy zNZlE%jMSgO>PW*GR6I?ZBK(}cl`!~ga+bWp2r7PMTy+gfa5Y;OIU3Px;!Rv)i>tdb z$S;XjN)}df6bU_Ead}Y4RbB#_u@=waKj!!M0ZG3h_>b*_% zK2C4(p3Z%@%I_K6pkE!{)6bwQbkhuai%xTn)^iK(2-?oTN))3E_fu~tu^Nw2H_xDg zXM{?erN*D9uY3hnc!`%q=dm$Q{}*!lzaYHI?gqXpe8Nx77UM->u&+o2$fXLwOSln! z13?4p4Y5T2Vm(b!Qc_}878m>d)H#o-TJw0EEBH9CMf63!gq3G8DA3<<7H<={4^{m5 zRY6RntzKz}u{x!zK)JWC{;5-!zAv82$*6rP!qw_%^LqYkKqIf8uEiE?v~JR?GvwG6%ejqlLf|S>PUd&8C5i({yKGe7=d!!Sb zJHM=g?=7!f-2W2a?Z>|JifmWahtkSt))%#(!rJ#{?sLg}Gx&fSYm#Ii zRG-zF?2cA{x!)!8&)`lqRxHWx;^%CR+{ru$+>A+{WTw&2%b)?=iMQgD7{omo#)H_$ zJB1N^5pQGs9^i@l5WdC>x(j$azK2_QbQ@Kc*vcrIMx~HW;^nML<>x-qRtTwonf+eN z#lveVwuOp7V92Ev8-azmo69+@%bp+q!7e5o1_~VgrFP3mIkG!sR zUG6!yWRP!<(4B7YmkEp7YsGxeLeEt+zrr`Y)Kv`8K5&bl^>(HmHpnk z>YKXw-uIc~XYS?u`twgb_$|J7M}PFBY}eI?KCc3@Q3h+IK6F}#t_)U&?iY0E`gG_% zr9;>6hVFHoFaM+rm3%hxspr$oa{SCGl<{?jARe*f#l z5Ye=e|x0~A3G{8j$IO)~xdHS-PM)#vaxfc~yMhaY9XLw~FL zLVxf5GCT*0s%sBFhkqQJ!H@UL+5hEcD;-kWu^vM??{u4R8m)MO#qkSF-A{50`4n^2 z(+vG*a)J}IYoK!6Dk>OYg7bEZwfvHf#LL{vm__eF=9^_gnT7T0ie@=Ov&_&e&(bW< z(JW_amUB6D(vf8Om}{1Gi<+fK$WZi%t3{aaDtN^fZWGswYs3ckYm*$8{>UXoa PfpkH(+r^DyC(3^TXVyxC literal 7641 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 diff --git a/homework-java/target/classes/com/example/Menu.class b/homework-java/target/classes/com/example/Menu.class index ee4459a4e3e093735d84b5acaaf9c7ff68ed2ea9..0ea8ec222a5897b07ce247b404f94dda9a680d17 100644 GIT binary patch literal 6342 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 delta 2345 zcmZWrYj_k_8Gg@RW@cxH-E`?f78{&!DM?HS2_+@VEi^!bO-LaWObWJ>-9xglI}>(i z8zPmpiZ^<(_Gm2?TTQhWwNk2VFtM##t%_Q;wTOxj{_uJ9sgHluUudo0nJoL{X@BfD z=bU`!ec$gklULf_T&kb{-}H+BHseoc^rb#M28K2R4QLlp|DxqLFep2$98a1WIvBJ8 zD{JK^lBSNe=v0w3unz0R4u9u16&o4mr<`0XKVs#^vb=RSw^E}#uVVwc3ywp$Pvl^c3uP$kbkhS278 zI?oFQnV}C7?be)?$x7Ng-;s`i+50-~z_3h5ilMVXoR8LtH=;3dDjd?K8gAeKM#Ofl zIYeqgQq7?!j%m!VA}3CV>J`Vp7!HdIp%rTi23#Cw&_}pC8&p9;++|=~9*60;QUf~A zVnVWhNVMx~OIh4);KQh6i0~skRdji`lgn9lT0@DUb&F$8I7M^ZvR%`4%rTxn;N)|r zWjmCJylJJ}jAL&y8zy+6)pi6yQDo%^(c`Fyc$dGyW5V*5b zRuDCjo$UMKn&={NcO<;A7ZRc z^w%sFkJK3Nc@RE&!!WWBLD0%a>mW@U!{@~1ngy#rPiJxm8mfoM8s0jHFW?c{g>Vv& zN?#zbmhKq@V2FlmT1xLLWAQmObp-q!!FVtpn8e`oh{c0}JEySL-qaAT)BgAIcTrB`dw{3B8P69>6sA%(5%Q{E#gDqv)^vlz)IE5q05TR>j9F@e! zDxPJ0q>PUz^@JY#R2e58MTBCJ4iAt6MSh0L?}u!UH<2Ve4`D||%Li@ksW_A+i`7qN$3#tHUU+{^xj``BB!pC;r1 zpN5BgVHy!R1plNM_hU7_h*LBiHihsdJVpa@6mdL`FVk3*I?3THn53Dwgf`DnCH*Fz zAV-a&m`~Au4LZ)@cF#{C!Cju8Mv~j{BteHr^fEj}E1jgr@id-6n61G)A(9-&vp7{EXc|R)3#UnM*vIf3&d{LNvVY@wy5ggc!QZ`+_tXCl7w~P8 z8o*h$7vGVhDV=|yGE73D{OqG?oucT@5mGxsZ=(~6itnmWRotUu38R8s!M?W$l3l@& z_sm>D=D(<6|G{1#waGMH^<>KqvS)wn*`Ij!XP*7JXMgG0 RU*UIzq0{|~B=Hgw{|BtAIZ*%r diff --git a/homework-java/target/classes/com/example/School.class b/homework-java/target/classes/com/example/School.class index ff606244ede8ab7297707f9943c4d9ef0e91f124..72342c0b8191b9b5990642bfce1459831fae8d77 100644 GIT binary patch delta 51 zcmcb~bCYL75G$(`12=>8 B450u3 diff --git a/homework-java/target/classes/com/example/Teacher.class b/homework-java/target/classes/com/example/Teacher.class index 9f92485569365911facabae8694da8f627dfc740..8fe7403759d04dc62e86a5a1ab4c89a3d154831a 100644 GIT binary patch delta 44 zcmew)^hs!gIn!i6CQ0_qvlaXjb5l2mGnp|lhHUO*@nYfN4US~d+QMKs`2oiy081SW A@c;k- delta 46 zcmew)^hs!gIn!i6CUMR^Z?{cR@N`j7*c{Ge#>5!BxsSz*g~Kp7l0|C^1MlPq9FqWe C91h_C From fb32eceb74b11252f581a58a30a9c180ce5128e3 Mon Sep 17 00:00:00 2001 From: Francisco Farrando <121203370+franciscofarrando@users.noreply.github.com> Date: Wed, 23 Apr 2025 00:55:26 +0200 Subject: [PATCH 35/36] min failure fixed --- .../src/main/java/com/example/Menu.java | 13 ++++++++++--- .../target/classes/com/example/Menu.class | Bin 6342 -> 6330 bytes 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/homework-java/src/main/java/com/example/Menu.java b/homework-java/src/main/java/com/example/Menu.java index 2ae8b6b0..86cb2cc2 100644 --- a/homework-java/src/main/java/com/example/Menu.java +++ b/homework-java/src/main/java/com/example/Menu.java @@ -54,11 +54,18 @@ public static void main(String[] args) { String salaryInput = myScanner.nextLine(); try { + salary = Double.parseDouble(salaryInput); - validSalary = true; // Sale del bucle si el valor es correcto + + if (salary <= 0) { + System.out.println("Salary must be a positive number greater than 0. Please try again."); + } else { + validSalary = true; + } } catch (NumberFormatException e) { - System.out.println("Invalid input. Please enter a valid number (e.g., 3500.50 or 3000) for the salary."); + System.out.println("Invalid input. Please enter a valid number (e.g., 199.99 or 150) for the price."); } + } Teacher teacher = new Teacher(name, salary); @@ -106,7 +113,7 @@ public static void main(String[] args) { if (price <= 0) { System.out.println("Price must be a positive number greater than 0. Please try again."); } else { - validPrice = true; // Valor correcto, salimos del bucle + validPrice = true; } } catch (NumberFormatException e) { System.out.println("Invalid input. Please enter a valid number (e.g., 199.99 or 150) for the price."); diff --git a/homework-java/target/classes/com/example/Menu.class b/homework-java/target/classes/com/example/Menu.class index 0ea8ec222a5897b07ce247b404f94dda9a680d17..f5250ae5f09e7979b14a068250c72b6450d07be8 100644 GIT binary patch delta 1232 zcmYk5ZBSHY6vuz(VcEUxuBa;;%QR}C4v-j$6EmWeDTE;?f=C3Yn{Fr~=!Wl2+Z2wKJVF@)rsdRyS?P3T+E+*w_%tS{4efUKT(u?bZTY^~)!N$6*^5*cm#=1HA8Oz!^@wduja2#1(?8G`wzgDEB^#Rra~~{E04}7JPSKUeL5T z{A|cgkRrR;Ia|tlyPTIrA3LoKOP1O1joXn>tc{KZbK6cIze!r{gX7a8c_;Dt=JXMm z-p8a|Pl{)NyxCU3N<46c#OT=qJ?p^f$Z>ZtCf6I43Zl};&>0G=Qd|M6pC@uXGg3T# z6zi$q=~y*LDX6K%DIFu>sOZQXWNA!`1}xXJxEyC(j>~?~cW=^@cS^XTB@&{Jr|eo^ ziqzO!eW_AwA5_!IJ0@?`6l<-Z_oA;-(uVkgY?&f?GEbka(kaKtHkL^>)5s={4v-6M zv7mB#SbZ${BZWfD=CE}-40+h)_ z%4G@_@&L;vi%Q9*O7f`H+SM|j8YyChln|6k9nmwakw!w&Or30Ht?Y(uE*hkj zCV7KRa)_`TrCB=Jrj2irF1AV^+vPMnWtivWGSACZ4ZOw+@&_-<-@GI@X_4E!Yz(`M z#VckkyG;_Wn#r`9RQBqJ?=fk-ZnD^Cve|Fu@}^nD0aIB{o2lZE33Axf@s??#-E8J< z)51GuH}9G@HMeur9H-Ot@PRqShvqED%rIT%D&6L1ddzQ}Fn@B=+@RO|L%+GjfIZ@$ z7`ceWak}vGJ{k1Tj)y(eaYEl*>|+fl=~d5uUDA&@g@TXtyl#~STba(>QoPK~AiM_Wo{G{&RM zMx)&dV_q!Aqd2lTuhCuwGL=uFMHGu)7v%zp=3(k%4Z0P@tXNwf1u}`xbcwu*#ZTmO zEj%XrdoiqA1s?MkU+QiN0dt*88fduR{KR37=vF>tuJDz9v4dIW5|{OEy!ho;uEZz= y|vCAzOsg5PVM^Q4VvPj*{!rad_@!Tvq@$NvDKn=x+y delta 1239 zcmYk5ZBW!z6o;R4ciDFkRtXpf+spj z9R17C_{NkrYgwT}V$l1Gg<2Gj`KhUys2usyC#OC%bats3zwEtx?(h8Wxz9QOf&5GP zXJ59-N~_1ru>Q8CloZSl2J_|z11*t2K`-O0hj|r)F=2nEa zwz{aXM(yilwY4~@#=b`MZ;z?4eovZ|vR-gjMV_h)7X@5wuxyTp94cbOJB3Cx(4nYLZpt$k@Z^||Nq z`-?A-nR|h0Mcyp$MHUvi>7CUQq(&ZKwG^{fmahdFd=E6PMWEg)+k|Vr$KhpD0^v=!!%15+qK{p zImR|QMMPrkls;Ou}fGOmlS;8Sx%3)JkNvEly%hd9kspE)=aMbMLxOq{)X} zIHx-&hghk+dsWk^jqg+L9%Y@bQ_-)wCZb&A102e5!o{tWbF@p{xD?4mEJdNsVnAcb z%Jj*Evs=m5Ge~a~j{*+yp<4TtTsj}|u?iP)Fk$UdA`>=VWj0~$Q5uUAHeSUsPluoz zp8}b|r}0Y^OFEzFSfrSHX-v3y6h%RzEUyBY#ut3486&ETex(;D$G;se@ipKzzwix1 z2$|*@m(|d4kGae-j_WiA%^+9w#dZqJMXqXYlGwDd-zF$Hw9VgX%qcf@@`g3$k};jb z?=|Mu&Q$P&?mUd>J=eK!Tx+sUX3U;8&fR#OTyx@dvd77E5z&n;{)1RIGJgFRojNK7 From b4a4a02d5c7f859650afd50be716af78343ab877 Mon Sep 17 00:00:00 2001 From: Francisco Farrando <121203370+franciscofarrando@users.noreply.github.com> Date: Wed, 23 Apr 2025 09:32:12 +0200 Subject: [PATCH 36/36] espanol a ingles --- .../main/java/com/example/CommandHandler.java | 2 +- .../src/main/java/com/example/Menu.java | 2 +- .../target/classes/com/example/Teacher.class | Bin 2418 -> 2555 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/homework-java/src/main/java/com/example/CommandHandler.java b/homework-java/src/main/java/com/example/CommandHandler.java index 4b9daefd..2c396f64 100644 --- a/homework-java/src/main/java/com/example/CommandHandler.java +++ b/homework-java/src/main/java/com/example/CommandHandler.java @@ -33,7 +33,7 @@ public boolean executeCommand(String wholeCommand){ lookUp(commandPart); return true; default: - System.out.println("❌ Comando no reconocido."); + System.out.println("❌ Not a command."); return false; } } diff --git a/homework-java/src/main/java/com/example/Menu.java b/homework-java/src/main/java/com/example/Menu.java index 86cb2cc2..4d262b8e 100644 --- a/homework-java/src/main/java/com/example/Menu.java +++ b/homework-java/src/main/java/com/example/Menu.java @@ -174,7 +174,7 @@ public static void main(String[] args) { CommandHandler commandHandler = new CommandHandler (school.getStudents(), school.getCourses(), school.getTeachers()); boolean validCommand = commandHandler.executeCommand(input); if (!validCommand) { - System.out.println("Pulse cualquier tecla para volver a intentarlo..."); + System.out.println("Press any key to try it again..."); myScanner.nextLine(); // Espera que el usuario pulse algo continue; // vuelve al principio del while } diff --git a/homework-java/target/classes/com/example/Teacher.class b/homework-java/target/classes/com/example/Teacher.class index 8fe7403759d04dc62e86a5a1ab4c89a3d154831a..3df0498bfe49bfbc13aa3461c323484da4646292 100644 GIT binary patch delta 257 zcmew)^jnzg)W2Q(7#J8F8HzS?xw5!$7N?dt=a&{0r!q2#YxpGR=jx|cB<2?6r0PS2 ztu@0K8Q7AcN<^@!nC#19BM#Kh6vD{Q#*og%kin42&XC2!pu~_pc>&91mOMrV)yZdA zRGHZs3MS8Ijb-HC{Fhah*^QAQh9Q=Lk--P(AX6Y_0%FFEV1_S{WCKbuFgP&y0ZB24 zB!fRg0FVb%#t_F44h*KDHfIKcBE0-akp^!lm E0C7<>+5i9m delta 123 zcmew@{7H!G)W2Q(7#J8F8S*xAxw1^2%3>v+$jHDH!pP6Ykj%x9!jQ_&kjBHH#E?Gu z8OvqHtjW7rwODc(8RRDKWtE%E#%9CFwb_|XmYJD@A!hP2P6O3gplM7DaSZW5nuCFn WAqj{R7&3r7E+8wDA)6tWK@tFdQ5k^%