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.

Sign up for GitHub

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

Jump to bottom

Solution of ironschool lab #12

Open
wants to merge 72 commits into
base: main
Choose a base branch
from
Open

Solution of ironschool lab #12

wants to merge 72 commits into from

Commits on Feb 24, 2024

  1. Maven added, David Student class and Darwin Course class

    @Darwin231
    Darwin231 committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    29a5d72 View commit details
    Browse the repository at this point in the history

  2. Teacher commit

    @XaviSB
    XaviSB committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    94505a4 View commit details
    Browse the repository at this point in the history

  3. Maven set

    @Darwin231
    Darwin231 committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    c83641b View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/main' 

    # Conflicts:
#	src/main/java/Teacher.java
    @Darwin231
    Darwin231 committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    3bde6f2 View commit details
    Browse the repository at this point in the history

  5. Maven set

    @Darwin231
    Darwin231 committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    22900ca View commit details
    Browse the repository at this point in the history

  6. Teacher class added to Course.java

    @Darwin231
    Darwin231 committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    a0d3cb2 View commit details
    Browse the repository at this point in the history

  7. Teacher commit 2

    @XaviSB
    XaviSB committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    308ebaf View commit details
    Browse the repository at this point in the history

  8. fix teacher class

    @XaviSB
    XaviSB committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    ed8dc6d View commit details
    Browse the repository at this point in the history

  9. Merge pull request #1 from Darwin231/feature_teacher_application 

    Feature teacher application
    @XaviSB
    XaviSB authored Feb 24, 2024
    Configuration menu
    Copy the full SHA
    c72603d View commit details
    Browse the repository at this point in the history

  10. Commands class created

    @jtiradohernandez
    jtiradohernandez committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    da605c9 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #3 from jtiradohernandez/CommandBase 

    Commands class created
    @jtiradohernandez
    jtiradohernandez authored Feb 24, 2024
    Configuration menu
    Copy the full SHA
    0ca2b3d View commit details
    Browse the repository at this point in the history

  12. save commit after merge to this branch

    @XaviSB
    XaviSB committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    2bbf919 View commit details
    Browse the repository at this point in the history

  13. minor changes student

    @celularfreak
    celularfreak committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    4f88d19 View commit details
    Browse the repository at this point in the history

  14. Change from arrays to maps in Command class

    @jtiradohernandez
    jtiradohernandez committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    f04c24f View commit details
    Browse the repository at this point in the history

  15. Merge pull request #4 from Darwin231/CommandSelector 

    Change from arrays to maps in Command class
    @jtiradohernandez
    jtiradohernandez authored Feb 24, 2024
    Configuration menu
    Copy the full SHA
    4939741 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'main' into feature_application

    @XaviSB
    XaviSB committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    e8d3d2e View commit details
    Browse the repository at this point in the history

  17. save commit after merge to this branch

    @XaviSB
    XaviSB committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    3a00d3d View commit details
    Browse the repository at this point in the history

  18. save commit after merge to this branch

    @XaviSB
    XaviSB committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    5943c24 View commit details
    Browse the repository at this point in the history

  19. save commit after merge to this branch

    @XaviSB
    XaviSB committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    2aed7e0 View commit details
    Browse the repository at this point in the history

  20. commands 3-9

    @celularfreak
    celularfreak committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    0629425 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #5 from Darwin231/feature-commands-3-8 

    commands 3-8
    @celularfreak
    celularfreak authored Feb 24, 2024
    Configuration menu
    Copy the full SHA
    81cd2cf View commit details
    Browse the repository at this point in the history

  22. command corrected

    @celularfreak
    celularfreak committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    2aef33a View commit details
    Browse the repository at this point in the history

  23. minor change in Student

    @celularfreak
    celularfreak committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    552969b View commit details
    Browse the repository at this point in the history

  24. save commit after merge to this branch

    @XaviSB
    XaviSB committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    ca462ad View commit details
    Browse the repository at this point in the history

  25. Merge branch 'main' into feature_application

    @XaviSB
    XaviSB committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    b6a2ecd View commit details
    Browse the repository at this point in the history

  26. save commit after merge to this branch

    @XaviSB
    XaviSB committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    1284ade View commit details
    Browse the repository at this point in the history

  27. Merge pull request #6 from Darwin231/feature_application 

    Feature application
    @XaviSB
    XaviSB authored Feb 24, 2024
    Configuration menu
    Copy the full SHA
    19a0483 View commit details
    Browse the repository at this point in the history

  28. save commit after merge to the Menu branch

    @XaviSB
    XaviSB committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    57c4a19 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2024

  1. save commit after merge to the Menu branch

    @XaviSB
    XaviSB committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    3de9248 View commit details
    Browse the repository at this point in the history

  2. save commit after merge to the Menu branch

    @XaviSB
    XaviSB committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    ad15970 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. Create enroll and assign classes

    @Darwin231
    Darwin231 committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    c4e6ef2 View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2024

  1. commands 3 to 8 advance

    @Darwin231
    Darwin231 committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    33e7134 View commit details
    Browse the repository at this point in the history

  2. setMoneyEarned changed

    @Darwin231
    Darwin231 committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    9bd1eed View commit details
    Browse the repository at this point in the history

  3. save commit after merge to the Menu branch

    @XaviSB
    XaviSB committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    2554cbf View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into feature-commandos-1-2

    @Darwin231
    Darwin231 authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    ad4b7ed View commit details
    Browse the repository at this point in the history

  5. Merge pull request #8 from Darwin231/feature-commandos-1-2 

    Feature commandos 1 8
    @Darwin231
    Darwin231 authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    6a701df View commit details
    Browse the repository at this point in the history

  6. Implement Command 9 - Show profit

    @anagmrebelo
    anagmrebelo committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    c615591 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #7 from Darwin231/Menu 

    Menu
    @anagmrebelo
    anagmrebelo authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    5a832db View commit details
    Browse the repository at this point in the history

  8. Merge pull request #9 from Darwin231/ar_command9 

    Implement Command 9 - Show profit
    @celularfreak
    celularfreak authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    2e18e32 View commit details
    Browse the repository at this point in the history

  9. Code refactor

    @anagmrebelo
    anagmrebelo committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    601fa07 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #10 from Darwin231/ar_join_tasks 

    Code refactor
    @jtiradohernandez
    jtiradohernandez authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    1927c76 View commit details
    Browse the repository at this point in the history

  11. Selector de comandos y arreglo de error en merge

    @jtiradohernandez
    jtiradohernandez committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    e3df4d2 View commit details
    Browse the repository at this point in the history

  12. Fix of scanner closing early

    @jtiradohernandez
    jtiradohernandez committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    5bf1cdc View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2024

  1. Merge pull request #11 from Darwin231/selectorofcommands 

    Selector of commands and fix of merge problems in main
    @celularfreak
    celularfreak authored Mar 9, 2024
    Configuration menu
    Copy the full SHA
    75c4e76 View commit details
    Browse the repository at this point in the history

  2. changes

    @celularfreak
    celularfreak committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    2b0c046 View commit details
    Browse the repository at this point in the history

  3. fix application class

    @XaviSB
    XaviSB committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    0b1533b View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2024

  1. test of createSchoolName() y numberOfComponents(SchoolComponents scho… 

    …olComponents)
    @XaviSB
    XaviSB committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    681fb33 View commit details
    Browse the repository at this point in the history

  2. test of createSchoolName() y numberOfComponents(SchoolComponents scho… 

    …olComponents)
    @XaviSB
    XaviSB committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    9037952 View commit details
    Browse the repository at this point in the history

  3. Fix of control for UUID available when a command is selected

    @jtiradohernandez
    jtiradohernandez committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    5d85689 View commit details
    Browse the repository at this point in the history

  4. Compilation information missing

    @jtiradohernandez
    jtiradohernandez committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    f4c9845 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #13 from Darwin231/fix_app_errors 

    fix application class
    @jtiradohernandez
    jtiradohernandez authored Mar 10, 2024
    Configuration menu
    Copy the full SHA
    c13712f View commit details
    Browse the repository at this point in the history

  6. Merge main to CommandsTesting

    @jtiradohernandez
    jtiradohernandez committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    b152750 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2024

  1. Merge pull request #14 from Darwin231/CommandsTesting 

    Fix of UUID control
    @celularfreak
    celularfreak authored Mar 11, 2024
    Configuration menu
    Copy the full SHA
    59007a9 View commit details
    Browse the repository at this point in the history

  2. test 4 to 8 unfinished

    @celularfreak
    celularfreak committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    d59c04e View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/main'

    @celularfreak
    celularfreak committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    6189622 View commit details
    Browse the repository at this point in the history

  4. test 3 to 8 unfinished

    @celularfreak
    celularfreak committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    fadd175 View commit details
    Browse the repository at this point in the history

  5. test 3 5 7 finished and updated Commands

    @celularfreak
    celularfreak committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    fe62119 View commit details
    Browse the repository at this point in the history

  6. All test done and working

    @celularfreak
    celularfreak committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    2fb45dd View commit details
    Browse the repository at this point in the history

  7. Course not null, getters and setters

    @Darwin231
    Darwin231 committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    865e131 View commit details
    Browse the repository at this point in the history

  8. Implement tests and bonus command

    @anagmrebelo
    anagmrebelo committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    f31f619 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2024

  1. Merge pull request #15 from Darwin231/9_tests 

    Implement tests command9 and bonus command
    @celularfreak
    celularfreak authored Mar 12, 2024
    Configuration menu
    Copy the full SHA
    9f2cd68 View commit details
    Browse the repository at this point in the history

  2. cleaned

    @celularfreak
    celularfreak committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    e3a3471 View commit details
    Browse the repository at this point in the history

  3. nothing

    @celularfreak
    celularfreak committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    3ed7253 View commit details
    Browse the repository at this point in the history

  4. Course not null, getters and setters

    @Darwin231 @celularfreak
    Darwin231 authored and celularfreak committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    4731fd5 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/main' 

    # Conflicts:
#	.idea/misc.xml
    @celularfreak
    celularfreak committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    f7675da View commit details
    Browse the repository at this point in the history

  6. recuperar

    @celularfreak
    celularfreak committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    bf737a7 View commit details
    Browse the repository at this point in the history

  7. Upload lost command

    @anagmrebelo
    anagmrebelo committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    875a0d9 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #16 from Darwin231/9_tests 

    Upload lost command
    @anagmrebelo
    anagmrebelo authored Mar 12, 2024
    Configuration menu
    Copy the full SHA
    e06d6c4 View commit details
    Browse the repository at this point in the history

  9. Commands 1 and 2 test

    @Darwin231
    Darwin231 committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    5bf1e0a View commit details
    Browse the repository at this point in the history

  10. Fix of application tests

    @jtiradohernandez
    jtiradohernandez committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    d9cf105 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2024

  1. add normal tests

    @XaviSB
    XaviSB committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    c837576 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. Merge pull request #17 from Darwin231/addTests 

    add normal tests
    @jtiradohernandez
    jtiradohernandez authored Mar 14, 2024
    Configuration menu
    Copy the full SHA
    777437a View commit details
    Browse the repository at this point in the history