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

Develop #13

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

Develop #13

wants to merge 127 commits into from

Commits on Feb 24, 2024

  1. original commit

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

  2. Creation of schema

    @katalin-jordans
    katalin-jordans committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    044a835 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1 from ainafetse22/schema 

    Creation of schema
    @ivandavid858
    ivandavid858 authored Feb 24, 2024
    Configuration menu
    Copy the full SHA
    db916f3 View commit details
    Browse the repository at this point in the history

  4. added logic in generateSerialId method

    @katalin-jordans
    katalin-jordans committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    6de7e6a View commit details
    Browse the repository at this point in the history

  5. add constructor to class course

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

  6. Merge pull request #2 from ainafetse22/generateId 

    Generate ID
    @ainafetse22
    ainafetse22 authored Feb 24, 2024
    Configuration menu
    Copy the full SHA
    81961cf View commit details
    Browse the repository at this point in the history

  7. utils should be static

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

  8. add person constructor

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

  9. Merge pull request #3 from ainafetse22/person_class 

    Person class
    @katalin-jordans
    katalin-jordans authored Feb 24, 2024
    Configuration menu
    Copy the full SHA
    e28643c View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'origin/develop' into course_class

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

  11. bug fix Person constructor and courses class

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

  12. course is not a child of person

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

  13. Merge pull request #5 from ainafetse22/course_class 

    Course class
    @katalin-jordans
    katalin-jordans authored Feb 24, 2024
    Configuration menu
    Copy the full SHA
    eafab77 View commit details
    Browse the repository at this point in the history

  14. constructor creation for student

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

  15. Merge pull request #6 from ainafetse22/student_class 

    Student class
    @katalin-jordans
    katalin-jordans authored Feb 24, 2024
    Configuration menu
    Copy the full SHA
    64cdf85 View commit details
    Browse the repository at this point in the history

  16. Create teacher constructor

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

  17. Modify setSalary

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

  18. Merge pull request #7 from ainafetse22/constructor_teacher 

    Create teacher constructor
    @ainafetse22
    ainafetse22 authored Feb 24, 2024
    Configuration menu
    Copy the full SHA
    b77199c View commit details
    Browse the repository at this point in the history

  19. Addition of logic in lookup methods

    @katalin-jordans
    katalin-jordans committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    1bc2e65 View commit details
    Browse the repository at this point in the history

  20. Merge remote-tracking branch 'origin/develop' into school_lookups

    @katalin-jordans
    katalin-jordans committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    f6d28c5 View commit details
    Browse the repository at this point in the history

  21. Addition of logic in show methods

    @katalin-jordans
    katalin-jordans committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    24b4418 View commit details
    Browse the repository at this point in the history

  22. Merge pull request #8 from ainafetse22/school_lookups 

    School lookups
    @ainafetse22
    ainafetse22 authored Feb 24, 2024
    Configuration menu
    Copy the full SHA
    7fb0b7a View commit details
    Browse the repository at this point in the history

  23. Addition of calculateProfit method

    @katalin-jordans
    katalin-jordans committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    7d31b31 View commit details
    Browse the repository at this point in the history

  24. Merge pull request #9 from ainafetse22/school_lookups 

    Addition of calculateProfit method
    @ivandavid858
    ivandavid858 authored Feb 24, 2024
    Configuration menu
    Copy the full SHA
    8b92b55 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. change list to map

    @estefaniaemburse
    estefaniaemburse committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    bb5a33b View commit details
    Browse the repository at this point in the history

  2. handling case is null

    @estefaniaemburse
    estefaniaemburse committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    0c87980 View commit details
    Browse the repository at this point in the history

  3. create school from csv

    @estefaniaemburse
    estefaniaemburse committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    958363e View commit details
    Browse the repository at this point in the history

  4. csv dummy info

    @estefaniaemburse
    estefaniaemburse committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    fbdb33f View commit details
    Browse the repository at this point in the history

  5. read info from csv

    @estefaniaemburse
    estefaniaemburse committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    55524a0 View commit details
    Browse the repository at this point in the history

  6. Enum form type of entity

    @estefaniaemburse
    estefaniaemburse committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    c06e982 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #10 from ainafetse22/school_implementation 

    School implementation
    @katalin-jordans
    katalin-jordans authored Feb 27, 2024
    Configuration menu
    Copy the full SHA
    0a3dd4d View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2024

  1. Added salary validation

    @katalin-jordans
    katalin-jordans committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    73179b8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #11 from ainafetse22/teacherValidation 

    Added salary validation
    @katalin-jordans
    katalin-jordans authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    611e6a3 View commit details
    Browse the repository at this point in the history

  3. Revert "Added salary validation"

    @katalin-jordans
    katalin-jordans authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    c3a1b50 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #12 from ainafetse22/revert-11-teacherValidation 

    Revert "Added salary validation"
    @katalin-jordans
    katalin-jordans authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    fffebfb View commit details
    Browse the repository at this point in the history

  5. Added salary validation

    @katalin-jordans
    katalin-jordans committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    53e4e5b View commit details
    Browse the repository at this point in the history

  6. Added salary validation

    @katalin-jordans
    katalin-jordans committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    9ac6bd9 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' into teacher_validation

    @katalin-jordans
    katalin-jordans committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    6c2774f View commit details
    Browse the repository at this point in the history

  8. added salary validation

    @katalin-jordans
    katalin-jordans committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    9a9ccc5 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #13 from ainafetse22/teacher_validation 

    Teacher validation
    @ainafetse22
    ainafetse22 authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    ac1a589 View commit details
    Browse the repository at this point in the history

  10. Create enroll method to enroll a student to a course

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

  11. Merge pull request #14 from ainafetse22/method_enroll_student_to_course 

    Create enroll method to enroll a student to a course
    @katalin-jordans
    katalin-jordans authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    c5b068c View commit details
    Browse the repository at this point in the history

  12. Updated assignTeacherToCourse method

    @katalin-jordans
    katalin-jordans committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    588ac88 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #16 from ainafetse22/assign_teacher2 

    Updated assignTeacherToCourse method
    @ainafetse22
    ainafetse22 authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    1c59d27 View commit details
    Browse the repository at this point in the history

  14. move create school to ReadCsvInfo

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

  15. validate_number_of method

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

  16. menu creation

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

