Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
517 commits
Select commit Hold shift + click to select a range
57ee8fc
Merge pull request #127 from karishma-t/karishma-VendorSupply
TeoHaoZhi Oct 31, 2023
daf87ec
added parser diagram
Barbaracwx Oct 31, 2023
72f9902
Merge pull request #128 from Barbaracwx/DG-parser
TeoHaoZhi Oct 31, 2023
d84e998
update UG
Barbaracwx Nov 1, 2023
5a4a03d
update UG
Barbaracwx Nov 1, 2023
407d2dd
Merge pull request #129 from Barbaracwx/branch-updateUG
TeoHaoZhi Nov 1, 2023
806511b
Update UG
karishma-t Nov 1, 2023
dd17f9b
Merge pull request #130 from karishma-t/karishma-updateUG
TeoHaoZhi Nov 1, 2023
975a03f
Add Command Result in Developer Guide
azfarulmatin Nov 1, 2023
6c56dc7
Merge pull request #131 from azfarulmatin/AzfarulMatin-CalculatePrice
azfarulmatin Nov 1, 2023
f342fa4
Update Junit Test for find command using serial number
azfarulmatin Nov 1, 2023
2354792
Update ListCommand Junit Test
azfarulmatin Nov 1, 2023
13d04c0
Merge pull request #132 from azfarulmatin/AzfarulMatin-CalculatePrice
azfarulmatin Nov 1, 2023
2b8fc42
Modify delete DG
karishma-t Nov 2, 2023
e1c9c8a
Add addVendorSupply dg
karishma-t Nov 2, 2023
f73462e
Merge pull request #133 from karishma-t/karishma-Developer-Guide
azfarulmatin Nov 2, 2023
425255d
Remove all throwing methods in the main class
martinschnder Nov 2, 2023
4867382
Try to resolve various warning
martinschnder Nov 2, 2023
5590992
Resolve warning and make vendors non static
martinschnder Nov 2, 2023
992f613
Add negative number verifications
martinschnder Nov 2, 2023
5cb9b75
Fix Ped Bug
TeoHaoZhi Nov 4, 2023
ef45263
Fix Ped UserGuide bug
TeoHaoZhi Nov 4, 2023
a946e64
Merge pull request #208 from TeoHaoZhi/PED_Bug_Fixes_HaoZhi
TeoHaoZhi Nov 4, 2023
e7640fe
Fix login system PED Bugs
TeoHaoZhi Nov 4, 2023
741f27e
Merge pull request #209 from TeoHaoZhi/PED_Bug_Fixes_HaoZhi
TeoHaoZhi Nov 4, 2023
7e111f8
Fix grammer error
TeoHaoZhi Nov 4, 2023
037a76f
Update UserGuide FAQ
TeoHaoZhi Nov 4, 2023
509339a
Merge pull request #210 from TeoHaoZhi/PED_Bug_Fixes_HaoZhi
TeoHaoZhi Nov 4, 2023
07a5675
Update UserGuide to fix PED bug
TeoHaoZhi Nov 4, 2023
ad70664
Fix User Guide PED Bug
TeoHaoZhi Nov 4, 2023
83997d3
Merge pull request #211 from TeoHaoZhi/PED_Bug_Fixes_HaoZhi
TeoHaoZhi Nov 4, 2023
76a4f62
Fix UserGuide PED
TeoHaoZhi Nov 4, 2023
940f906
Merge pull request #212 from TeoHaoZhi/PED_Bug_Fixes_HaoZhi
TeoHaoZhi Nov 4, 2023
408b7dc
Add Table of contents to UserGuide to fix PED issue
TeoHaoZhi Nov 4, 2023
b676f6f
Merge pull request #213 from TeoHaoZhi/PED_Bug_Fixes_HaoZhi
TeoHaoZhi Nov 4, 2023
7928b0b
Fix Ped Bugs
TeoHaoZhi Nov 4, 2023
f907e0a
Fix Checkstyle
TeoHaoZhi Nov 4, 2023
c5fd226
Merge pull request #214 from TeoHaoZhi/PED_Bug_Fixes_HaoZhi
TeoHaoZhi Nov 4, 2023
99c5b41
Fix userguide PED Bug
TeoHaoZhi Nov 4, 2023
95adc7f
Merge pull request #215 from TeoHaoZhi/PED_Bug_Fixes_HaoZhi
TeoHaoZhi Nov 4, 2023
ad470e2
Fix PED save command bug
TeoHaoZhi Nov 4, 2023
8909924
Fix PED bug
TeoHaoZhi Nov 4, 2023
18ef899
Merge pull request #216 from TeoHaoZhi/PED_Bug_Fixes_HaoZhi
TeoHaoZhi Nov 4, 2023
9d70ab9
Edit ReadMe landing page
TeoHaoZhi Nov 5, 2023
099d1f3
Merge pull request #217 from TeoHaoZhi/PPP-HaoZhi
TeoHaoZhi Nov 5, 2023
9bee0f4
Update PPP
TeoHaoZhi Nov 5, 2023
ad34339
Merge pull request #218 from TeoHaoZhi/PPP-HaoZhi
TeoHaoZhi Nov 5, 2023
b04611c
Update PPP Links
TeoHaoZhi Nov 5, 2023
83bb1dc
Merge pull request #219 from TeoHaoZhi/PPP-HaoZhi
TeoHaoZhi Nov 5, 2023
fa1bb1b
Update PPP Links
TeoHaoZhi Nov 5, 2023
ba2a4ae
Merge pull request #220 from TeoHaoZhi/PPP-HaoZhi
TeoHaoZhi Nov 5, 2023
fec3be5
Edit userguide
TeoHaoZhi Nov 5, 2023
7027ee1
Update PPP
TeoHaoZhi Nov 5, 2023
1da900f
Update PPP
TeoHaoZhi Nov 5, 2023
7bc16f8
Merge pull request #221 from TeoHaoZhi/PPP-HaoZhi
TeoHaoZhi Nov 5, 2023
4be24b7
Update UML Diagram and PPP
TeoHaoZhi Nov 5, 2023
f749837
Edit UML Diagram
TeoHaoZhi Nov 5, 2023
91a611b
Update UML
TeoHaoZhi Nov 5, 2023
b7bbc03
Merge pull request #222 from TeoHaoZhi/PPP-HaoZhi
TeoHaoZhi Nov 5, 2023
3cd46d1
Update Developer Guide
TeoHaoZhi Nov 5, 2023
4d0ce89
Merge pull request #223 from TeoHaoZhi/DG_PED_FIXES
TeoHaoZhi Nov 5, 2023
76a40e6
Fix delete command
martinschnder Nov 5, 2023
fc0ab4d
Update delete command documentation
martinschnder Nov 5, 2023
c727286
Fix number exeception in addtocart command
martinschnder Nov 5, 2023
65a045f
Fix null exception checkout
martinschnder Nov 5, 2023
afddca6
Add name verification in add command and fixed type in userguide
martinschnder Nov 5, 2023
7221cd2
Add whitespace verification in addcommand
martinschnder Nov 5, 2023
4ae7439
Triming all fields in addcommand
martinschnder Nov 5, 2023
10dc763
Fix bug that allowed duplicate vendor entry
TeoHaoZhi Nov 6, 2023
3dcec03
Fix Checkstyle
TeoHaoZhi Nov 6, 2023
4b763e4
Merge pull request #224 from TeoHaoZhi/AddVendorDuplicateFix
TeoHaoZhi Nov 6, 2023
6cf6f3d
Fix bugs for invalid list command
azfarulmatin Nov 6, 2023
7f03201
Update ListCommand to pass checkstyle
azfarulmatin Nov 6, 2023
99b903c
Merge pull request #225 from azfarulmatin/master
azfarulmatin Nov 6, 2023
aafdc4f
Update UserGuide to add find by Serial Number
azfarulmatin Nov 6, 2023
2ee5479
Merge pull request #226 from azfarulmatin/AzfarulMatin-SerialNumber
azfarulmatin Nov 6, 2023
21977e0
Add Selling price function for user to key in
azfarulmatin Nov 6, 2023
e78af3c
Fix Checkstyle for price function
azfarulmatin Nov 6, 2023
352e499
Merge pull request #227 from azfarulmatin/AzfarulMatin-Price
azfarulmatin Nov 6, 2023
6950f4b
used serial number as key for cart and inventory
martinschnder Nov 7, 2023
36fca5b
resolved bug of too much quantity in cart before checkout
martinschnder Nov 7, 2023
e81ee7e
Fix save and load function
martinschnder Nov 7, 2023
4f9085f
Fix add duplicate drug
martinschnder Nov 7, 2023
d385f1b
Merge pull request #228 from martinschnder/changeStockStructure
martinschnder Nov 7, 2023
a9ad8ff
solve issue of help command
Barbaracwx Nov 7, 2023
4c14a54
Merge pull request #229 from Barbaracwx/branch-Issues
TeoHaoZhi Nov 7, 2023
c9e4a63
added alert when below threshold level
Barbaracwx Nov 7, 2023
50cbdc4
added alert
Barbaracwx Nov 7, 2023
05ada66
fix issue #200 inconsistent date formatting
Barbaracwx Nov 7, 2023
1107824
made sure that invalid command not caught fixed issue #189
Barbaracwx Nov 7, 2023
de617bf
fixed code
Barbaracwx Nov 7, 2023
b860128
fixed issue #184
Barbaracwx Nov 7, 2023
7d5667b
fixed issue #181
Barbaracwx Nov 7, 2023
10a6387
fixed issue #172
Barbaracwx Nov 7, 2023
bb5b73e
fixed issue #165
Barbaracwx Nov 7, 2023
290ae25
fixed code
Barbaracwx Nov 7, 2023
9edb1c7
fixed code
Barbaracwx Nov 7, 2023
6153a32
Merge pull request #230 from Barbaracwx/branch-AlertUser
TeoHaoZhi Nov 7, 2023
edf6972
Merge pull request #231 from Barbaracwx/branch-FixDG
TeoHaoZhi Nov 7, 2023
26a3209
Merge pull request #232 from Barbaracwx/branch-FixIssue
TeoHaoZhi Nov 7, 2023
c27ad59
updated about us
Barbaracwx Nov 8, 2023
1edfcd6
updated about us page
Barbaracwx Nov 8, 2023
e4a06f8
Merge pull request #234 from Barbaracwx/aboutus
TeoHaoZhi Nov 8, 2023
98fed83
change keyword to camelcase
Barbaracwx Nov 8, 2023
147dd7b
updated about us page
Barbaracwx Nov 8, 2023
84a83cc
edited help command such that if same name and same expiry date, will…
Barbaracwx Nov 8, 2023
6d8143b
Merge pull request #235 from Barbaracwx/aboutus
TeoHaoZhi Nov 8, 2023
b23a505
Add martin portfolio
martinschnder Nov 8, 2023
93c6e14
changed add command to return the appropriate message success
Barbaracwx Nov 8, 2023
f322664
Merge pull request #236 from Barbaracwx/master
TeoHaoZhi Nov 8, 2023
a28c5b4
Fixed issue #164 - program crashes when '\' is included in command input
Barbaracwx Nov 8, 2023
f3f9994
Merge pull request #237 from Barbaracwx/branch-Fix-Issue
TeoHaoZhi Nov 8, 2023
523a4d6
fixed issue #167 adding the same drug to a vendor twice causes it to …
Barbaracwx Nov 8, 2023
d9fd36b
fixed issue #174 - all functions are specified in user guide in comma…
Barbaracwx Nov 8, 2023
2044833
Merge pull request #238 from Barbaracwx/branch-Fix-Issue
TeoHaoZhi Nov 8, 2023
73a7fb9
Merge pull request #239 from Barbaracwx/branch-Fix-Issue
TeoHaoZhi Nov 8, 2023
35a22b0
fixed issue #203 - added rationale behind cart features
Barbaracwx Nov 8, 2023
42dce0d
Merge pull request #240 from Barbaracwx/branch-Fix-Issue
TeoHaoZhi Nov 8, 2023
a289595
added delete vendor method
Barbaracwx Nov 8, 2023
e80c6a7
edited user guide to add in delete vendor command
Barbaracwx Nov 8, 2023
02f84c7
Merge pull request #241 from Barbaracwx/DeleteVendor
azfarulmatin Nov 8, 2023
1fac1fa
edited ppp
Barbaracwx Nov 8, 2023
f1bfff6
Add Price Calculation function in Cart
azfarulmatin Nov 8, 2023
a78bb35
Fix Checkstyle error for viewCartCommand
azfarulmatin Nov 8, 2023
e89b134
Merge pull request #246 from azfarulmatin/AzfarulMatin-Price
azfarulmatin Nov 8, 2023
36a476f
Merge pull request #243 from Barbaracwx/PPP
azfarulmatin Nov 8, 2023
4287d71
Update UserGuide to add the Price function
azfarulmatin Nov 8, 2023
c4ef7b9
Fix bugs for adding same serial number but different drug name
azfarulmatin Nov 8, 2023
50c4e5b
Update CartEntry to return total cost
azfarulmatin Nov 8, 2023
d320478
Fix checkstyle error
azfarulmatin Nov 8, 2023
918cc0b
Fix gradle check
azfarulmatin Nov 8, 2023
db18bc0
Merge pull request #249 from azfarulmatin/master
azfarulmatin Nov 8, 2023
bd9fa50
Modify vendor supply list to consistent format
karishma-t Nov 8, 2023
77da550
checkstyle
karishma-t Nov 8, 2023
0119ed6
fix description
karishma-t Nov 8, 2023
367041a
modify description case sensitivity
karishma-t Nov 8, 2023
40df6df
added commands in help
karishma-t Nov 8, 2023
533738f
add delete vendor supply
karishma-t Nov 8, 2023
4794423
Modify vendor command for consistency
karishma-t Nov 8, 2023
3b16289
Changed file name to enable PPP to be tracked
TeoHaoZhi Nov 9, 2023
4ca2c2e
Merge pull request #251 from karishma-t/karishma-fixIssue
TeoHaoZhi Nov 9, 2023
e247f23
Merge pull request #252 from TeoHaoZhi/PPPDRAFT
TeoHaoZhi Nov 9, 2023
d302ec4
added expiry date function to list
Barbaracwx Nov 9, 2023
556b0c6
Merge pull request #253 from Barbaracwx/tryexpireddate
TeoHaoZhi Nov 9, 2023
2401a85
Change name to fit command better
TeoHaoZhi Nov 9, 2023
cfc5aa9
Fix bug
TeoHaoZhi Nov 9, 2023
d814853
Merge pull request #255 from TeoHaoZhi/SAVECOMMAND
TeoHaoZhi Nov 9, 2023
61b4ba4
changed add command user guide
Barbaracwx Nov 9, 2023
5ad1763
Merge pull request #256 from Barbaracwx/master
TeoHaoZhi Nov 9, 2023
8ab2f6c
changed help command to add add
Barbaracwx Nov 9, 2023
a2b3bcb
changed help command
Barbaracwx Nov 9, 2023
2d28de7
Merge pull request #257 from Barbaracwx/master
TeoHaoZhi Nov 9, 2023
923b280
changed help command
Barbaracwx Nov 9, 2023
80e01d9
Merge pull request #258 from Barbaracwx/master
azfarulmatin Nov 9, 2023
7099410
Add total price when checking out
azfarulmatin Nov 9, 2023
5b9b1c7
Fix bug of corrupted files
TeoHaoZhi Nov 9, 2023
710a845
Merge pull request #259 from TeoHaoZhi/SaveBugFix
TeoHaoZhi Nov 9, 2023
418f886
Fix drug corrupted txt file bug
TeoHaoZhi Nov 9, 2023
3926113
Fix Checkstyle
TeoHaoZhi Nov 9, 2023
c291244
Merge pull request #260 from TeoHaoZhi/FixDrugCorruptedFileBug
TeoHaoZhi Nov 9, 2023
2bedda0
Add ppp
karishma-t Nov 10, 2023
554af59
ppp
karishma-t Nov 10, 2023
12a0a70
Merge pull request #262 from karishma-t/karishma-updateUG
azfarulmatin Nov 10, 2023
275958c
Update Azfarul Matin PPP
azfarulmatin Nov 10, 2023
c6c4423
Merge pull request #263 from azfarulmatin/AzfarulMatin-Price
azfarulmatin Nov 10, 2023
8b0ced8
Modify descriptions for less ambiguity
karishma-t Nov 10, 2023
6115d90
Modify user story
karishma-t Nov 10, 2023
e5a3d0d
Merge pull request #264 from karishma-t/karishma-updateUG
TeoHaoZhi Nov 11, 2023
01e137e
Update UG
TeoHaoZhi Nov 11, 2023
7daca78
Merge pull request #267 from TeoHaoZhi/UGFixing
TeoHaoZhi Nov 11, 2023
9380de9
add such that if past expiry date, unable to add to cart
Barbaracwx Nov 11, 2023
6cb8f80
changed user guide
Barbaracwx Nov 11, 2023
ed3413e
edited help command
Barbaracwx Nov 11, 2023
c71b001
Merge pull request #268 from Barbaracwx/branch-expiredDate
TeoHaoZhi Nov 11, 2023
f4ab005
updated docs
Barbaracwx Nov 11, 2023
780d81e
Add author tag for help command
TeoHaoZhi Nov 11, 2023
846b629
Merge pull request #269 from TeoHaoZhi/AuthorTag
TeoHaoZhi Nov 11, 2023
597a2fa
Merge pull request #270 from Barbaracwx/branch-expiredDate
TeoHaoZhi Nov 11, 2023
370bc4e
updated PPP
Barbaracwx Nov 11, 2023
248a3fa
Merge pull request #272 from Barbaracwx/newPPP
TeoHaoZhi Nov 11, 2023
425e7ba
added serial number to stock level list
Barbaracwx Nov 11, 2023
4110a00
edited parser to make serial number only input ABC123 format
Barbaracwx Nov 11, 2023
c1e5f81
Add list to see sold items
azfarulmatin Nov 11, 2023
9c63a7b
Merge pull request #274 from azfarulmatin/AzfarulMatin-Price
azfarulmatin Nov 11, 2023
1846960
Update save sales and list sales
azfarulmatin Nov 11, 2023
59bf965
Merge branch 'AzfarulMatin-Price'
azfarulmatin Nov 11, 2023
3fa94d9
Update checkoutcommand
azfarulmatin Nov 11, 2023
e9a9d42
Update DG
TeoHaoZhi Nov 12, 2023
a353a0c
Merge pull request #273 from Barbaracwx/newPPP
TeoHaoZhi Nov 12, 2023
d216859
Merge pull request #275 from TeoHaoZhi/DGFIX
TeoHaoZhi Nov 12, 2023
cc036be
Merge conflicts for CheckOutCommand
azfarulmatin Nov 12, 2023
0276378
Merge branch 'AzfarulMatin-Price'
azfarulmatin Nov 12, 2023
7828cb6
Update listSales and saveSales in Developer Guide and User Guide
azfarulmatin Nov 12, 2023
0554b0d
Merge pull request #276 from azfarulmatin/master
azfarulmatin Nov 12, 2023
5da7de5
changed md name
Barbaracwx Nov 12, 2023
8eb316e
Merge pull request #277 from Barbaracwx/master
TeoHaoZhi Nov 12, 2023
4f199bb
Add UML diagrams for checkout, listSales, and saveSales
azfarulmatin Nov 12, 2023
51cf4b8
Merge pull request #278 from azfarulmatin/master
azfarulmatin Nov 12, 2023
c672739
Update Userguide
TeoHaoZhi Nov 12, 2023
bce5499
Merge pull request #279 from TeoHaoZhi/UGFIX2
TeoHaoZhi Nov 12, 2023
ad19109
Update UserGuide
TeoHaoZhi Nov 12, 2023
d252ca1
Merge pull request #280 from TeoHaoZhi/UGFIX2
TeoHaoZhi Nov 12, 2023
08ee2f1
Update user stories
karishma-t Nov 12, 2023
b06c75b
Update dg
karishma-t Nov 12, 2023
e7da9e0
Merge pull request #281 from karishma-t/karishma-Developer-Guide
TeoHaoZhi Nov 12, 2023
0ee9db2
Fix bugs for checkoutcommand to update the correct quantity in the dr…
azfarulmatin Nov 13, 2023
595fb42
Fix bugs for listSales
azfarulmatin Nov 13, 2023
5096597
Merge pull request #282 from azfarulmatin/master
azfarulmatin Nov 13, 2023
2a509f6
Update bugs for saveSalesCommand
azfarulmatin Nov 13, 2023
b19df7a
Merge pull request #283 from azfarulmatin/master
azfarulmatin Nov 13, 2023
e792b3b
Fix bugs for malicious changes in soldItems.txt
azfarulmatin Nov 13, 2023
e5b91e4
Merge pull request #284 from azfarulmatin/master
azfarulmatin Nov 13, 2023
2cddd0b
Add AddDescription diagram
karishma-t Nov 13, 2023
d1cad68
Delete soldItems.txt
TeoHaoZhi Nov 13, 2023
f5167f5
Merge pull request #285 from karishma-t/karishma-Developer-Guide
TeoHaoZhi Nov 13, 2023
5dc151f
Update git ignore
TeoHaoZhi Nov 13, 2023
c29d3f4
Remove redundant exception
TeoHaoZhi Nov 13, 2023
c4a97ec
Merge pull request #286 from TeoHaoZhi/master
TeoHaoZhi Nov 13, 2023
c935684
Add delete vendor supply UG
karishma-t Nov 13, 2023
523c3df
Update DG and removed some warnings
karishma-t Nov 13, 2023
392cbd4
Fix PPP
TeoHaoZhi Nov 13, 2023
43f8027
Merge pull request #288 from karishma-t/karishma-Developer-Guide
TeoHaoZhi Nov 13, 2023
661ffa6
updated PPP
Barbaracwx Nov 13, 2023
526fbcc
Merge pull request #289 from TeoHaoZhi/PPPUpdates
TeoHaoZhi Nov 13, 2023
7cb107f
Merge pull request #290 from Barbaracwx/changedstuff
TeoHaoZhi Nov 13, 2023
425b700
Update PPP
TeoHaoZhi Nov 13, 2023
f9b5fbc
Merge pull request #291 from TeoHaoZhi/PPPUpdates
TeoHaoZhi Nov 13, 2023
acd83aa
Update PPP
TeoHaoZhi Nov 13, 2023
27df923
Merge pull request #292 from TeoHaoZhi/PPPUpdates
TeoHaoZhi Nov 13, 2023
c80efd1
Update ppp
karishma-t Nov 13, 2023
83621e4
Merge pull request #293 from karishma-t/karishma-Developer-Guide
azfarulmatin Nov 13, 2023
88d04ba
Update PPP, UML diagrams, UG and DG
azfarulmatin Nov 13, 2023
aa88c22
Merge pull request #295 from azfarulmatin/master
azfarulmatin Nov 13, 2023
f88a613
Update PPP
azfarulmatin Nov 13, 2023
868fef8
Merge pull request #296 from azfarulmatin/master
azfarulmatin Nov 13, 2023
10440fe
Update User Guide
azfarulmatin Nov 13, 2023
cfb9e0c
Merge pull request #297 from azfarulmatin/master
azfarulmatin Nov 13, 2023
e5bdfe1
changed parser diagram
Barbaracwx Nov 14, 2023
feb2bf5
changed parser diagram
Barbaracwx Nov 14, 2023
1afa454
fix ppp link
karishma-t Nov 14, 2023
39e38e3
Merge pull request #298 from Barbaracwx/changedstuff
azfarulmatin Nov 14, 2023
6ca21e1
Merge pull request #299 from karishma-t/karishma-updateUG
azfarulmatin Nov 14, 2023
5be8b0e
spacing for ppp
karishma-t Nov 14, 2023
442d4db
modify spacing for ppp
karishma-t Nov 14, 2023
128a97e
parser diagram
Barbaracwx Nov 14, 2023
c3ba10d
edited ppp
Barbaracwx Nov 14, 2023
68fcf8b
Merge pull request #301 from karishma-t/karishma-updateUG
TeoHaoZhi Nov 14, 2023
86116f6
Merge pull request #300 from Barbaracwx/master
TeoHaoZhi Nov 14, 2023
ab087ee
Update PPP
azfarulmatin Nov 14, 2023
d804ad8
Merge pull request #302 from azfarulmatin/master
azfarulmatin Nov 14, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,3 @@ jobs:

