s444412/DSZI_2020_Projekt
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.wmi.amu.edu.pl/s444412/DSZI_2020_Projekt

Browse Source
This commit is contained in:
Kinga 2020-05-18 14:17:44 +02:00
commit a331604b42
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/DSZI.iml
View File

@ -5,7 +5,7 @@
<excludeFolder url="file://$MODULE_DIR$/Restaurant/Marta/venv" /> <excludeFolder url="file://$MODULE_DIR$/Restaurant/Marta/venv" />
<excludeFolder url="file://$MODULE_DIR$/venv" /> <excludeFolder url="file://$MODULE_DIR$/venv" />
</content> </content>
<orderEntry type="jdk" jdkName="Python 3.7 (Restaurant)" jdkType="Python SDK" /> <orderEntry type="jdk" jdkName="Python 3.7" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
</component> </component>
<component name="TestRunnerService"> <component name="TestRunnerService">

2
.idea/misc.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (Restaurant)" project-jdk-type="Python SDK" /> <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7" project-jdk-type="Python SDK" />
</project> </project>

2
Restaurant/main.py
View File

@ -130,7 +130,7 @@ class Dish(object):
class Plate(object): class Plate(object):
def __init__(self, dish, img): def __init__(self, dish, img=None):
self.dishName = dish.dishName self.dishName = dish.dishName
self.isEmpty = False self.isEmpty = False
self.preparationTime = dish.preparationTime self.preparationTime = dish.preparationTime