Skip to content
Snippets Groups Projects
Commit 83147805 authored by Majid Rouhani's avatar Majid Rouhani
Browse files

updates

parent 60ccfe6a
No related branches found
No related tags found
No related merge requests found
Showing
with 166 additions and 25 deletions
......@@ -4,7 +4,7 @@
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/venv" />
</content>
<orderEntry type="jdk" jdkName="Python 3.7 (venv)" jdkType="Python SDK" />
<orderEntry type="jdk" jdkName="Python 3.7 (lbas2002)" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
......@@ -36,6 +36,24 @@
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
</list>
</option>
</inspection_tool>
......
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (venv)" project-jdk-type="Python SDK" />
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (lbas2002)" project-jdk-type="Python SDK" />
</project>
\ No newline at end of file
.project 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>lbas2002</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.python.pydev.PyDevBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.python.pydev.pythonNature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?><?eclipse-pydev version="1.0"?><pydev_project>
<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
<path>/${PROJECT_DIR_NAME}</path>
</pydev_pathproperty>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python interpreter</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
</pydev_project>
\ No newline at end of file
......@@ -3,14 +3,8 @@
tall1 = int(input("Opp tall 1: "))
tall2 = int(input("Opp tall 2: "))
try:
resultat = tall1/tall2
except ZeroDivisionError:
print("tall2 kan ikke være 0!")
finally:
print("Ferdig!")
fortsett=True
while fortsett:
tall1 = int(input("Opp tall 1: "))
tall2 = int(input("Opp tall 2: "))
try:
resultat = tall1/tall2
fortsett=False
except ZeroDivisionError:
print("tall2 kan ikke være 0!")
except TypeError:
print("feil data ...")
File added
......@@ -8,12 +8,12 @@ password = "mPZSMTaw" # Skriv inn passordet ditt her
conn= pymysql.connect(host, user, password, user)
cursor = conn.cursor()
sql = "SELECT 'Dette er en test!' FROM dual"
sql = "SELECT * FROM kategori"
cursor.execute(sql)
for row in cursor:
print(row[0])
print(row[0],row[1])
conn.close()
......@@ -27,14 +27,14 @@ class Butikk:
Returnerer en liste med epler der vekten er mindre eller like "vekt"
som oppfyller farge og om det er importert eller ikke.
"""
def kjop_vare(selv,vare_navn, farge,vekt,importert):
def kjop_vare(self,vare_navn, farge,vekt,importert):
kjopte_varer = []
vare_liste =[]
totalVekt =0
if vare_navn == "EPLE":
vare_liste = selv.varer
vare_liste = self.varer
for i in range(len(vare_liste)):
if (vare_liste[i].get_farge() == farge and
......
from lab05.oop.Butikk import Butikk
bunn_pris = Butikk("Bunnpris")
obs_lade = Butikk("OBS Lade")
#Bestill 500g grønn eple som ikke er importert.
minBestilling = bunn_pris.kjop_vare("EPLE","Gul",5000,"Nei")
minBestilling = bunn_pris.kjop_vare("EPLE","Grønn",300,"Nei")
for i in range(len(minBestilling)):
print(minBestilling[i].to_string())
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
......@@ -345,7 +345,7 @@ def save_cateogri_db(kategori_id, kategori):
#****************************************
# Logger resultatet til konsollet
print("save_cateogri_db: rowcount=" + str(cursor.rowcount))
#print("save_cateogri_db: rowcount=" + str(cursor.rowcount))
#Lagrer gjenstand i basen
def save_gjenstand_db(giver_val,
......@@ -378,6 +378,21 @@ def save_gjenstand_db(giver_val,
#****************************************
#Fullfør innholdet i denne funksjonen!
#****************************************
db = get_db_connection()
if not db:
sys.exit(0)
db.autocommit(True)
cursor = db.cursor()
if regnr_exist(regnr,'gjenstand'):
cursor.execute("UPDATE gjenstand SET giver=%s,inndato=%s,kategori_id=%s,kommentar=%s,mottattav=%s,navn=%s,plassering=%s,regav=%s,regdato=%s WHERE regnr=%s",
(giver_val,innlemmet_dato_val,kategori_id,kommentar_val,mottatt_av_val,navn_val,plassering_val,registrert_av_val,registrerings_dato_val,regnr))
else:
cursor.execute("INSERT INTO gjenstand (giver,inndato,kategori_id,kommentar,mottattav,navn,plassering,regav,regdato,regnr) VALUES(%s,%s,%s,%s,%s,%s,%s,%s,%s,%s)",
(giver_val,innlemmet_dato_val,kategori_id,kommentar_val,mottatt_av_val,navn_val,plassering_val,registrert_av_val,registrerings_dato_val,regnr))
db.close()
# Logger resultatet til konsollet
print("save_gjenstand_db: rowcount=" + str(cursor.rowcount))
......
......@@ -22,12 +22,14 @@ Endret dato, endret av, versjon
"""
def valider_dato(dato):
date_format = '%d-%m-%Y' # dd.mm.yyyy, 25/8/2019
date_format = '%d.%m.%Y' # dd.mm.yyyy, 25/8/2019
try:
date_obj = datetime.datetime.strptime(dato, date_format)
return dato
except ValueError:
messagebox.showerror("Error", "Dato skal være på formen: DD-MM-YYYY")
sys.exit(0)
messagebox.showerror("Error", "Dato skal være på formen: DD.MM.YYYY")
#sys.exit(0)
return False
# Åpner eget vindu for å editere person
......@@ -88,12 +90,18 @@ def open_edit(root, search, gjenstand_data=None):
"""
registreringsnr_val=registreringsnr.get()
giver_val = giver.get()
innlemmet_dato_val = innlemmet_dato.get()
innlemmet_dato_val = valider_dato(innlemmet_dato.get())
if innlemmet_dato_val == False:
return False
kommentar_val = ""
mottatt_av_val = mottatt_av.get()
plassering_val = plassering.get()
registrert_av_val = registrert_av.get()
registrerings_dato_val = valider_dato(registrerings_dato.get())
if registrerings_dato_val == False:
return False
navn_val=betegnelse.get()
save_gjenstand_db(giver_val,
......@@ -134,7 +142,7 @@ def open_edit(root, search, gjenstand_data=None):
messagebox.showerror("Error", "Registreringsnummer må oppgis")
exit(0)
save_gjenstand(kategori_id)
if save_gjenstand(kategori_id)!=False:
save_egenskaper()
save_proveniens()
messagebox.showinfo("Registrering", "Registrering av ny gjenstand er fullført!")
......
......@@ -21,4 +21,4 @@ def show_histogram(values, min, max, num_bins, ylabel, xlabel):
# Test-funksjoner
#show_bar_chart([2, 16, 3, 1, 4.5], ["a", "b", "c", "d", "e"], "Antall", "Kategori")
show_histogram([10,41,72,45,51,52,51,54,56,81,43,42], 0, 100, 10, "Antall", "Alder")
#show_histogram([10,41,72,45,51,52,51,54,56,81,43,42], 0, 100, 10, "Antall", "Alder")
File added
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="PyPep8Inspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
<option name="ignoredErrors">
<list>
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
<option value="W29" />
<option value="E501" />
</list>
</option>
</inspection_tool>
</profile>
</component>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment