Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
163 commits
Select commit Hold shift + click to select a range
4be98fd
removed uneeded files
CTH-npitx Feb 18, 2025
b2f626b
transfered in Husams code
CTH-npitx Feb 18, 2025
0c30bec
rename events to match the fact they have been merged
CTH-npitx Feb 18, 2025
6d8de1f
group UI buttons, use regions.
CTH-npitx Feb 18, 2025
4edb7b8
try to remove form load
CTH-npitx Feb 18, 2025
cf3b26f
start edit function, it break, but temporary
CTH-npitx Feb 18, 2025
5567995
set up the function such that it is able to also convert, so only the…
CTH-npitx Feb 18, 2025
d993e49
change name
CTH-npitx Feb 18, 2025
c4eaf09
remove call
CTH-npitx Feb 18, 2025
2b4f0d7
merge in the no-form-load
CTH-npitx Feb 18, 2025
75982e8
Merge branch 'No-Form-Load' into HusamModified
CTH-npitx Feb 18, 2025
d9fc9c7
run to test
CTH-npitx Feb 18, 2025
ca51a66
renamed program for compat
CTH-npitx Feb 18, 2025
0959758
remove uneeded conversion
CTH-npitx Feb 18, 2025
5e17e3d
bind all buttons to 1 event
CTH-npitx Feb 18, 2025
3c4de9e
removed the non-used methods and renamed the single used on to match …
CTH-npitx Feb 18, 2025
be90a47
edit comment
CTH-npitx Feb 18, 2025
f295512
remove uneeded blank lines
CTH-npitx Feb 18, 2025
2a80f80
build and clean soloution
CTH-npitx Feb 18, 2025
2b7c3d3
removed uneeded, auto-generated text
CTH-npitx Feb 18, 2025
c09c381
prepared
CTH-npitx Feb 18, 2025
6ebef59
finalized build
CTH-npitx Feb 18, 2025
945390e
Merge pull request #75 from CTH-npitx-programs/HusamModified
CTH999 Feb 20, 2025
f6ac1dd
Merge pull request #78 from CTH-npitx-programs/CurrentReadmes
CTH999 Feb 20, 2025
0a435b2
correct typo
CTH999 Feb 20, 2025
462552b
add initial system
CTH999 Feb 20, 2025
cb6c247
work?
CTH999 Feb 20, 2025
5e4746d
new UI 1
CTH999 Feb 20, 2025
cf3b238
okay
CTH999 Feb 20, 2025
83b6089
build
CTH999 Feb 20, 2025
08f9ccd
build
CTH999 Feb 20, 2025
c32ab5f
Merge branch 'UI-Layout-1' into sandwhiches
CTH999 Feb 20, 2025
f5098d2
resize
CTH999 Feb 20, 2025
402f297
Create New Text Document.txt
CTH999 Feb 20, 2025
aca2503
Delete New Text Document.txt
CTH999 Feb 20, 2025
431601d
Merge branch 'UI-Layout-1' into sandwhiches
CTH999 Feb 20, 2025
3021753
Update slnx.sqlite
CTH999 Feb 20, 2025
db799e5
names
CTH999 Feb 20, 2025
e0292fe
price
CTH999 Feb 20, 2025
856b1fc
change text of buttons
CTH999 Feb 20, 2025
b6ff7e3
test
CTH999 Feb 20, 2025
910810e
Merge pull request #90 from CTH-npitx-programs/sandwhiches
CTH999 Feb 20, 2025
b220247
clean
CTH999 Feb 20, 2025
52dbf92
add apply coupon button
CTH999 Feb 20, 2025
d0ee174
duplicate button
CTH999 Feb 20, 2025
85356b1
removed outdated coupon buttons
CTH999 Feb 20, 2025
e110f68
Update BurgerBarn.Designer.cs
CTH999 Feb 20, 2025
888331b
event and vars
CTH999 Feb 20, 2025
ebc587c
coupon enable toggle
CTH999 Feb 20, 2025
353a04b
set up discount var
CTH999 Feb 20, 2025
2dd9b5e
discount setup
CTH999 Feb 20, 2025
40df183
discount
CTH999 Feb 20, 2025
bfbe90e
test
CTH999 Feb 20, 2025
9575626
reset discount
CTH999 Feb 20, 2025
957a53e
test
CTH999 Feb 20, 2025
2795e53
Merge pull request #91 from CTH-npitx-programs/20%-off
CTH999 Feb 20, 2025
5ad0bb9
even
CTH999 Feb 20, 2025
38e4ee9
clean soloution
CTH999 Feb 20, 2025
4906377
transfered in code from Hussam
CTH999 Feb 20, 2025
ca56111
Merge pull request #89 from CTH-npitx-programs/CurrentReadmes
CTH999 Feb 20, 2025
8155dfe
Merge pull request #94 from CTH-npitx-programs/CurrentReadmes
CTH999 Feb 20, 2025
1af9404
build
CTH999 Feb 21, 2025
6967d0c
clean soloution
CTH999 Feb 21, 2025
37d1325
.zip
CTH999 Feb 21, 2025
1f8ba72
Merge branch 'Husam-code1' into zip
CTH999 Feb 21, 2025
8a41226
not working?
CTH999 Feb 21, 2025
16862eb
test
CTH999 Feb 21, 2025
c3d1ce5
Merge branch 'last-functional-test_maybe' into Husam-code1
CTH999 Feb 21, 2025
4517ff8
run
CTH999 Feb 21, 2025
dfb468a
delete .vs
CTH999 Feb 21, 2025
36818b0
delete .vs
CTH999 Feb 21, 2025
96a9be6
Merge pull request #145 from CTH-npitx-programs/CurrentReadmes
CTH999 Feb 21, 2025
dcbca1a
Merge pull request #120 from CTH-npitx-programs/transfer-folder
CTH999 Feb 21, 2025
68defd8
Merge pull request #104 from CTH-npitx-programs/transfer-folder
CTH999 Feb 21, 2025
1e3023e
Merge pull request #102 from CTH-npitx-programs/transfer-folder
CTH999 Feb 21, 2025
0783dac
Merge pull request #100 from CTH-npitx-programs/transfer-folder
CTH999 Feb 21, 2025
c3e26dc
Merge branch 'transfer-folder' into zip
CTH999 Feb 21, 2025
18132a9
delete ignored
CTH999 Feb 21, 2025
cc5a586
delete properties
CTH999 Feb 21, 2025
7acfc6a
Create clear.txt
CTH999 Feb 21, 2025
576a492
Merge branch 'properties' into Refresh
CTH999 Feb 21, 2025
b18b05f
Revert "Merge branch 'properties' into Refresh"
CTH999 Feb 21, 2025
d177ed9
Delete clear.txt
CTH999 Feb 21, 2025
ecf6a7c
.gitignore's
CTH999 Feb 21, 2025
841d1ed
Create clear.txt
CTH999 Feb 21, 2025
25b020a
Merge branch 'remove-unescessary' into Husam-code2
CTH999 Feb 21, 2025
4666753
Delete clear.txt
CTH999 Feb 21, 2025
a733cd1
Merge branch 'Husam-code1' into zip
CTH999 Feb 21, 2025
3fbc935
delete ignored
CTH999 Feb 21, 2025
ee68f14
Create clear.txt
CTH999 Feb 21, 2025
efeef95
Merge branch 'delete-ignored' into add-discount
CTH999 Feb 21, 2025
29dfc4b
Delete clear.txt
CTH999 Feb 21, 2025
d82aa95
fix error
CTH999 Feb 21, 2025
b01a970
internal math
CTH999 Feb 21, 2025
7670350
simple refresh method
CTH999 Feb 21, 2025
174a69b
Update BurgerBarn.cs
CTH999 Feb 21, 2025
88ee955
Create Discount and such.txt
CTH999 Feb 21, 2025
a92b218
Merge pull request #150 from CTH-npitx-programs/coupon-math
CTH999 Feb 21, 2025
b1c343e
re-add discount code
CTH999 Feb 21, 2025
5bb8f24
re-arange lines
CTH999 Feb 21, 2025
58b1ff7
just in case
CTH999 Feb 21, 2025
f39e38d
Revert "Merge pull request #150 from CTH-npitx-programs/coupon-math"
CTH999 Feb 21, 2025
dae6cef
remove uneeded
CTH999 Feb 21, 2025
05b33c7
Create clear.txt
CTH999 Feb 21, 2025
8dfb04a
Merge branch 'refresh' into integrate-discount
CTH999 Feb 21, 2025
baff945
Delete clear.txt
CTH999 Feb 21, 2025
ea1fce6
Merge pull request #95 from CTH-npitx-programs/add-discount
CTH999 Feb 21, 2025
271e459
improve order
CTH999 Feb 21, 2025
fc34a63
spaceing
CTH999 Feb 21, 2025
b3e9f75
comment
CTH999 Feb 21, 2025
c967d6f
Update BurgerBarn.cs
CTH999 Feb 21, 2025
3ccffa9
Merge pull request #96 from CTH-npitx-programs/integrate-discount
CTH999 Feb 21, 2025
a7bb6d9
remove the buttons for the sides
CTH-npitx Feb 25, 2025
0512376
remove uneeded code
CTH-npitx Feb 25, 2025
bf8f03b
consolidated all code into 1 event
CTH-npitx Feb 25, 2025
7497271
make a file showing all the reqriments
CTH-npitx Feb 25, 2025
ac269dc
as the sides are now gone, removed that reqriment
CTH-npitx Feb 25, 2025
c7fb761
add coupon combo box
CTH-npitx Feb 25, 2025
eb9ff68
update reqriments, label combo box, remove group box
CTH-npitx Feb 25, 2025
fdd463a
set up coupon combo box
CTH-npitx Feb 25, 2025
2051ede
code for converting the combo box into a discount
CTH-npitx Feb 25, 2025
62884c9
fix discount to not be off by 99
CTH-npitx Feb 25, 2025
25c92f4
move calc total to be triggered outside the "else". That way removein…
CTH-npitx Feb 25, 2025
e55788d
features
CTH-npitx Feb 25, 2025
827b04c
ran to find issue, it appears to be just the whole "c2" thing
CTH-npitx Feb 25, 2025
4e925e1
finalize
CTH-npitx Feb 25, 2025
6c11694
made all buttons use "tab stop"
CTH-npitx Feb 27, 2025
7f50bec
tried to fix a strange error in which one of the buttons got checked
CTH-npitx Feb 27, 2025
8cee467
Revert "tried to fix a strange error in which one of the buttons got …
CTH-npitx Feb 27, 2025
4383b00
align centers for coupon
CTH-npitx Feb 27, 2025
20ee6c2
align chicken sandwhich
CTH-npitx Feb 27, 2025
cdd5adc
add the zip file
CTH-npitx Feb 27, 2025
c209794
Merge pull request #152 from NPITX-programs/Husam-code1
CTH-npitx Feb 27, 2025
ebea9cf
Merge branch 'Husam-code1' into zip
CTH-npitx Feb 27, 2025
caed8bf
Merge branch 'zip' into Husam-code2
CTH-npitx Feb 27, 2025
92f1f99
remove uneeded .zip
CTH-npitx Feb 27, 2025
263e2fb
refresh
CTH-npitx Feb 27, 2025
d5a7961
Revert "refresh"
CTH-npitx Feb 27, 2025
0a7fdcd
Merge pull request #155 from NPITX-programs/last-Work
CTH-npitx Feb 27, 2025
417e29e
remove code to refresh it later
CTH-npitx Feb 27, 2025
0577c51
Revert "refresh"
CTH-npitx Feb 27, 2025
38149b9
move buttons
CTH-npitx Feb 27, 2025
12704fe
Merge branch 'Husam-code2' into refresh
CTH-npitx Feb 27, 2025
ab7ad18
Merge pull request #156 from NPITX-programs/refresh
CTH-npitx Feb 27, 2025
e28b6af
merge in the husam-2 branch as a whole lot has been modified
CTH-npitx Feb 27, 2025
400586e
tried deleteing button to see if that worked
CTH-npitx Feb 27, 2025
d6fc028
Revert "tried deleteing button to see if that worked"
CTH-npitx Feb 27, 2025
0b4389f
rename event
CTH-npitx Feb 27, 2025
6972892
try deleteing and re-adding an exact copy of "none"
CTH-npitx Feb 27, 2025
d31828e
corrected name
CTH-npitx Feb 27, 2025
0de358d
notes on the inverter
CTH-npitx Feb 27, 2025
237248a
improve discount comments
CTH-npitx Feb 27, 2025
3ae8b4c
fix the issue. Somehow.
CTH-npitx Feb 27, 2025
7c34476
Merge pull request #151 from NPITX-programs/correct-pre-checked
CTH-npitx Feb 27, 2025
29108ce
align stuff
CTH-npitx Feb 27, 2025
2a50f6d
finish comments
CTH-npitx Feb 27, 2025
6e76314
Merge pull request #158 from NPITX-programs/comment
CTH-npitx Feb 27, 2025
f78cf19
improve spaceing; have coupon work with one less
CTH-npitx Feb 27, 2025
d1ea9d3
percentage calculation
CTH-npitx Feb 27, 2025
852b993
integrate negative coupons (user pays more)
CTH-npitx Mar 4, 2025
53ab04b
add .zip file
CTH-npitx Mar 4, 2025
33015aa
Merge pull request #154 from NPITX-programs/Husam-code2
CTH-npitx Mar 4, 2025
c488340
move into a centralizeing folder
CTH-npitx Mar 4, 2025
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
12 changes: 0 additions & 12 deletions .github/All Components.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
Add a new category "Sandwiches" with the following menu options:
Chicken Sandwich ($3.99)
Turkey Club ($5.49)
Italian Sub ($7.49)
BLT ($3.49)
Add a new button "Apply Coupon" that applies a 20% discount to the total
Coupon can only be applied once; disable the button after it is clicked
Once coupon is applied, total should always include the discount, even if the user adds more items after
Once the user clicks "Purchase," the coupon discount is removed and the button can be clicked again
Your comments should be thorough enough that another coder can understand your code's function by only reading the comments.