Commits on Mar 5, 2024

  1. Create method to show students enrolled to a course

    @ivandavid858
    ivandavid858 committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    1cd96f0 View commit details
    Browse the repository at this point in the history

  2. Fix setMoney setMoney_earnet method

    @ivandavid858
    ivandavid858 committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    8a978d5 View commit details
    Browse the repository at this point in the history

  3. Create method showMoneySpentByStudent

    @ivandavid858
    ivandavid858 committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    28646b5 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2024

  1. updated lookup methods to print info

    @lausaru
    lausaru committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    282d49f View commit details
    Browse the repository at this point in the history

  2. Merge commit '1c59d277bb50fe8e5dff3987fb097c6ff01f2b85' into menu_cre… 

    …ation
    @estefaniaemburse
    estefaniaemburse committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    ad2c586 View commit details
    Browse the repository at this point in the history

  3. removed lookup methods testing from App

    @lausaru
    lausaru committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    3dc980b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into method_enroll_student_to_course

    @lausaru
    lausaru authored Mar 9, 2024
    Configuration menu
    Copy the full SHA
    8c6b10c View commit details
    Browse the repository at this point in the history

  5. Merge pull request #18 from ainafetse22/method_enroll_student_to_course 

    Method enroll student to course
    @lausaru
    lausaru authored Mar 9, 2024
    Configuration menu
    Copy the full SHA
    2d8fa8a View commit details
    Browse the repository at this point in the history

  6. Merge pull request #22 from ainafetse22/update_lookup_methods 

    updated lookup methods to print info details
    @ainafetse22
    ainafetse22 authored Mar 9, 2024
    Configuration menu
    Copy the full SHA
    e77e6d5 View commit details
    Browse the repository at this point in the history

  7. teacher course and students creation method

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

  8. exchanged throwing exception for print

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

  9. Merge remote-tracking branch 'origin/develop' into menu_creation

    @estefaniaemburse
    estefaniaemburse committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    83c0054 View commit details
    Browse the repository at this point in the history

  10. add condition more than 0

    @estefaniaemburse
    estefaniaemburse committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    088ca37 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #24 from ainafetse22/menu_creation 

    Menu creation
    @lausaru
    lausaru authored Mar 9, 2024
    Configuration menu
    Copy the full SHA
    4e5dffc View commit details
    Browse the repository at this point in the history

  12. Add Validate Email util and update Student.java email validation

    @DJH23
    DJH23 committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    71d17be View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2024

  1. first testing methods implemented

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

  2. Merge branch 'develop' into validation_new

    @ainafetse22
    ainafetse22 authored Mar 12, 2024
    Configuration menu
    Copy the full SHA
    c88bbf8 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #25 from ainafetse22/validation_new 

    Add Validate Email util and update Student.java email validation
    @ainafetse22
    ainafetse22 authored Mar 12, 2024
    Configuration menu
    Copy the full SHA
    dfdfa08 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #19 from ainafetse22/money_spent 

    Create method showMoneySpentByStudent
    @ainafetse22
    ainafetse22 authored Mar 12, 2024
    Configuration menu
    Copy the full SHA
    f61e1e0 View commit details
    Browse the repository at this point in the history

  5. revert changes

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

  6. Merge branch 'develop' into show_students_by_course_id

    @ainafetse22
    ainafetse22 authored Mar 12, 2024
    Configuration menu
    Copy the full SHA
    8af4890 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #17 from ainafetse22/show_students_by_course_id 

    Create method to show students enrolled to a course
    @ainafetse22
    ainafetse22 authored Mar 12, 2024
    Configuration menu
    Copy the full SHA
    c04b68d View commit details
    Browse the repository at this point in the history

  8. Add exception rules to calculateProfit in School.java and add testing… 

    … for it
    @DJH23
    DJH23 committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    32bb7a5 View commit details
    Browse the repository at this point in the history

  9. Change throw to system out in calculateProfit

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

  10. testing implementation v2.0

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

  11. validation added to menu

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

  12. Merge pull request #28 from ainafetse22/menu_integration 

    validation added to menu
    @ainafetse22
    ainafetse22 authored Mar 12, 2024
    Configuration menu
    Copy the full SHA
    4144a48 View commit details
    Browse the repository at this point in the history

  13. revert files pom and workspace

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

  14. Merge pull request #26 from ainafetse22/school_implementation 

    Add exception rules to calculateProfit in School.java and add testing
    @ainafetse22
    ainafetse22 authored Mar 12, 2024
    Configuration menu
    Copy the full SHA
    730e62d View commit details
    Browse the repository at this point in the history

  15. resolved conflicts

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

  16. Merge branch 'develop' into testing

    @lausaru
    lausaru authored Mar 12, 2024
    Configuration menu
    Copy the full SHA
    35f13f3 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #27 from ainafetse22/testing 

    Testing
    @ainafetse22
    ainafetse22 authored Mar 12, 2024
    Configuration menu
    Copy the full SHA
    8dba769 View commit details
    Browse the repository at this point in the history

  18. commands creation

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

  19. Create method Creste test for method showMoneySpentByStudent

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

  20. Add validation to createInstance in ReadCsvInfo as well as testing

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

