Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ironschool homework #9

Open
wants to merge 118 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
1c599a9
add maven
JuliaORS Feb 24, 2024
1aedb6e
add src folder
JuliaORS Feb 24, 2024
2a940b0
add teacher class
JuliaORS Feb 24, 2024
cbcd208
create org package
JuliaORS Feb 24, 2024
a63d01d
new branch
victoriaschwin Feb 24, 2024
9377a6d
Add Student class
annadpp Feb 24, 2024
8bae0a0
command class
victoriaschwin Feb 24, 2024
47c5666
Add Student class - package name fixed
annadpp Feb 24, 2024
ecbfae5
add Teacher class
JuliaORS Feb 24, 2024
1882da6
Merge pull request #1 from JuliaORS/5.1
JuliaORS Feb 24, 2024
e9cb39c
update teacher class
JuliaORS Feb 24, 2024
aee3e75
Add helper getInfo()
annadpp Feb 24, 2024
b5e9b7b
update branch
JuliaORS Feb 24, 2024
c1590b4
Main menu implementation
mandril888 Feb 24, 2024
94df562
update changes
JuliaORS Feb 24, 2024
c85772b
Merge branch 'main' into 4-Main-menu
mandril888 Feb 24, 2024
1634bb1
Merge pull request #3 from JuliaORS/4-Main-menu
JuliaORS Feb 24, 2024
bdf16be
Fixed for pull request
annadpp Feb 24, 2024
27cce32
solve merge conflicts
JuliaORS Feb 24, 2024
eadc98e
Merge branch 'main' into 1-Create-teacher-class
JuliaORS Feb 24, 2024
a6c25ca
Merge pull request #7 from JuliaORS/1-Create-teacher-class
victoriaschwin Feb 24, 2024
08cfb72
Fixing error
annadpp Feb 24, 2024
de08058
Merge pull request #8 from JuliaORS/3-Create-Student-class
annadpp Feb 24, 2024
4c4fd62
add course class
Katenokk Feb 24, 2024
becbc41
arreglando main branch
Katenokk Feb 24, 2024
35ff7ef
adjustments
mandril888 Feb 24, 2024
95441d3
merge main
JuliaORS Feb 24, 2024
9f37847
solve emrge conflicts
JuliaORS Feb 24, 2024
63501d1
Merge branch 'main' into 6-Command-Utils-Class
JuliaORS Feb 24, 2024
c433253
add School class
JuliaORS Feb 24, 2024
fd5d962
add School class
JuliaORS Feb 24, 2024
871eb37
Merge pull request #9 from JuliaORS/12-Create-School-Class
JuliaORS Feb 24, 2024
606071d
command main menu
victoriaschwin Feb 24, 2024
a509e4a
Merge pull request #10 from JuliaORS/11
victoriaschwin Feb 24, 2024
45614ee
creator classes
mandril888 Feb 24, 2024
9b3b10e
Merge branch 'main' into 10-implement-classes-main
mandril888 Feb 24, 2024
129f9ac
Merge pull request #11 from JuliaORS/10-implement-classes-main
mandril888 Feb 24, 2024
3b3ef73
añadir assignTeacher en nueva rama desde cero
Katenokk Feb 24, 2024
c8bef80
add methods show all and look up
JuliaORS Feb 26, 2024
933d6c2
update command utils
JuliaORS Feb 27, 2024
1727fcc
añadir metodo assignTeacher
Katenokk Feb 29, 2024
c5963a7
Merge pull request #12 from JuliaORS/fix-git
JuliaORS Feb 29, 2024
4afa186
changes main scanner
victoriaschwin Feb 29, 2024
f403833
Merge branch 'main' of https://github.com/JuliaORS/homework-java-iron…
victoriaschwin Feb 29, 2024
a1af8b4
Merge branch 'main' into 7-GetAll-GetID
JuliaORS Feb 29, 2024
5e162b3
remove scanner.close()
mandril888 Feb 29, 2024
e5b2039
Merge branch 'main' of https://github.com/JuliaORS/homework-java-iron…
victoriaschwin Feb 29, 2024
f6ac157
quitar teacher del constructor
Katenokk Feb 29, 2024
3f2ed3e
Merge pull request #13 from JuliaORS/fix-git
Katenokk Feb 29, 2024
d19f15a
command utils
JuliaORS Feb 29, 2024
b02957c
Merge branch 'main' into 7-GetAll-GetID
JuliaORS Feb 29, 2024
e6a0221
update merge main - course class
JuliaORS Feb 29, 2024
9432ae4
modify static methods of school class
JuliaORS Feb 29, 2024
35df9f6
Merge pull request #15 from JuliaORS/7-GetAll-GetID
victoriaschwin Feb 29, 2024
07beda3
Add enrollStudent and showProfit
annadpp Mar 1, 2024
c57a6e5
Add testEnrollStudent and testShowProfit
annadpp Mar 1, 2024
19a0431
Merge pull request #16 from JuliaORS/Command_enroll_profit
JuliaORS Mar 2, 2024
a2d2116
Merge branch 'main' of https://github.com/JuliaORS/homework-java-iron…
victoriaschwin Mar 3, 2024
4e0a37f
change command menu
victoriaschwin Mar 3, 2024
90a12b3
create School in main
mandril888 Mar 7, 2024
15e81b0
Merge branch 'main' of https://github.com/JuliaORS/homework-java-iron…
victoriaschwin Mar 7, 2024
feb9ce1
update look up method
JuliaORS Mar 7, 2024
fd36547
Merge pull request #17 from JuliaORS/7-GetAll-GetID
JuliaORS Mar 7, 2024
3e22b21
Merge branch 'main' of https://github.com/JuliaORS/homework-java-iron…
victoriaschwin Mar 8, 2024
1665b5f
Merge branch 'main' into 11.1
victoriaschwin Mar 8, 2024
37660a3
Update enrollStudent
annadpp Mar 8, 2024
244a6c0
update course.java + assignTeacher()
Katenokk Mar 8, 2024
2ee2545
Merge pull request #18 from JuliaORS/test-branch
Katenokk Mar 8, 2024
9cf1431
Update enrollStudent
annadpp Mar 8, 2024
e0d7078
Merge pull request #19 from JuliaORS/Command_enroll_profit
annadpp Mar 8, 2024
ee273b0
Merge branch 'main' of https://github.com/JuliaORS/homework-java-iron…
victoriaschwin Mar 9, 2024
3e1bc9d
merge conflicts
victoriaschwin Mar 9, 2024
9fbf308
command menu and methods implemented
victoriaschwin Mar 9, 2024
ff8bcf4
add print colors and print descriptions to commands
victoriaschwin Mar 9, 2024
a4d65c5
tasks todo adn fix bugs
victoriaschwin Mar 9, 2024
c594b12
Merge pull request #20 from JuliaORS/11.1
victoriaschwin Mar 9, 2024
7e20ba9
actaulizar assignTeacher() y getInfo() de Course; añadir test assignT…
Katenokk Mar 9, 2024
ee8827c
quitar método getCourseById() de School y assignTeacher
Katenokk Mar 9, 2024
6c8e5f8
Merge pull request #21 from JuliaORS/command-test
Katenokk Mar 9, 2024
0ab444b
update lookup and add course on teacher class
JuliaORS Mar 9, 2024
54cafc6
Merge branch 'main' into 7-GetAll-GetID
JuliaORS Mar 9, 2024
a183362
basic changes
mandril888 Mar 9, 2024
b31799c
add exception in lookUp and add course in Teacher class
JuliaORS Mar 9, 2024
597f5a6
Merge branch 'main' into main-class-adjustment
mandril888 Mar 9, 2024
4762942
Merge pull request #22 from JuliaORS/main-class-adjustment
JuliaORS Mar 9, 2024
d167d68
tres métodos extra Command removeTeacherFromCourse, unenrollStudent, …
Katenokk Mar 9, 2024
13d6f03
Merge pull request #23 from JuliaORS/7-GetAll-GetID
JuliaORS Mar 9, 2024
54880a3
rama de pruebas con 3 métodos extra y ajustes en assignTeacher
Katenokk Mar 10, 2024
201957c
add new item creator, add test command utils
JuliaORS Mar 12, 2024
a3fc203
update new creator
JuliaORS Mar 12, 2024
708fbd0
Merge branch 'main' into 7-GetAll-GetID
JuliaORS Mar 12, 2024
bc83763
Merge pull request #24 from JuliaORS/7-GetAll-GetID
JuliaORS Mar 12, 2024
bac3789
new commands
JuliaORS Mar 12, 2024
8461e49
manage exceptions
JuliaORS Mar 12, 2024
425d867
3 metodos nuevos
Katenokk Mar 12, 2024
7d8b730
Fix testEnrollStudent and testShowProfit
annadpp Mar 12, 2024
0d29d04
Merge pull request #25 from JuliaORS/command-test
annadpp Mar 12, 2024
52fb511
refractor main
JuliaORS Mar 12, 2024
bac9e61
Merge branch 'main' into 7-GetAll-GetID
JuliaORS Mar 12, 2024
928bafd
Merge pull request #26 from JuliaORS/7-GetAll-GetID
JuliaORS Mar 12, 2024
f1332ea
Merge branch 'main' into 7-GetAll-GetID
JuliaORS Mar 12, 2024
cf4c93c
arreglando merge
Katenokk Mar 12, 2024
5b5da1d
commandUtilsTest
JuliaORS Mar 12, 2024
24cca87
Merge pull request #28 from JuliaORS/7-GetAll-GetID
JuliaORS Mar 12, 2024
f2e55b7
Create README_IS.md
JuliaORS Mar 12, 2024
14a39cf
Merge branch 'main' into intento-merge
victoriaschwin Mar 12, 2024
a305ee1
Merge pull request #29 from JuliaORS/intento-merge
victoriaschwin Mar 12, 2024
c26e959
fix course class bug
victoriaschwin Mar 12, 2024
e07046b
fix Course and Commands bugs
victoriaschwin Mar 12, 2024
5c0774f
arreglar peqeños fallos getCourse removeCourse
Katenokk Mar 13, 2024
e468e13
Merge pull request #30 from JuliaORS/push-definitivo
mandril888 Mar 13, 2024
16f539e
command.java - setCourse() / Commannds.java - print courses / student…
Katenokk Mar 13, 2024
6682d3a
Merge pull request #31 from JuliaORS/push-definitivo
Katenokk Mar 13, 2024
d377b2d
arreglar updateMoneyEarned y quitar validacion de Curso
Katenokk Mar 13, 2024
1e349e5
Merge pull request #32 from JuliaORS/push-definitivo
Katenokk Mar 13, 2024
d2bf137
añadir null en un helper de Command / ajustar mis test para que pasen
Katenokk Mar 13, 2024
af438fb
Merge pull request #33 from JuliaORS/push-definitivo
Katenokk Mar 13, 2024
8bb70b5
add colors to prints
victoriaschwin Mar 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/homework-java-ironschool.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

124 changes: 124 additions & 0 deletions .idea/uiDesigner.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 29 additions & 0 deletions README_IS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# School Management System

This project is a School Management System that helps manage students, teachers, and courses with basic functionalities. It includes classes for Teacher, Student, and Course, along with a text-based menu system to interact with the system.

## How the Application Works

The application starts by asking for the school's name. Then, it asks for the teachers, students and courses to be created and their details.

Once the school has been created, the user can enter commands to execute actions in the system.

## Commands

- **ENROLL [STUDENT_ID] [COURSE_ID]**: Enrolls the specified student in the corresponding course and updates the course's money_earned.
- **ASSIGN [TEACHER_ID] [COURSE_ID]**: Assigns the specified teacher to the corresponding course.
- **SHOW COURSES**: Displays a list of all courses.
- **LOOKUP COURSE [COURSE_ID]**: Displays the full details of the specified course.
- **SHOW STUDENTS**: Displays a list of all students.
- **LOOKUP STUDENT [STUDENT_ID]**: Displays the full details of the specified student.
- **SHOW TEACHERS**: Displays a list of all teachers.
- **LOOKUP TEACHER [TEACHER_ID]**: Displays the full details of the specified teacher.
- **SHOW PROFIT**: Calculates and displays the total profit (money earned from courses - sum of all teachers' salaries).
- **ADD NEW TEACHER**
- **ADD NEW COURSE**
- **ADD NEW STUDENT**

## Testing

In order to ensure the reliability and functionality of the system's main features and commands, a comprehensive testing approach has been implemented.
This includes the creation of unit tests using JUnit, these tests cover various scenarios and edge cases to validate the behavior of the system under different conditions.
25 changes: 25 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>groupId</groupId>
<artifactId>homework-java-ironschool</artifactId>
<version>1.0-SNAPSHOT</version>

<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.10.0</version>
</dependency>
</dependencies>

</project>
Loading