- name: Build and check with Gradle
run: ./gradlew check

- name: Perform IO redirection test (*NIX)
if: runner.os == 'Linux'
working-directory: ${{ github.workspace }}/text-ui-test
run: ./runtest.sh

- name: Perform IO redirection test (MacOS)
if: always() && runner.os == 'macOS'
working-directory: ${{ github.workspace }}/text-ui-test
run: ./runtest.sh

- name: Perform IO redirection test (Windows)
if: always() && runner.os == 'Windows'
working-directory: ${{ github.workspace }}/text-ui-test
shell: cmd
run: runtest.bat
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ bin/

/text-ui-test/ACTUAL.TXT
text-ui-test/EXPECTED-UNIX.TXT
users.txt

drugs.txt
soldItems.txt
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ test {
}

application {
mainClass.set("seedu.duke.Duke")
mainClass.set("seedu.stocker.Stocker")
}

shadowJar {
archiveBaseName.set("duke")
archiveBaseName.set("stocker")
archiveClassifier.set("")
}

Expand All @@ -43,4 +43,5 @@ checkstyle {

run{
standardInput = System.in
enableAssertions = true
}
16 changes: 9 additions & 7 deletions docs/AboutUs.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# About us

Display | Name | Github Profile | Portfolio
--------|:----:|:--------------:|:---------:
![](https://via.placeholder.com/100.png?text=Photo) | John Doe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Don Joe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Ron John | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | John Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Don Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
| Display | Name | Github Profile | Portfolio |
|-----------------------------|:----------------:|:------------------------------------------:|:-------------------------------:|
| ![](team/Martin.jpeg) | Martin Schneider | [Github](https://github.com/martinschnder) | [Portfolio](team/Martin.md) |
| ![](team/Karishma.png) | Karishma | [Github](https://github.com/karishma-t) | [Portfolio](team/karishma-t.md) |
| ![](team/Barbara_image.JPG) | Barbara Chong | [Github](https://github.com/barbaracwx) | [Portfolio](team/barbaracwx.md) |
| ![](team/HaoZhi.png) | Teo Hao Zhi | [Github](https://github.com/TeoHaoZhi) | [Portfolio](team/teohaozhi.md) |
| ![](team/Azfarul.JPG) | Azfarul Matin | [Github](https://github.com/azfarulmatin) | [Portfolio](team/Azfarul.md) |


Loading