Change the "Apply Coupon" button to a "Combo Box."
The combo box should list several different percentages (example: 20%, 40%, 60%).
Selecting an option applies that discount to the Total.
Expand Down
1 change: 1 addition & 0 deletions .github/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Hmm, what if we make a ***List of all the Reqrirments!***
# Reqrirments/ modification
just the requriments of the program, or the edits to make to said program
## What modification

1. Minimize changes to only what is necessary to integrate your codeMake the following adjustments to your partner's program. You are allowed to modify your partner's code, but only enough to implement your own features.
2. Change the "Apply Coupon" button to a "Combo Box."
3. The combo box should list several different percentages (example: 20%, 40%, 60%).
Expand Down
Binary file removed .vs/BurgerBarn/v17/.suo
Binary file not shown.
Binary file removed .vs/BurgerBarn/v17/.wsuo
Binary file not shown.
51 changes: 0 additions & 51 deletions .vs/BurgerBarn/v17/DocumentLayout.json

This file was deleted.

3 changes: 0 additions & 3 deletions .vs/ProjectSettings.json

This file was deleted.

7 changes: 0 additions & 7 deletions .vs/VSWorkspaceState.json

This file was deleted.

Binary file removed .vs/slnx.sqlite
Binary file not shown.
Binary file added Based on Husam/Husam1/BurgerBarn-1.3.2-h.zip
Binary file not shown.
1 change: 1 addition & 0 deletions Based on Husam/Husam1/Link.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
https://github.com/NPITX-programs/BurgerBarn/releases/tag/v1.3.2-h
Binary file added Based on Husam/Husam2/BurgerBarn-2.2.1-h.zip
Binary file not shown.
Loading