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

Sprint 2 Release #146

Merged
merged 225 commits into from Mar 11, 2024
Merged

Sprint 2 Release #146

merged 225 commits into from Mar 11, 2024

Commits on Feb 13, 2024

  1. Update README.md 

    Download points to main instead of develop now that there is something to download in main.
    @pwfreedm
    pwfreedm committed Feb 13, 2024
    Copy the full SHA
    8d2fb3c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #66 from mucsci-students/readme-updates 

    Readme updates
    @AdamG-L
    AdamG-L committed Feb 13, 2024
    Copy the full SHA
    2612571 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2024

  1. DO NOT MERGE

    @pwfreedm
    pwfreedm committed Feb 16, 2024
    Copy the full SHA
    931be47 View commit details
    Browse the repository at this point in the history

  2. DO NOT MERGE

    @pwfreedm
    pwfreedm committed Feb 16, 2024
    Copy the full SHA
    1409da6 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2024

  1. Setup Tools Build Structure, first implementation.

    @timbmoser
    timbmoser committed Feb 18, 2024
    Copy the full SHA
    f331823 View commit details
    Browse the repository at this point in the history

  2. Basic updates: 

    - added build directories to gitignore
- modified project name in setup.py
    @pwfreedm
    pwfreedm committed Feb 18, 2024
    Copy the full SHA
    2b575d7 View commit details
    Browse the repository at this point in the history

  3. new folder for generated text files

    @pwfreedm
    pwfreedm committed Feb 18, 2024
    Copy the full SHA
    396e5e3 View commit details
    Browse the repository at this point in the history

  4. moved tests into src

    @pwfreedm
    pwfreedm committed Feb 18, 2024
    Copy the full SHA
    42f28be View commit details
    Browse the repository at this point in the history

  5. Merge pull request #101 from mucsci-students/Build_Package 

    Build System up and Running
Rename and updating imports looks good
    @almostTaklu
    almostTaklu committed Feb 18, 2024
    Copy the full SHA
    2b494c9 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2024

  1. Minor test updates. Most passing as is.

    @timbmoser
    timbmoser committed Feb 20, 2024
    Copy the full SHA
    da9eece View commit details
    Browse the repository at this point in the history

  2. Merge pull request #102 from mucsci-students/Old_Test_Formatting 

    Minor test updates. Most passing as is.
    @pwfreedm
    pwfreedm committed Feb 20, 2024
    Copy the full SHA
    d43a763 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. Progress towards Methods and Fields.

    @timbmoser
    timbmoser committed Feb 21, 2024
    Copy the full SHA
    225d6a8 View commit details
    Browse the repository at this point in the history

  2. DO NOT COMMIT 

    - Moved parser and lexer into their own files
- updated gitignore for arch venv directories
    @pwfreedm
    pwfreedm committed Feb 21, 2024
    Copy the full SHA
    f609884 View commit details
    Browse the repository at this point in the history

  3. Parser and Lexer are Split 

    - Lexer: reads a command from user input, splits it into parseable chunks
- Parser: reads the parseable chunks from the lexer, turning them into a command and arguments
- method check_args is floating so that it can be used wherever needed (namely controller save and load)

This passed all tests before uploading
    @pwfreedm
    pwfreedm committed Feb 21, 2024
    Copy the full SHA
    337018b View commit details
    Browse the repository at this point in the history

  4. Test updates 

    These tests no longer create a controller, and as such can no longer test controller methods. This will be fixed when everything is rewritten in pytest
    @pwfreedm
    pwfreedm committed Feb 21, 2024
    Copy the full SHA
    a577c6b View commit details
    Browse the repository at this point in the history

  5. Merge pull request #103 from mucsci-students/parser 

    Parser
    @timbmoser
    timbmoser committed Feb 21, 2024
    Copy the full SHA
    0767f4a View commit details
    Browse the repository at this point in the history

  6. Bugfixes 

    - Gitignore now properly ignores Linux venv directories
- main no longer starts in debug mode by default
    @pwfreedm
    pwfreedm committed Feb 21, 2024
    Copy the full SHA
    224660a View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' into bugfixes

    @pwfreedm
    pwfreedm committed Feb 21, 2024
    Copy the full SHA
    bc6b7e1 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #104 from mucsci-students/bugfixes 

    Bugfixes
    @timbmoser
    timbmoser committed Feb 21, 2024
    Copy the full SHA
    6e78612 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' into Method_and_Field

    @pwfreedm
    pwfreedm committed Feb 21, 2024
    Copy the full SHA
    d1e44b2 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. Method and Field implemented

    @timbmoser
    timbmoser committed Feb 22, 2024
    Copy the full SHA
    31c2121 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #106 from mucsci-students/Method_and_Field 

    Method and field
    @AdamG-L
    AdamG-L committed Feb 22, 2024
    Copy the full SHA
    ecefe01 View commit details
    Browse the repository at this point in the history

  3. Added relationship type

    @almostTaklu
    almostTaklu committed Feb 22, 2024
    Copy the full SHA
    7fa3554 View commit details
    Browse the repository at this point in the history

  4. Add Exceptions for parameter operations

    @DierF
    DierF committed Feb 22, 2024
    Copy the full SHA
    e2bfebd View commit details
    Browse the repository at this point in the history

  5. Add add/remove/change operations for parameter

    @DierF
    DierF committed Feb 22, 2024
    Copy the full SHA
    435dab3 View commit details
    Browse the repository at this point in the history

  6. Change method documentation

    @DierF
    DierF committed Feb 22, 2024
    Copy the full SHA
    ee26560 View commit details
    Browse the repository at this point in the history

  7. Optimized restore process to preserve order if change operation should 

    fail
    @DierF
    DierF committed Feb 22, 2024
    Copy the full SHA
    5dd5e57 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #107 from mucsci-students/parameter 

    May need to do something with the old param list to make it work as it currently is, but that should be okay.
    @pwfreedm
    pwfreedm committed Feb 22, 2024
    Copy the full SHA
    2a738d6 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2024

  1. Parser and Lexer updates 

    - Parser now handles save, load, and quit again
