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

Ironschool homework #9

wants to merge 118 commits into from

Commits on Feb 24, 2024

  1. add maven

    JuliaORS committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    1c599a9 View commit details
    Browse the repository at this point in the history
  2. add src folder

    JuliaORS committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    1aedb6e View commit details
    Browse the repository at this point in the history
  3. add teacher class

    JuliaORS committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    2a940b0 View commit details
    Browse the repository at this point in the history
  4. create org package

    JuliaORS committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    cbcd208 View commit details
    Browse the repository at this point in the history
  5. new branch

    victoriaschwin committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    a63d01d View commit details
    Browse the repository at this point in the history
  6. Add Student class

    annadpp committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    9377a6d View commit details
    Browse the repository at this point in the history
  7. command class

    victoriaschwin committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    8bae0a0 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    47c5666 View commit details
    Browse the repository at this point in the history
  9. add Teacher class

    JuliaORS committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    ecbfae5 View commit details
    Browse the repository at this point in the history
  10. Merge pull request #1 from JuliaORS/5.1

    5.1
    JuliaORS authored Feb 24, 2024
    Configuration menu
    Copy the full SHA
    1882da6 View commit details
    Browse the repository at this point in the history
  11. update teacher class

    JuliaORS committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    e9cb39c View commit details
    Browse the repository at this point in the history
  12. Add helper getInfo()

    annadpp committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    aee3e75 View commit details
    Browse the repository at this point in the history
  13. update branch

    JuliaORS committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    b5e9b7b View commit details
    Browse the repository at this point in the history
  14. Main menu implementation

    mandril888 committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    c1590b4 View commit details
    Browse the repository at this point in the history
  15. update changes

    JuliaORS committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    94df562 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    c85772b View commit details
    Browse the repository at this point in the history
  17. Merge pull request #3 from JuliaORS/4-Main-menu

    4 main menu
    JuliaORS authored Feb 24, 2024
    Configuration menu
    Copy the full SHA
    1634bb1 View commit details
    Browse the repository at this point in the history
  18. Fixed for pull request

    annadpp committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    bdf16be View commit details
    Browse the repository at this point in the history
  19. solve merge conflicts

    JuliaORS committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    27cce32 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    eadc98e View commit details
    Browse the repository at this point in the history
  21. Merge pull request #7 from JuliaORS/1-Create-teacher-class

    1-create-teacher-class
    victoriaschwin authored Feb 24, 2024
    Configuration menu
    Copy the full SHA
    a6c25ca View commit details
    Browse the repository at this point in the history
  22. Fixing error

    annadpp committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    08cfb72 View commit details
    Browse the repository at this point in the history
  23. Merge pull request #8 from JuliaORS/3-Create-Student-class

    3 create student class
    annadpp authored Feb 24, 2024
    Configuration menu
    Copy the full SHA
    de08058 View commit details
    Browse the repository at this point in the history
  24. add course class

    Katenokk committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    4c4fd62 View commit details
    Browse the repository at this point in the history
  25. arreglando main branch

    Katenokk committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    becbc41 View commit details
    Browse the repository at this point in the history
  26. adjustments

    mandril888 committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    35ff7ef View commit details
    Browse the repository at this point in the history
  27. merge main

    JuliaORS committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    95441d3 View commit details
    Browse the repository at this point in the history
  28. solve emrge conflicts

    JuliaORS committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    9f37847 View commit details
    Browse the repository at this point in the history
  29. Configuration menu
    Copy the full SHA
    63501d1 View commit details
    Browse the repository at this point in the history
  30. add School class

    JuliaORS committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    c433253 View commit details
    Browse the repository at this point in the history
  31. add School class

    JuliaORS committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    fd5d962 View commit details
    Browse the repository at this point in the history
  32. Merge pull request #9 from JuliaORS/12-Create-School-Class

    12-Create-School-class
    JuliaORS authored Feb 24, 2024
    Configuration menu
    Copy the full SHA
    871eb37 View commit details
    Browse the repository at this point in the history
  33. command main menu

    victoriaschwin committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    606071d View commit details
    Browse the repository at this point in the history
  34. Merge pull request #10 from JuliaORS/11

    command main menu
    victoriaschwin authored Feb 24, 2024
    Configuration menu
    Copy the full SHA
    a509e4a View commit details
    Browse the repository at this point in the history
  35. creator classes

    mandril888 committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    45614ee View commit details
    Browse the repository at this point in the history
  36. Configuration menu
    Copy the full SHA
    9b3b10e View commit details
    Browse the repository at this point in the history
  37. Merge pull request #11 from JuliaORS/10-implement-classes-main

    10 implement classes main
    mandril888 authored Feb 24, 2024
    Configuration menu
    Copy the full SHA
    129f9ac View commit details
    Browse the repository at this point in the history
  38. Configuration menu
    Copy the full SHA
    3b3ef73 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. Configuration menu
    Copy the full SHA
    c8bef80 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. update command utils

    JuliaORS committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    933d6c2 View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2024

  1. añadir metodo assignTeacher

    Katenokk committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    1727fcc View commit details
    Browse the repository at this point in the history
  2. Merge pull request #12 from JuliaORS/fix-git

    Fix git
    JuliaORS authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    c5963a7 View commit details
    Browse the repository at this point in the history
  3. changes main scanner

    victoriaschwin committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    4afa186 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f403833 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a1af8b4 View commit details
    Browse the repository at this point in the history
  6. remove scanner.close()

    mandril888 committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    5e162b3 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    e5b2039 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    f6ac157 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #13 from JuliaORS/fix-git

    quitar teacher del constructor
    Katenokk authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    3f2ed3e View commit details
    Browse the repository at this point in the history
  10. command utils

    JuliaORS committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    d19f15a View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    b02957c View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    e6a0221 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    9432ae4 View commit details
    Browse the repository at this point in the history
  14. Merge pull request #15 from JuliaORS/7-GetAll-GetID

    7-GetAll-GetbyID
    victoriaschwin authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    35df9f6 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. Configuration menu
    Copy the full SHA
    07beda3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c57a6e5 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2024

  1. Merge pull request #16 from JuliaORS/Command_enroll_profit

    Add enrollStudent + showProfit + tests
    JuliaORS authored Mar 2, 2024
    Configuration menu
    Copy the full SHA
    19a0431 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2024

  1. Configuration menu
    Copy the full SHA
    a2d2116 View commit details
    Browse the repository at this point in the history
  2. change command menu

    victoriaschwin committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    4e0a37f View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. create School in main

    mandril888 committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    90a12b3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    15e81b0 View commit details
    Browse the repository at this point in the history
  3. update look up method

    JuliaORS committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    feb9ce1 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #17 from JuliaORS/7-GetAll-GetID

    7-GetAll-GetID
    JuliaORS authored Mar 7, 2024
    Configuration menu
    Copy the full SHA
    fd36547 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2024

  1. Configuration menu
    Copy the full SHA
    3e22b21 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1665b5f View commit details
    Browse the repository at this point in the history
  3. Update enrollStudent

    annadpp authored Mar 8, 2024
    Configuration menu
    Copy the full SHA
    37660a3 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    244a6c0 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #18 from JuliaORS/test-branch

    update course.java + assignTeacher()
    Katenokk authored Mar 8, 2024
    Configuration menu
    Copy the full SHA
    2ee2545 View commit details
    Browse the repository at this point in the history
  6. Update enrollStudent

    annadpp authored Mar 8, 2024
    Configuration menu
    Copy the full SHA
    9cf1431 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #19 from JuliaORS/Command_enroll_profit

    Update enrollStudent
    annadpp authored Mar 8, 2024
    Configuration menu
    Copy the full SHA
    e0d7078 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2024

  1. Configuration menu
    Copy the full SHA
    ee273b0 View commit details
    Browse the repository at this point in the history
  2. merge conflicts

    victoriaschwin committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    3e1bc9d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9fbf308 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ff8bcf4 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a4d65c5 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    c594b12 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    7e20ba9 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    ee8827c View commit details
    Browse the repository at this point in the history
  9. Merge pull request #21 from JuliaORS/command-test

    Command test
    Katenokk authored Mar 9, 2024
    Configuration menu
    Copy the full SHA
    6c8e5f8 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    0ab444b View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    54cafc6 View commit details
    Browse the repository at this point in the history
  12. basic changes

    mandril888 committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    a183362 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    b31799c View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    597f5a6 View commit details
    Browse the repository at this point in the history
  15. Merge pull request #22 from JuliaORS/main-class-adjustment

    main-class-adjustment
    JuliaORS authored Mar 9, 2024
    Configuration menu
    Copy the full SHA
    4762942 View commit details
    Browse the repository at this point in the history
  16. tres métodos extra Command removeTeacherFromCourse, unenrollStudent, …

    …enrollStudents, añadir removeTeachr a Main para probar
    Katenokk committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    d167d68 View commit details
    Browse the repository at this point in the history
  17. Merge pull request #23 from JuliaORS/7-GetAll-GetID

    7-get-all-get-Id
    JuliaORS authored Mar 9, 2024
    Configuration menu
    Copy the full SHA
    13d6f03 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2024

  1. Configuration menu
    Copy the full SHA
    54880a3 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2024

  1. Configuration menu
    Copy the full SHA
    201957c View commit details
    Browse the repository at this point in the history
  2. update new creator

    JuliaORS committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    a3fc203 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    708fbd0 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #24 from JuliaORS/7-GetAll-GetID

    7-Get-All-Get-ID
    JuliaORS authored Mar 12, 2024
    Configuration menu
    Copy the full SHA
    bc83763 View commit details
    Browse the repository at this point in the history
  5. new commands

    JuliaORS committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    bac3789 View commit details
    Browse the repository at this point in the history
  6. manage exceptions

    JuliaORS committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    8461e49 View commit details
    Browse the repository at this point in the history
  7. 3 metodos nuevos

    Katenokk committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    425d867 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    7d8b730 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #25 from JuliaORS/command-test

    Fix testEnrollStudent and testShowProfit
    annadpp authored Mar 12, 2024
    Configuration menu
    Copy the full SHA
    0d29d04 View commit details
    Browse the repository at this point in the history
  10. refractor main

    JuliaORS committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    52fb511 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    bac9e61 View commit details
    Browse the repository at this point in the history
  12. Merge pull request #26 from JuliaORS/7-GetAll-GetID

    refractor main
    JuliaORS authored Mar 12, 2024
    Configuration menu
    Copy the full SHA
    928bafd View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    f1332ea View commit details
    Browse the repository at this point in the history
  14. arreglando merge

    Katenokk committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    cf4c93c View commit details
    Browse the repository at this point in the history
  15. commandUtilsTest

    JuliaORS committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    5b5da1d View commit details
    Browse the repository at this point in the history
  16. Merge pull request #28 from JuliaORS/7-GetAll-GetID

    Add command utils test
    JuliaORS authored Mar 12, 2024
    Configuration menu
    Copy the full SHA
    24cca87 View commit details
    Browse the repository at this point in the history
  17. Create README_IS.md

    JuliaORS authored Mar 12, 2024
    Configuration menu
    Copy the full SHA
    f2e55b7 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    14a39cf View commit details
    Browse the repository at this point in the history
  19. Merge pull request #29 from JuliaORS/intento-merge

    Intento merge
    victoriaschwin authored Mar 12, 2024
    Configuration menu
    Copy the full SHA
    a305ee1 View commit details
    Browse the repository at this point in the history
  20. fix course class bug

    victoriaschwin committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    c26e959 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    e07046b View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2024

  1. Configuration menu
    Copy the full SHA
    5c0774f View commit details
    Browse the repository at this point in the history
  2. Merge pull request #30 from JuliaORS/push-definitivo

    arreglar peqeños fallos getCourse removeCourse
    mandril888 authored Mar 13, 2024
    Configuration menu
    Copy the full SHA
    e468e13 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    16f539e View commit details
    Browse the repository at this point in the history
  4. Merge pull request #31 from JuliaORS/push-definitivo

    command.java - setCourse() / Commannds.java - print courses / student…
    Katenokk authored Mar 13, 2024
    Configuration menu
    Copy the full SHA
    6682d3a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    d377b2d View commit details
    Browse the repository at this point in the history
  6. Merge pull request #32 from JuliaORS/push-definitivo

    arreglar updateMoneyEarned y quitar validacion de Curso
    Katenokk authored Mar 13, 2024
    Configuration menu
    Copy the full SHA
    1e349e5 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    d2bf137 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #33 from JuliaORS/push-definitivo

    añadir null en un helper de Command / ajustar mis test para que pasen
    Katenokk authored Mar 13, 2024
    Configuration menu
    Copy the full SHA
    af438fb View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. add colors to prints

    victoriaschwin committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    8bb70b5 View commit details
    Browse the repository at this point in the history