Commits on Mar 13, 2024

  1. Create test for method findMoneySpentByStudent

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

  2. commands creation

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

  3. Merge pull request #30 from ainafetse22/command_integration_2 

    commands creation
    @ainafetse22
    ainafetse22 authored Mar 13, 2024
    Configuration menu
    Copy the full SHA
    994ac7f View commit details
    Browse the repository at this point in the history

  4. Refactor to reuse code in SchoolTest class

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

  5. Refactor to reuse code in SchoolTest class and create test for enroll… 

    … method
    @ivandavid858
    ivandavid858 committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    84004a1 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/develop' into ReadCsvInfo

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

  7. Merge updates from develop and recommit

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

  8. Merge updates from develop, add lookupTeacher validation, and testing

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

  9. Add showTeachers validation, and testing

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

  10. Add lookupCourse validation, and testing

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

  11. Add showCourses validation, and testing

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

  12. Add setListToTeacherMap validation, and testing

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

  13. Add setListToCourseMap validation, and testing

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

  14. Add setListToStudentMap validation, and testing

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

  15. Add lookupStudent validation, and testing

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

  16. Add showStudents validation, and testing

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

  17. Add School constructor validation, and testing

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

  18. Add findStudentById validation, and testing

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

  19. Add findCourseById validation, and testing

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

  20. Add findTeacherById validation, and testing

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