- Parser is no longer its own object
- Parser now takes an instance of the controller which it uses to generate instance-specific command objects
- Lexer is now back in controller
- Lexer is being used for all views, and has been renamed accordingly
    @pwfreedm
    pwfreedm committed Feb 23, 2024
    Copy the full SHA
    41b0c33 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into parser

    @pwfreedm
    pwfreedm committed Feb 23, 2024
    Copy the full SHA
    57e0fb1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #108 from mucsci-students/parser 

    Parser and Lexer updates
    @AdamG-L
    AdamG-L committed Feb 23, 2024
    Copy the full SHA
    f6361b1 View commit details
    Browse the repository at this point in the history

  4. Moving GUI to main project

    @AdamG-L
    AdamG-L committed Feb 23, 2024
    Copy the full SHA
    05785e7 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' of https://github.com/mucsci-students/2024sp-4… 

    …20-CWorld into gui
    @AdamG-L
    AdamG-L committed Feb 23, 2024
    Copy the full SHA
    86035a3 View commit details
    Browse the repository at this point in the history

  6. removing init issue

    @AdamG-L
    AdamG-L committed Feb 23, 2024
    Copy the full SHA
    e65e6ef View commit details
    Browse the repository at this point in the history

  7. remove potato

    @AdamG-L
    AdamG-L committed Feb 23, 2024
    Copy the full SHA
    de1b576 View commit details
    Browse the repository at this point in the history

  8. Update main.py

    @pwfreedm
    pwfreedm committed Feb 23, 2024
    Copy the full SHA
    474d12e View commit details
    Browse the repository at this point in the history

  9. Merge pull request #109 from mucsci-students/gui 

    Gui
    @pwfreedm
    pwfreedm committed Feb 23, 2024
    Copy the full SHA
    5bfced6 View commit details
    Browse the repository at this point in the history

  10. Test for basic functionality of existing things.

    @timbmoser
    timbmoser committed Feb 23, 2024
    Copy the full SHA
    99990e2 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'develop' into Building_Tests

    @timbmoser
    timbmoser committed Feb 23, 2024
    Copy the full SHA
    9cea474 View commit details
    Browse the repository at this point in the history

  12. Refactors 

    - Controller parent class that contains all shared functionality
- Parse works for everything again (finally)
- there's nothing suspicious going on in parse
- all imports are done correctly now
    @pwfreedm
    pwfreedm committed Feb 23, 2024
    Copy the full SHA
    4cc1833 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'develop' into refactoring

    @pwfreedm
    pwfreedm committed Feb 23, 2024
    Copy the full SHA
    66d5f61 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #110 from mucsci-students/Building_Tests 

    Test for basic functionality of existing things.
    @pwfreedm
    pwfreedm committed Feb 23, 2024
    Copy the full SHA
    9ef86f3 View commit details
    Browse the repository at this point in the history

  15. Adding multi lists within class card

    @AdamG-L
    AdamG-L committed Feb 23, 2024
    Copy the full SHA
    c4837ce View commit details
    Browse the repository at this point in the history

  16. Commented out gui start

    @AdamG-L
    AdamG-L committed Feb 23, 2024
    Copy the full SHA
    024aa88 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #111 from mucsci-students/refactoring 

    Refactors
    @AdamG-L
    AdamG-L committed Feb 23, 2024
    Copy the full SHA
    fccc9cd View commit details
    Browse the repository at this point in the history

  18. Merge branch 'develop' into gui

    @AdamG-L
    AdamG-L committed Feb 23, 2024
    Copy the full SHA
    85262ea View commit details
    Browse the repository at this point in the history

  19. Merge pull request #112 from mucsci-students/gui 

    Gui
    @pwfreedm
    pwfreedm committed Feb 23, 2024
    Copy the full SHA
    0e22407 View commit details
    Browse the repository at this point in the history

  20. Name Changes and GUI Controller Update 

    - GUI controller now inherits from controller
