Skip to content
Snippets Groups Projects
Commit 02ae502a authored by Azita Katherine Balsara's avatar Azita Katherine Balsara
Browse files

Merge remote-tracking branch 'origin' into azitab_staff_page

parents 3e095a13 bf4df897
No related branches found
No related tags found
1 merge request!123Added Employee and Product for azitab
Pipeline #577034 passed with stage
in 2 seconds
......@@ -653,6 +653,16 @@ public class Products { /* a good class, but not as good as cse391 */
);
}
public Product ggsmadhuProduct() {
return new Product(
"Coca Cola",
"Best soft drink",
"coke.jpeg",
"Coca Cola can",
1.50
);
}
public Product chetan7() {
return new Product(
"Porche 911",
......@@ -673,6 +683,7 @@ public class Products { /* a good class, but not as good as cse391 */
"Picture of a lindt milk chocolate package",
2.00
);
}
public Product sprofit() {
......
......@@ -683,6 +683,15 @@ public class Staff {
);
}
public Employee ggsmadhu(){
return new Employee(
"Madhumitha",
"Student",
"Working",
"mountsi.jpeg",
"Mount Si"
);
}
public Employee chetan7() {
return new Employee(
"Chetan",
......
images/products/coke.jpeg

42.2 KiB

images/staff/mountsi.jpeg

492 KiB

images/staff/sunset.png

2.25 MiB | W: | H:

images/staff/sunset.png

2.25 MiB | W: | H:

images/staff/sunset.png
images/staff/sunset.png
images/staff/sunset.png
images/staff/sunset.png
  • 2-up
  • Swipe
  • Onion skin
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment