-
Notifications
You must be signed in to change notification settings - Fork 5
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
Add noorul room storage #64
Add noorul room storage #64
Conversation
* 'master' of https://github.com/AY2021S1-CS2103T-W12-1/tp: Update table of content for UG Update index.md Remove all traces of Addressbook Update AboutUs.md Update AboutUs.md Update _config.yml Add files via upload Update README.md Create README.md Update AboutUs.md Update AboutUs.md Update AboutUs Add picture Change file name Add image for AboutUs Update AboutUs.md
* 'master' of https://github.com/AY2021S1-CS2103T-W12-1/tp: (33 commits) Update UserGuide.md Update DeveloperGuide.md add docs for AboutUS Update UserGuide.md Update UserGuide.md Update DeveloperGuide.md Update NFR and Glossary Make changes to pass checkstyle. Make changes according to review given by peers Update AboutUs.md Update AboutUs.md Add profile photo Make changes to pass checkstyle and test cases Updated requirements section Update UserGuide.md Make changes to pass checkstyle and test cases Make changes to pass checkstyle Make changes to pass checkstyle Made changes according to comments given reviewers Made changes according to comments given reviewers ...
* 'master' of https://github.com/AY2021S1-CS2103T-W12-1/tp: Update JSON data to reflect valid and invalid Patient Package commands, parsers, and unit tests Transfer SearchPatient*.java to Patient package Replace all occurrences of Person with Patient update UG with searchpatient command
* 'master' of https://github.com/AY2021S1-CS2103T-W12-1/tp: (22 commits) Update RoomListPanel.fxml Fix checkstyle Add help command in UG Add UI tab for task Update help command Remove tag from codebase Add tests for new patient attributes in ParserUtilTest Remove email of person from the codebase Fix checkstyle error Fix bugs for UI Fix checkstyle Fix bugs from refactoring Adjust logo and remove white background Update RoomListPanel.java Update UI to display room details Allow UI to read and display rooms Fix UI for patientListPanelPlaceholder Fix styling issues Add RoomDetails to UI Change layout of javafx elements ...
Codecov Report
@@ Coverage Diff @@
## master #64 +/- ##
============================================
- Coverage 66.95% 66.12% -0.83%
- Complexity 480 482 +2
============================================
Files 84 86 +2
Lines 1646 1662 +16
Branches 194 193 -1
============================================
- Hits 1102 1099 -3
- Misses 488 505 +17
- Partials 56 58 +2
Continue to review full report at Codecov.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm, would really appreciate it if you can remove the convertPriorityQueue method for me
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for your hard work! This is a major change, since the entity (Room
) we are adding is so complex. I think there are some code quality nits we can discuss and address before we merge? Really good work though. You even went as far as to integrate Jackson for Room even though it's not needed for this part yet.
src/main/java/seedu/address/storage/JsonSerializableRoomList.java
Outdated
Show resolved
Hide resolved
src/test/java/seedu/address/storage/RoomOccupancyStorageTest.java
Outdated
Show resolved
Hide resolved
public static final int DEFAULT_ROOM_NUMBER = 10; | ||
public static final boolean DEFAULT_IS_OCCUPIED = true; | ||
public static final Patient DEFAULT_PATIENT = TypicalPatients.ALICE; | ||
public static final Task DEFAULT_TASK = null; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will add this when I pull your changes 👍
…into add-noorul-roomStorage * 'master' of https://github.com/AY2021S1-CS2103T-W12-1/tp: no message update Unit test: add success test for temperatureRange edit function name:searchPatientInvalidSearchCriteria update User Guide fix checkStyle fix search patient # Conflicts: # docs/UserGuide.md
into add-noorul-roomStorage * 'add-noorul-roomStorage' of https://github.com/itssodium/tp:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good job and effort! Just some nitty gritty details. :)
@@ -158,6 +159,7 @@ Action | Format, Examples | |||
--------|------------------ | |||
**Add Patient** | `addpatient n/NAME t/TEMPERATURE d/PERIOD_OF_STAY p/PHONE_NUMBER a/AGE [c/COMMENT]` <br> e.g.,`addpatient n/Betsy Crowe t/36.5 d/20201001-20201014 p/91234567 a/19 c/Is asthmatic` | |||
**Edit Patient** | `editpatient NAME [n/NAME] [t/TEMPERATURE] [d/PERIOD_OF_STAY] [p/PHONE_NUMBER] [a/AGE] [c/COMMENT]`<br> e.g.,`editpatient James Lee t/36.5` | |||
**Initialize Rooms** | `initRooms NUMBER_OF_ROOMS` <br> e.g., `addRooms 123` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be after search patient command but it's okay for now. We will do a massive UG clean up in future as a group :)
@@ -14,28 +13,39 @@ | |||
/** | |||
* Contains information regarding the Room information | |||
*/ | |||
public class RoomList { | |||
public class RoomList implements ReadOnlyRoomList { | |||
private static final Logger logger = LogsCenter.getLogger(JsonAddressBookStorage.class); | |||
|
|||
private int numOfRooms; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree with this too. There may be errors if we forget to update this variable when needed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
Please review my PR where I changed files from .txt to JSON and removed arrays and used ObservableList.