- GUI controller named better
- Minor CLI Syntax updates
- main now imports according to renamed files
    @pwfreedm
    pwfreedm committed Feb 23, 2024
    Copy the full SHA
    6a99b00 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #113 from mucsci-students/refactoring 

    Name Changes and GUI Controller Update
    @AdamG-L
    AdamG-L committed Feb 23, 2024
    Copy the full SHA
    a542790 View commit details
    Browse the repository at this point in the history

  22. Finished relationType

    @almostTaklu
    almostTaklu committed Feb 23, 2024
    Copy the full SHA
    e7b18e2 View commit details
    Browse the repository at this point in the history

  23. Update CLI lexer command and function maps

    @almostTaklu
    almostTaklu committed Feb 23, 2024
    Copy the full SHA
    228faf1 View commit details
    Browse the repository at this point in the history

  24. Resolved conflicts

    @almostTaklu
    almostTaklu committed Feb 23, 2024
    Copy the full SHA
    f327c98 View commit details
    Browse the repository at this point in the history

  25. Fixed test_imports, added test_help

    @pwfreedm
    pwfreedm committed Feb 23, 2024
    Copy the full SHA
    a3f851e View commit details
    Browse the repository at this point in the history

  26. Fixing style of cards

    @AdamG-L
    AdamG-L committed Feb 23, 2024
    Copy the full SHA
    55d739c View commit details
    Browse the repository at this point in the history

  27. Class Card add fields funct.

    @AdamG-L
    AdamG-L committed Feb 23, 2024
    Copy the full SHA
    5bfd505 View commit details
    Browse the repository at this point in the history

  28. Passing a widget through the signal

    @AdamG-L
    AdamG-L committed Feb 23, 2024
    Copy the full SHA
    07f5c4b View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2024

  1. Add comments to gui_controller

    @AdamG-L
    AdamG-L committed Feb 24, 2024
    Copy the full SHA
    9184427 View commit details
    Browse the repository at this point in the history

  2. Documented view_gui

    @AdamG-L
    AdamG-L committed Feb 24, 2024
    Copy the full SHA
    538b218 View commit details
    Browse the repository at this point in the history

  3. Documented class_card

    @AdamG-L
    AdamG-L committed Feb 24, 2024
    Copy the full SHA
    6bc416b View commit details
    Browse the repository at this point in the history

  4. List functionality working based on current implementations.

    @timbmoser
    timbmoser committed Feb 24, 2024
    Copy the full SHA
    39db203 View commit details
    Browse the repository at this point in the history

  5. Fixed two failing tests. Added additional tests for new files.

    @timbmoser
    timbmoser committed Feb 24, 2024
    Copy the full SHA
    fb85a7a View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2024

  1. Merge pull request #117 from mucsci-students/Fixing_Tests 

    Fixed two failing tests. Added additional tests for new files.
    @pwfreedm
    pwfreedm committed Feb 25, 2024
    Copy the full SHA
    e4e09e2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #116 from mucsci-students/List_Updates 

    List functionality working based on current implementations.
    @pwfreedm
    pwfreedm committed Feb 25, 2024
    Copy the full SHA
    e0aca1b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into relationType

    @almostTaklu
    almostTaklu committed Feb 25, 2024
    Copy the full SHA
    8fbe50b View commit details
    Browse the repository at this point in the history

  4. Merge pull request #115 from mucsci-students/gui 

    Added documentation to all GUI related files
    @pwfreedm
    pwfreedm committed Feb 25, 2024
    Copy the full SHA
    16f7c70 View commit details
    Browse the repository at this point in the history

  5. Made some request changes

    @almostTaklu
    almostTaklu committed Feb 25, 2024
    Copy the full SHA
    2f5504a View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' into relationType

    @almostTaklu
    almostTaklu committed Feb 25, 2024
    Copy the full SHA
    5f159e4 View commit details
    Browse the repository at this point in the history

  7. fixed requested changes

    @almostTaklu
    almostTaklu committed Feb 25, 2024
    Copy the full SHA
    1ad4a26 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #114 from mucsci-students/relationType 

    Relation type
    @pwfreedm
    pwfreedm committed Feb 25, 2024
    Copy the full SHA
    e72d64d View commit details
    Browse the repository at this point in the history

  9. Bugfixes 

    - Removed redundant custom exceptions
- Hitting enter with no more input no longer generates a blank line in the CLI
    @pwfreedm
    pwfreedm committed Feb 25, 2024
    Copy the full SHA
    1610d42 View commit details
    Browse the repository at this point in the history

  10. removed two parens

    @pwfreedm
    pwfreedm committed Feb 25, 2024
    Copy the full SHA
    2964dd3 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'develop' into tests

    @pwfreedm
    pwfreedm committed Feb 25, 2024
    Copy the full SHA
    401cc47 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #119 from mucsci-students/tests 

    Help Menu Test
    @AdamG-L
    AdamG-L committed Feb 25, 2024
    Copy the full SHA
    559aa06 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'develop' into bugfixes

    @AdamG-L
    AdamG-L committed Feb 25, 2024
    Copy the full SHA
    e608fdf View commit details
    Browse the repository at this point in the history

  14. Merge pull request #118 from mucsci-students/bugfixes 

    Bugfixes
    @AdamG-L
    AdamG-L committed Feb 25, 2024
    Copy the full SHA
    e30004b View commit details
    Browse the repository at this point in the history

  15. Generalized click method

    @AdamG-L
    AdamG-L committed Feb 25, 2024
    Copy the full SHA
    22a249b View commit details
    Browse the repository at this point in the history

  16. Method Functionality (TODO Commented out)

    @AdamG-L
    AdamG-L committed Feb 25, 2024
    Copy the full SHA
    f71bcf5 View commit details
    Browse the repository at this point in the history

  17. Commented relation impl.

    @AdamG-L
    AdamG-L committed Feb 25, 2024
    Copy the full SHA
    7178652 View commit details
    Browse the repository at this point in the history

  18. Redirect save/load folder to the root directory of the project

    @DierF
    DierF committed Feb 25, 2024
    Copy the full SHA
    e9e67ea View commit details
    Browse the repository at this point in the history

  19. Not sure why the lib64 folder is never ignored by git, ignore .venv 

    folder instead to ignore everything in .venv directory
    @DierF
    DierF committed Feb 25, 2024
    Copy the full SHA
    ec00a04 View commit details
    Browse the repository at this point in the history

  20. Help Menu Updates

    @timbmoser
    timbmoser committed Feb 25, 2024
    Copy the full SHA
    a446021 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #120 from mucsci-students/Updating_Help 

    Help Menu Updates
    @AdamG-L
    AdamG-L committed Feb 25, 2024
    Copy the full SHA
    ba487ce View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. Refactor serialize function

    @DierF
    DierF committed Feb 26, 2024
    Copy the full SHA
    60b8174 View commit details
    Browse the repository at this point in the history

  2. Refactor deserializer

    @DierF
    DierF committed Feb 26, 2024
    Copy the full SHA
    943c8e5 View commit details
    Browse the repository at this point in the history

  3. Remove debug code

    @DierF
    DierF committed Feb 26, 2024
    Copy the full SHA
    19e1136 View commit details
    Browse the repository at this point in the history

  4. Add _example.json as a save file example

    @DierF
    DierF committed Feb 26, 2024
    Copy the full SHA
    fb25e94 View commit details
    Browse the repository at this point in the history

  5. Fix bugs of deserializer loading source/destination as str instead of 

    Entity
    @DierF
    DierF committed Feb 26, 2024
    Copy the full SHA
    6ff8838 View commit details
    Browse the repository at this point in the history

  6. Build Script 

    - Updated requirements in setup.py
- Created build script
- removed a blank line in main.py that didn't need to be there
    @pwfreedm
    pwfreedm committed Feb 26, 2024
    Copy the full SHA
    67f8066 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' into build_sys

    @pwfreedm
    pwfreedm committed Feb 26, 2024
    Copy the full SHA
    35f6b7d View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop' into save/load

    @pwfreedm
    pwfreedm committed Feb 26, 2024
    Copy the full SHA
    94acd21 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #121 from mucsci-students/save/load 

    Save/load
    @pwfreedm
    pwfreedm committed Feb 26, 2024
    Copy the full SHA
    06ed73e View commit details
    Browse the repository at this point in the history

  10. Merge pull request #122 from mucsci-students/build_sys 

    Build Script
    @almostTaklu
    almostTaklu committed Feb 26, 2024
    Copy the full SHA
    8609777 View commit details
    Browse the repository at this point in the history

  11. obligatory DO NOT COMMIT 

    no seriously, something in the parser/lexer is busted rn lol.
    @pwfreedm
    pwfreedm committed Feb 26, 2024
    Copy the full SHA
    e361f37 View commit details
    Browse the repository at this point in the history

  12. Adding edit functionality to individual text rows

    @AdamG-L
    AdamG-L committed Feb 26, 2024
    Copy the full SHA
    58c639b View commit details
    Browse the repository at this point in the history

  13. Enabling itterative menu management

    @AdamG-L
    AdamG-L committed Feb 26, 2024
    Copy the full SHA
    750cf3c View commit details
    Browse the repository at this point in the history

  14. STILL NOT WORKING 

    working through an ocean of bugs, lmao
its ok tho, it'll be really nice once it's done. Less repetition, fewer points of failure.
    @pwfreedm
    pwfreedm committed Feb 26, 2024
    Copy the full SHA
    8051645 View commit details
    Browse the repository at this point in the history

  15. Added edit detection of selected object

    @AdamG-L
    AdamG-L committed Feb 26, 2024
    Copy the full SHA
    cd8282c View commit details
    Browse the repository at this point in the history

  16. List updates 

    - all tests passing
- removed duplicate data storage from entities
- refactored some code for readability
- refactored some code to remove unnecessary checks
    @pwfreedm
    pwfreedm committed Feb 26, 2024
    Copy the full SHA
    c3c70cd View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. Updated pytest for relationship

    @almostTaklu
    almostTaklu committed Feb 27, 2024
    Copy the full SHA
    9804c5d View commit details
    Browse the repository at this point in the history

  2. Delete src/test/test_relation.py 

    Removed this from pr because there is another about it.
    @pwfreedm
    pwfreedm committed Feb 27, 2024
    Copy the full SHA
    e3ca371 View commit details
    Browse the repository at this point in the history

  3. Partial work towards Param hookup, and fixing parsing issues.

    @timbmoser
    timbmoser committed Feb 27, 2024
    Copy the full SHA
    a616412 View commit details
    Browse the repository at this point in the history

  4. Fully functioning Add Field and Edit Field

    @AdamG-L
    AdamG-L committed Feb 27, 2024
    Copy the full SHA
    03a07a4 View commit details
    Browse the repository at this point in the history

  5. Added delete functionality

    @AdamG-L
    AdamG-L committed Feb 27, 2024
    Copy the full SHA
    8c49c25 View commit details
    Browse the repository at this point in the history

  6. Commented out main

    @AdamG-L
    AdamG-L committed Feb 27, 2024
    Copy the full SHA
    04e1aee View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' into gui

    @AdamG-L
    AdamG-L committed Feb 27, 2024
    Copy the full SHA
    3fe799d View commit details
    Browse the repository at this point in the history

  8. Removed Duplicate Method

    @pwfreedm
    pwfreedm committed Feb 27, 2024
    Copy the full SHA
    51a0b83 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #123 from mucsci-students/refactoring_again 

    Refactoring again
    @timbmoser
    timbmoser committed Feb 27, 2024
    Copy the full SHA
    a0502d2 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'develop' into relationPytest

    @pwfreedm
    pwfreedm committed Feb 27, 2024
    Copy the full SHA
    6c8c65e View commit details
    Browse the repository at this point in the history

  11. Updated contains tests 

    between the creation of this file and now, there was a PR that changed contains to take a string instead of an entity. Tests were updated to reflect that change.
    @pwfreedm
    pwfreedm committed Feb 27, 2024
    Copy the full SHA
    1997fba View commit details
    Browse the repository at this point in the history

  12. Merge pull request #124 from mucsci-students/relationPytest 

    Updated pytest for relationship
    @pwfreedm
    pwfreedm committed Feb 27, 2024
    Copy the full SHA
    761eda9 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'develop' into gui

    @pwfreedm
    pwfreedm committed Feb 27, 2024
    Copy the full SHA
    3ac3e23 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'develop' into Param_Hookup

    @pwfreedm
    pwfreedm committed Feb 27, 2024
    Copy the full SHA
    1c35532 View commit details
    Browse the repository at this point in the history

  15. NOT WORKING

    @pwfreedm
    pwfreedm committed Feb 27, 2024
    Copy the full SHA
    aa5ace4 View commit details
    Browse the repository at this point in the history

  16. Removed edit_field (and related files) / Extended functionality on re… 

    …name_field
    @AdamG-L
    AdamG-L committed Feb 27, 2024
    Copy the full SHA
    08997fc View commit details
    Browse the repository at this point in the history

  17. Merge branch 'gui' of https://github.com/mucsci-students/2024sp-420-C… 

    …World into gui
    @AdamG-L
    AdamG-L committed Feb 27, 2024
    Copy the full SHA
    ff5be56 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #125 from mucsci-students/gui 

    More GUI Implementation
    @pwfreedm
    pwfreedm committed Feb 27, 2024
    Copy the full SHA
    1322b36 View commit details
    Browse the repository at this point in the history

  19. Removing most debugging prints

    @AdamG-L
    AdamG-L committed Feb 27, 2024
    Copy the full SHA
    7070c6c View commit details
    Browse the repository at this point in the history

  20. Updated help menu to include Params and updated phrasings. 

    Updated what a valid name includes.

