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

Solution of ironschool lab #12

Open
wants to merge 72 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
29a5d72
Maven added, David Student class and Darwin Course class
Darwin231 Feb 24, 2024
94505a4
Teacher commit
XaviSB Feb 24, 2024
c83641b
Maven set
Darwin231 Feb 24, 2024
3bde6f2
Merge remote-tracking branch 'origin/main'
Darwin231 Feb 24, 2024
22900ca
Maven set
Darwin231 Feb 24, 2024
a0d3cb2
Teacher class added to Course.java
Darwin231 Feb 24, 2024
308ebaf
Teacher commit 2
XaviSB Feb 24, 2024
ed8dc6d
fix teacher class
XaviSB Feb 24, 2024
c72603d
Merge pull request #1 from Darwin231/feature_teacher_application
XaviSB Feb 24, 2024
da605c9
Commands class created
jtiradohernandez Feb 24, 2024
0ca2b3d
Merge pull request #3 from jtiradohernandez/CommandBase
jtiradohernandez Feb 24, 2024
2bbf919
save commit after merge to this branch
XaviSB Feb 24, 2024
4f88d19
minor changes student
celularfreak Feb 24, 2024
f04c24f
Change from arrays to maps in Command class
jtiradohernandez Feb 24, 2024
4939741
Merge pull request #4 from Darwin231/CommandSelector
jtiradohernandez Feb 24, 2024
e8d3d2e
Merge branch 'main' into feature_application
XaviSB Feb 24, 2024
3a00d3d
save commit after merge to this branch
XaviSB Feb 24, 2024
5943c24
save commit after merge to this branch
XaviSB Feb 24, 2024
2aed7e0
save commit after merge to this branch
XaviSB Feb 24, 2024
0629425
commands 3-9
celularfreak Feb 24, 2024
81cd2cf
Merge pull request #5 from Darwin231/feature-commands-3-8
celularfreak Feb 24, 2024
2aef33a
command corrected
celularfreak Feb 24, 2024
552969b
minor change in Student
celularfreak Feb 24, 2024
ca462ad
save commit after merge to this branch
XaviSB Feb 24, 2024
b6a2ecd
Merge branch 'main' into feature_application
XaviSB Feb 24, 2024
1284ade
save commit after merge to this branch
XaviSB Feb 24, 2024
19a0483
Merge pull request #6 from Darwin231/feature_application
XaviSB Feb 24, 2024
57c4a19
save commit after merge to the Menu branch
XaviSB Feb 24, 2024
3de9248
save commit after merge to the Menu branch
XaviSB Feb 25, 2024
ad15970
save commit after merge to the Menu branch
XaviSB Feb 25, 2024
c4e6ef2
Create enroll and assign classes
Darwin231 Feb 26, 2024
33e7134
commands 3 to 8 advance
Darwin231 Feb 29, 2024
9bd1eed
setMoneyEarned changed
Darwin231 Feb 29, 2024
2554cbf
save commit after merge to the Menu branch
XaviSB Feb 29, 2024
ad4b7ed
Merge branch 'main' into feature-commandos-1-2
Darwin231 Feb 29, 2024
6a701df
Merge pull request #8 from Darwin231/feature-commandos-1-2
Darwin231 Feb 29, 2024
c615591
Implement Command 9 - Show profit
anagmrebelo Feb 29, 2024
5a832db
Merge pull request #7 from Darwin231/Menu
anagmrebelo Feb 29, 2024
2e18e32
Merge pull request #9 from Darwin231/ar_command9
celularfreak Feb 29, 2024
601fa07
Code refactor
anagmrebelo Feb 29, 2024
1927c76
Merge pull request #10 from Darwin231/ar_join_tasks
jtiradohernandez Feb 29, 2024
e3df4d2
Selector de comandos y arreglo de error en merge
jtiradohernandez Feb 29, 2024
5bf1cdc
Fix of scanner closing early
jtiradohernandez Feb 29, 2024
75c4e76
Merge pull request #11 from Darwin231/selectorofcommands
celularfreak Mar 9, 2024
2b0c046
changes
celularfreak Mar 9, 2024
0b1533b
fix application class
XaviSB Mar 9, 2024
681fb33
test of createSchoolName() y numberOfComponents(SchoolComponents sch…
XaviSB Mar 10, 2024
9037952
test of createSchoolName() y numberOfComponents(SchoolComponents sch…
XaviSB Mar 10, 2024
5d85689
Fix of control for UUID available when a command is selected
jtiradohernandez Mar 10, 2024
f4c9845
Compilation information missing
jtiradohernandez Mar 10, 2024
c13712f
Merge pull request #13 from Darwin231/fix_app_errors
jtiradohernandez Mar 10, 2024
b152750
Merge main to CommandsTesting
jtiradohernandez Mar 10, 2024
59007a9
Merge pull request #14 from Darwin231/CommandsTesting
celularfreak Mar 11, 2024
d59c04e
test 4 to 8 unfinished
celularfreak Mar 11, 2024
6189622
Merge remote-tracking branch 'origin/main'
celularfreak Mar 11, 2024
fadd175
test 3 to 8 unfinished
celularfreak Mar 11, 2024
fe62119
test 3 5 7 finished and updated Commands
celularfreak Mar 11, 2024
2fb45dd
All test done and working
celularfreak Mar 11, 2024
865e131
Course not null, getters and setters
Darwin231 Mar 11, 2024
f31f619
Implement tests and bonus command
anagmrebelo Mar 11, 2024
9f2cd68
Merge pull request #15 from Darwin231/9_tests
celularfreak Mar 12, 2024
e3a3471
cleaned
celularfreak Mar 12, 2024
3ed7253
nothing
celularfreak Mar 12, 2024
4731fd5
Course not null, getters and setters
Darwin231 Mar 11, 2024
f7675da
Merge remote-tracking branch 'origin/main'
celularfreak Mar 12, 2024
bf737a7
recuperar
celularfreak Mar 12, 2024
875a0d9
Upload lost command
anagmrebelo Mar 12, 2024
e06d6c4
Merge pull request #16 from Darwin231/9_tests
anagmrebelo Mar 12, 2024
5bf1e0a
Commands 1 and 2 test
Darwin231 Mar 12, 2024
d9cf105
Fix of application tests
jtiradohernandez Mar 12, 2024
c837576
add normal tests
XaviSB Mar 13, 2024
777437a
Merge pull request #17 from Darwin231/addTests
jtiradohernandez 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
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Default ignored files
/shelf/
/.idea/workspace.xml

7 changes: 7 additions & 0 deletions .idea/codeStyles/Project.xml

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

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.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/compiler.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.

8 changes: 8 additions & 0 deletions .idea/modules.xml

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

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

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

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

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

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

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

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

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.

31 changes: 31 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?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>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.9.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.30</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
Loading