Commits on Mar 14, 2024

  1. Merge pull request #32 from ainafetse22/school_lookups 

    add validation and testing to numerous methods in the School.java class
    @ainafetse22
    ainafetse22 authored Mar 14, 2024
    Configuration menu
    Copy the full SHA
    b851253 View commit details
    Browse the repository at this point in the history

  2. email validation

    @estefaniaemburse
    estefaniaemburse committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    2cc91ec View commit details
    Browse the repository at this point in the history

  3. show profit

    @estefaniaemburse
    estefaniaemburse committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    d515919 View commit details
    Browse the repository at this point in the history

  4. change id generation

    @estefaniaemburse
    estefaniaemburse committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    c494418 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #33 from ainafetse22/bugfix_develop 

    Bugfix develop
    @ainafetse22
    ainafetse22 authored Mar 14, 2024
    Configuration menu
    Copy the full SHA
    0a61b99 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #31 from ainafetse22/ReadCsvInfo 

    Add ReadCsvInfo validation and testing
    @ainafetse22
    ainafetse22 authored Mar 14, 2024
    Configuration menu
    Copy the full SHA
    21c2684 View commit details
    Browse the repository at this point in the history

  7. add menu for csv

    @estefaniaemburse
    estefaniaemburse committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    d6bcf3b View commit details
    Browse the repository at this point in the history

  8. Resolving conflicts

    @ivandavid858
    ivandavid858 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    ef9afe4 View commit details
    Browse the repository at this point in the history

  9. add csv

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

  10. Merge pull request #34 from ainafetse22/more_bugfix 

    More bugfix
    @ainafetse22
    ainafetse22 authored Mar 14, 2024
    Configuration menu
    Copy the full SHA
    5ec2e60 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #29 from ainafetse22/test_show_money_spent 

    Create method Creste test for method showMoneySpentByStudent
    @ainafetse22
    ainafetse22 authored Mar 14, 2024
    Configuration menu
    Copy the full SHA
    2271b51 View commit details
    Browse the repository at this point in the history

  12. utils ID is long

    @estefaniaemburse
    estefaniaemburse committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    644e0cd View commit details
    Browse the repository at this point in the history

  13. Merge pull request #35 from ainafetse22/more_bugfix3 

    utils ID is long
    @ainafetse22
    ainafetse22 authored Mar 14, 2024
    Configuration menu
    Copy the full SHA
    5881dea View commit details
    Browse the repository at this point in the history

  14. Remove calculateProfit prints

    @DJH23
    DJH23 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    ff95add View commit details
    Browse the repository at this point in the history

  15. Add return statements to if(s) to prevent null pointer exceptions

    @DJH23
    DJH23 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    ed07759 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #36 from ainafetse22/school_lookups 

    Remove calculateProfit prints
    @ainafetse22
    ainafetse22 authored Mar 14, 2024
    Configuration menu
    Copy the full SHA
    ac647f0 View commit details
    Browse the repository at this point in the history

  17. Add retry logic to unfound student and course IDs

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

  18. correction go back

    @estefaniaemburse
    estefaniaemburse committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    2f56acd View commit details
    Browse the repository at this point in the history

  19. Merge pull request #37 from ainafetse22/school_lookups 

    Add retry logic to unfound student and course IDs in App case 1
    @ainafetse22
    ainafetse22 authored Mar 14, 2024
    Configuration menu
    Copy the full SHA
    50db8cd View commit details
    Browse the repository at this point in the history

  20. fix bug

    @estefaniaemburse
    estefaniaemburse committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    2cc94bf View commit details
    Browse the repository at this point in the history

  21. Merge pull request #38 from ainafetse22/new_fix_bug 

    fix bug
    @ainafetse22
    ainafetse22 authored Mar 14, 2024
    Configuration menu
    Copy the full SHA
    770d56d View commit details
    Browse the repository at this point in the history

  22. fix bug

    @estefaniaemburse
    estefaniaemburse committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    e2ac388 View commit details
    Browse the repository at this point in the history

  23. Merge pull request #39 from ainafetse22/bugfix_assign 

    fix bug
    @ainafetse22
    ainafetse22 authored Mar 14, 2024
    Configuration menu
    Copy the full SHA
    6a959e1 View commit details
    Browse the repository at this point in the history

  24. fix bug

    @estefaniaemburse
    estefaniaemburse committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    1998987 View commit details
    Browse the repository at this point in the history

  25. Merge pull request #41 from ainafetse22/assign_teacher_bugfix 

    fix bug
    @ainafetse22
    ainafetse22 authored Mar 14, 2024
    Configuration menu
    Copy the full SHA
    389183e View commit details
    Browse the repository at this point in the history