Updated valid entry in uml_parser doc string.
    @timbmoser
    timbmoser committed Feb 27, 2024
    Copy the full SHA
    1471076 View commit details
    Browse the repository at this point in the history

  21. Add relation functionality

    @AdamG-L
    AdamG-L committed Feb 27, 2024
    Copy the full SHA
    7f66b9b View commit details
    Browse the repository at this point in the history

  22. Fixed Issue with relation allowing more than one type at a time

    @AdamG-L
    AdamG-L committed Feb 27, 2024
    Copy the full SHA
    9d46b71 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. Working edit command for relations

    @AdamG-L
    AdamG-L committed Feb 28, 2024
    Copy the full SHA
    428abff View commit details
    Browse the repository at this point in the history

  2. Escape key now deletes active row

    @AdamG-L
    AdamG-L committed Feb 28, 2024
    Copy the full SHA
    d1078c4 View commit details
    Browse the repository at this point in the history

  3. Adding specialized deleting

    @AdamG-L
    AdamG-L committed Feb 28, 2024
    Copy the full SHA
    45f40b8 View commit details
    Browse the repository at this point in the history

  4. Working add and edit relation

    @AdamG-L
    AdamG-L committed Feb 28, 2024
    Copy the full SHA
    355eba3 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #126 from mucsci-students/param_help 

    Updated help menu to include Params and updated phrasings.
    @pwfreedm
    pwfreedm committed Feb 28, 2024
    Copy the full SHA
    c91b685 View commit details
    Browse the repository at this point in the history

  6. Escape functionality Debugged

    @AdamG-L
    AdamG-L committed Feb 28, 2024
    Copy the full SHA
    c68d0ff View commit details
    Browse the repository at this point in the history

  7. Commented out mainGUI()

    @AdamG-L
    AdamG-L committed Feb 28, 2024
    Copy the full SHA
    5c2c9a5 View commit details
    Browse the repository at this point in the history

  8. Added comments to methods

    @AdamG-L
    AdamG-L committed Feb 28, 2024
    Copy the full SHA
    c898fb1 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' into gui

    @AdamG-L
    AdamG-L committed Feb 28, 2024
    Copy the full SHA
    837e11a View commit details
    Browse the repository at this point in the history

  10. Merge pull request #127 from mucsci-students/gui 

    Functional Relations and Escape mechanism
    @almostTaklu
    almostTaklu committed Feb 28, 2024
    Copy the full SHA
    b1baa58 View commit details
    Browse the repository at this point in the history

  11. Restructured Escape functionality to either delete a new row or retur… 

    …n an existing row to original state
    @AdamG-L
    AdamG-L committed Feb 28, 2024
    Copy the full SHA
    5c95e67 View commit details
    Browse the repository at this point in the history

  12. Making add method menu

    @AdamG-L
    AdamG-L committed Feb 28, 2024
    Copy the full SHA
    c569b84 View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2024

  1. Working widow dimensions, class card spawning, and max size

    @AdamG-L
    AdamG-L committed Feb 29, 2024
    Copy the full SHA
    ffeac15 View commit details
    Browse the repository at this point in the history

  2. comment out main

    @AdamG-L
    AdamG-L committed Feb 29, 2024
    Copy the full SHA
    ab7d33f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into gui

    @AdamG-L
    AdamG-L committed Feb 29, 2024
    Copy the full SHA
    79deb4c View commit details
    Browse the repository at this point in the history

  4. NOT WORKING

    @pwfreedm
    pwfreedm committed Feb 29, 2024
    Copy the full SHA
    b689e15 View commit details
    Browse the repository at this point in the history

  5. WORKING 

    - two weird bugs with method list
- a definition of method __str__
- a neat extra slice in the parser
- removal of has_method
    @pwfreedm
    pwfreedm committed Feb 29, 2024
    Copy the full SHA
    da9d7dc View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' into Param_Hookup

    @pwfreedm
    pwfreedm committed Feb 29, 2024
    Copy the full SHA
    86e2ec9 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #128 from mucsci-students/gui 

    Fixed Escape and Added card spawning/screen size changes
    @pwfreedm
    pwfreedm committed Feb 29, 2024
    Copy the full SHA
    2b48a2a View commit details
    Browse the repository at this point in the history

  8. Bugfixes 

    - removed some print lines that were left over from debugging
- made sure that -c works with uneven list sizes
    @pwfreedm
    pwfreedm committed Feb 29, 2024
    Copy the full SHA
    e56e15f View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' into Param_Hookup

    @pwfreedm
    pwfreedm committed Feb 29, 2024
    Copy the full SHA
    2509a24 View commit details
    Browse the repository at this point in the history

  10. Update help param change to reflect the |

    @timbmoser
    timbmoser committed Feb 29, 2024
    Copy the full SHA
    fffcb12 View commit details
    Browse the repository at this point in the history

  11. Test Updates 

    - Added special cases to help menu test (to reflect differences in the program)
- Removed extra flags from lexer
- updated test_help to test_lexer
    @pwfreedm
    pwfreedm committed Feb 29, 2024
    Copy the full SHA
    5ef0bfd View commit details
    Browse the repository at this point in the history

  12. Merge pull request #129 from mucsci-students/Param_Hookup 

    Param hookup
    @AdamG-L
    AdamG-L committed Feb 29, 2024
    Copy the full SHA
    f0e7df1 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #130 from mucsci-students/param_help 

    Update help param change to reflect the |
    @AdamG-L
    AdamG-L committed Feb 29, 2024
    Copy the full SHA
    75c33ad View commit details
    Browse the repository at this point in the history

  14. Merge branch 'develop' into tests

    @pwfreedm
    pwfreedm committed Feb 29, 2024
    Copy the full SHA
    7ba4444 View commit details
    Browse the repository at this point in the history

  15. Oops 

    - Re-added edit relation to the lexer
- added edit relation to the help menu. It is a long command, but it is also a powerful one. It should be nice to have for 'experienced' CLI users.
    @pwfreedm
    pwfreedm committed Feb 29, 2024
    Copy the full SHA
    0d2528e View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. Reworked some of the tests in test_diagram to have them run with Pytest. 

    Certain functions are tested more fully in other files and were removed from here.
    @timbmoser
    timbmoser committed Mar 1, 2024
    Copy the full SHA
    37365ef View commit details
    Browse the repository at this point in the history

  2. Merge pull request #131 from mucsci-students/tests 

    Test Updates
    @AdamG-L
    AdamG-L committed Mar 1, 2024
    Copy the full SHA
    f61195f View commit details
    Browse the repository at this point in the history

  3. Added entity equals test, and added an extra assert to test_set_name … 

    …to confirm the state before set_name was called.
    @timbmoser
    timbmoser committed Mar 1, 2024
    Copy the full SHA
    029bef0 View commit details
    Browse the repository at this point in the history

  4. Reworked some of the tests in test_diagram to have them run with Pytest. 

    Certain functions are tested more fully in other files and were removed from here.
    @timbmoser
    timbmoser committed Mar 1, 2024
    Copy the full SHA
    c6c7591 View commit details
    Browse the repository at this point in the history

  5. Added entity equals test, and added an extra assert to test_set_name … 

    …to confirm the state before set_name was called.
    @timbmoser
    timbmoser committed Mar 1, 2024
    Copy the full SHA
    6ac80f3 View commit details
    Browse the repository at this point in the history

  6. Mostly reorganized so I could see if things were missing.

    @timbmoser
    timbmoser committed Mar 1, 2024
    Copy the full SHA
    dda2b61 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'Building_Tests' of https://github.com/mucsci-students/2… 

    …024sp-420-CWorld into Building_Tests
    @timbmoser
    timbmoser committed Mar 1, 2024
    Copy the full SHA
    a4bf2f7 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop' into Building_Tests

    @timbmoser
    timbmoser committed Mar 1, 2024
    Copy the full SHA
    e61fb12 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'Building_Tests' of https://github.com/mucsci-students/2… 

    …024sp-420-CWorld into Building_Tests
    @timbmoser
    timbmoser committed Mar 1, 2024
    Copy the full SHA
    1b636b6 View commit details
    Browse the repository at this point in the history

  10. Add equals for method test and param tests

    @timbmoser
    timbmoser committed Mar 1, 2024
    Copy the full SHA
    83196bb View commit details
    Browse the repository at this point in the history

  11. Fix self-relation error in Diagram class

    @almostTaklu
    almostTaklu committed Mar 1, 2024
    Copy the full SHA
    a4003b4 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'develop' into classGUI

    @almostTaklu
    almostTaklu committed Mar 1, 2024
    Copy the full SHA
    d820c10 View commit details
    Browse the repository at this point in the history

  13. Update help_command.py

    @almostTaklu
    almostTaklu committed Mar 1, 2024
    Copy the full SHA
    512ec30 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #134 from mucsci-students/classGUI 

    Fix self-relation error in Diagram class
    @timbmoser
    timbmoser committed Mar 1, 2024
    Copy the full SHA
    0433400 View commit details
    Browse the repository at this point in the history

  15. Main Chooses between GUI, debug, CLI correctly

    @pwfreedm
    pwfreedm committed Mar 1, 2024
    Copy the full SHA
    b055079 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #133 from mucsci-students/Building_Tests 

    Building tests
    @pwfreedm
    pwfreedm committed Mar 1, 2024
    Copy the full SHA
    f1eefe0 View commit details
    Browse the repository at this point in the history

  17. Fixed the y/N prompt in the build system

    @pwfreedm
    pwfreedm committed Mar 1, 2024
    Copy the full SHA
    82a2ff0 View commit details
    Browse the repository at this point in the history

  18. Build script no longer prompts y/N on rebuild

    @pwfreedm
    pwfreedm committed Mar 1, 2024
    Copy the full SHA
    c20d6cd View commit details
    Browse the repository at this point in the history

  19. Deleting legacy test infrastructure

    @pwfreedm
    pwfreedm committed Mar 1, 2024
    Copy the full SHA
    cea925e View commit details
    Browse the repository at this point in the history

  20. Merge branch 'develop' into build_sys

    @pwfreedm
    pwfreedm committed Mar 1, 2024
    Copy the full SHA
    7a07bb2 View commit details
    Browse the repository at this point in the history

  21. Partially Redone Readme

    @pwfreedm
    pwfreedm committed Mar 1, 2024
    Copy the full SHA
    258010b View commit details
    Browse the repository at this point in the history

  22. Readme updates

    @pwfreedm
    pwfreedm committed Mar 1, 2024
    Copy the full SHA
    744e851 View commit details
    Browse the repository at this point in the history

  23. final readme changes

    @pwfreedm
    pwfreedm committed Mar 1, 2024
    Copy the full SHA
    6f70bb3 View commit details
    Browse the repository at this point in the history

  24. probably final help menu updates

    @pwfreedm
    pwfreedm committed Mar 1, 2024
    Copy the full SHA
    b9392e3 View commit details
    Browse the repository at this point in the history

  25. Merge pull request #136 from mucsci-students/tests 

    Deleting legacy test infrastructure
    @timbmoser
    timbmoser committed Mar 1, 2024
    Copy the full SHA
    d50f6a9 View commit details
    Browse the repository at this point in the history

  26. Merge branch 'develop' into main_updates

    @timbmoser
    timbmoser committed Mar 1, 2024
    Copy the full SHA
    53345f0 View commit details
    Browse the repository at this point in the history

  27. Merge pull request #135 from mucsci-students/main_updates 

    Main Chooses between GUI, debug, CLI correctly
    @timbmoser
    timbmoser committed Mar 1, 2024
    Copy the full SHA
    ed445e1 View commit details
    Browse the repository at this point in the history

  28. stupid hyperlinks in lists

    @pwfreedm
    pwfreedm committed Mar 1, 2024
    Copy the full SHA
    619466f View commit details
    Browse the repository at this point in the history

  29. minor format improvements

    @pwfreedm
    pwfreedm committed Mar 1, 2024
    Copy the full SHA
    d2153a0 View commit details
    Browse the repository at this point in the history

  30. be on separate lines pls

    @pwfreedm
    pwfreedm committed Mar 1, 2024
    Copy the full SHA
    8acb41c View commit details
    Browse the repository at this point in the history

  31. hi

    @pwfreedm
    pwfreedm committed Mar 1, 2024
    Copy the full SHA
    84fbffb View commit details
    Browse the repository at this point in the history

  32. Merge branch 'develop' into readme

    @pwfreedm
    pwfreedm committed Mar 1, 2024
    Copy the full SHA
    ffa2d9b View commit details
    Browse the repository at this point in the history

  33. removed unnecessary asset

    @pwfreedm
    pwfreedm committed Mar 1, 2024
    Copy the full SHA
    c6131c6 View commit details
    Browse the repository at this point in the history

  34. added line about testing

    @pwfreedm
    pwfreedm committed Mar 1, 2024
    Copy the full SHA
    fa78ab1 View commit details
    Browse the repository at this point in the history

  35. Merge branch 'develop' into build_sys

    @timbmoser
    timbmoser committed Mar 1, 2024
    Copy the full SHA
    883b84a View commit details
    Browse the repository at this point in the history

  36. Merge pull request #137 from mucsci-students/build_sys 

    Build sys
    @timbmoser
    timbmoser committed Mar 1, 2024
    Copy the full SHA
    a6fe72f View commit details
    Browse the repository at this point in the history

  37. Merge pull request #138 from mucsci-students/readme 

    Readme
    @almostTaklu
    almostTaklu committed Mar 1, 2024
    Copy the full SHA
    ecaca01 View commit details
    Browse the repository at this point in the history

  38. Add delete functionality to GUI controller and view

    @almostTaklu
    almostTaklu committed Mar 1, 2024
    Copy the full SHA
    3d1bbf0 View commit details
    Browse the repository at this point in the history

  39. Merge pull request #139 from mucsci-students/deleteClass 

    Add delete functionality to GUI controller and view
    @AdamG-L
    AdamG-L committed Mar 1, 2024
    Copy the full SHA
    36a4b91 View commit details
    Browse the repository at this point in the history

  40. Added method and param functionality

    @AdamG-L
    AdamG-L committed Mar 1, 2024
    Copy the full SHA
    9dd37b6 View commit details
    Browse the repository at this point in the history

  41. Debugging method/params

    @AdamG-L
    AdamG-L committed Mar 1, 2024
    Copy the full SHA
    e2e6f72 View commit details
    Browse the repository at this point in the history

  42. Fix issues of add_method_and_params taking any # of params

    @DierF
    DierF committed Mar 1, 2024
    Copy the full SHA
    976ae0c View commit details
    Browse the repository at this point in the history

  43. Added delete method functionality

    @AdamG-L
    AdamG-L committed Mar 1, 2024
    Copy the full SHA
    f9a2d11 View commit details
    Browse the repository at this point in the history

  44. Working edit/add method

    @AdamG-L
    AdamG-L committed Mar 1, 2024
    Copy the full SHA
    44230b9 View commit details
    Browse the repository at this point in the history

  45. Fix save/load due to change of entities(dict to list)

    @DierF
    DierF committed Mar 1, 2024
    Copy the full SHA
    59452fd View commit details
    Browse the repository at this point in the history

  46. Fix save(not saving relations correctly) and add gui save support

    @DierF
    DierF committed Mar 1, 2024
    Copy the full SHA
    fcb60db View commit details
    Browse the repository at this point in the history

  47. Add gui load feature

    @DierF
    DierF committed Mar 1, 2024
    Copy the full SHA
    a85713f View commit details
    Browse the repository at this point in the history

  48. delete uneeded test files

    @DierF
    DierF committed Mar 1, 2024
    Copy the full SHA
    4c7cab3 View commit details
    Browse the repository at this point in the history

  49. Add gui exit feature

    @DierF
    DierF committed Mar 1, 2024
    Copy the full SHA
    f79ce35 View commit details
    Browse the repository at this point in the history

  50. Add gui display help information feature

    @DierF
    DierF committed Mar 1, 2024
    Copy the full SHA
    4d3c7c6 View commit details
    Browse the repository at this point in the history

  51. Merge pull request #140 from mucsci-students/gui_save/load/exit 

    Gui save/load/exit
    @AdamG-L
    AdamG-L committed Mar 1, 2024
    Copy the full SHA
    1e2b7a2 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2024

  1. Added rename functionality

    @AdamG-L
    AdamG-L committed Mar 2, 2024
    Copy the full SHA
    1f7564c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #141 from mucsci-students/gui 

    Added rename functionality
    @DierF
    DierF committed Mar 2, 2024
    Copy the full SHA
    6535396 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2024

  1. Adding Tests

    @timbmoser
    timbmoser committed Mar 3, 2024
    Copy the full SHA
    bebe68e View commit details
    Browse the repository at this point in the history

  2. Test_imports Model test updates

    @timbmoser
    timbmoser committed Mar 3, 2024
    Copy the full SHA
    da23ee7 View commit details
    Browse the repository at this point in the history

  3. Finished rounding out test_imports.

    @timbmoser
    timbmoser committed Mar 3, 2024
    Copy the full SHA
    bec0678 View commit details
    Browse the repository at this point in the history

  4. Updated Test_diagram

    @timbmoser
    timbmoser committed Mar 3, 2024
    Copy the full SHA
    90c57d2 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #142 from mucsci-students/Building_Tests 

    Building tests
    @DierF
    DierF committed Mar 3, 2024
    Copy the full SHA
    ff5be34 View commit details
    Browse the repository at this point in the history

  6. Simplify loading relation's source/destination

    @DierF
    DierF committed Mar 3, 2024
    Copy the full SHA
    3f2d451 View commit details
    Browse the repository at this point in the history

  7. Update __eq__ of Relation to check if types are equal

    @DierF
    DierF committed Mar 3, 2024
    Copy the full SHA
    581b9a3 View commit details
    Browse the repository at this point in the history

  8. Remove uneeded import

    @DierF
    DierF committed Mar 3, 2024
    Copy the full SHA
    06a465f View commit details
    Browse the repository at this point in the history

  9. Fix bugs of storing all parameters as one list instead of list of 

    parameters
    @DierF
    DierF committed Mar 3, 2024
    Copy the full SHA
    28ac0ae View commit details
    Browse the repository at this point in the history

  10. Add tests for serializer

    @DierF
    DierF committed Mar 3, 2024
    Copy the full SHA
    ea452d8 View commit details
    Browse the repository at this point in the history

  11. Add more tests for serializer

    @DierF
    DierF committed Mar 3, 2024
    Copy the full SHA
    b64a014 View commit details
    Browse the repository at this point in the history

  12. cleanup serialize function

    @DierF
    DierF committed Mar 3, 2024
    Copy the full SHA
    d7fcb1d View commit details
    Browse the repository at this point in the history

  13. Cleanup deserialize function(can't make it as clean as serialize 

    function due to str() type field/param)
    @DierF
    DierF committed Mar 3, 2024
    Copy the full SHA
    7e19c20 View commit details
    Browse the repository at this point in the history

  14. Fix Relations equivalence check in add_relation

    @DierF
    DierF committed Mar 3, 2024
    Copy the full SHA
    aad36be View commit details
    Browse the repository at this point in the history

  15. Merge pull request #143 from mucsci-students/save/load 

    Save/load
    @AdamG-L
    AdamG-L committed Mar 3, 2024
    Copy the full SHA
    94a05e9 View commit details
    Browse the repository at this point in the history

  16. Fix bugs of add_paramter change state of diagram even if failed

    @DierF
    DierF committed Mar 3, 2024
    Copy the full SHA
    d810e59 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'develop' into parameter

    @DierF
    DierF committed Mar 3, 2024
    Copy the full SHA
    08be775 View commit details
    Browse the repository at this point in the history

  18. Add duplicate checks for parameter operations

    @DierF
    DierF committed Mar 3, 2024
    Copy the full SHA
    f63d8d7 View commit details
    Browse the repository at this point in the history

  19. Merge pull request #144 from mucsci-students/parameter 

    Parameter
    @pwfreedm
    pwfreedm committed Mar 3, 2024
    Copy the full SHA
    b42c13a View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2024

  1. Cleanup main.py and update readme

    @DierF
    DierF committed Mar 4, 2024
    Copy the full SHA
    0f9ccc3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into cleanup

    @DierF
    DierF committed Mar 4, 2024
    Copy the full SHA
    22f740c View commit details
    Browse the repository at this point in the history

  3. Update operation option constrains

    @DierF
    DierF committed Mar 4, 2024
    Copy the full SHA
    c6177ba View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into cleanup

    @DierF
    DierF committed Mar 4, 2024
    Copy the full SHA
    539da3f View commit details
    Browse the repository at this point in the history

  5. Merge branch 'cleanup' of https://github.com/mucsci-students/2024sp-4… 

    …20-CWorld into cleanup
    @DierF
    DierF committed Mar 4, 2024
    Copy the full SHA
    3c2e8e3 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #145 from mucsci-students/cleanup 

    Cleanup main.py and update readme
    @pwfreedm
    pwfreedm committed Mar 4, 2024
    Copy the full SHA
    f9d43d0 View commit details
    Browse the repository at this point in the history