Skip to content

Commit

Permalink
Add files via upload
Browse files Browse the repository at this point in the history
  • Loading branch information
victordomingos authored Feb 21, 2018
1 parent 95149ec commit ee03840
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
11 changes: 6 additions & 5 deletions ctt_tracking/callbacks_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ def add_remessa(self, event):
add_destin = self.oop.text_input_destin.get().strip()
add_cobr = self.oop.text_input_cobr.get().strip()
add_dias = self.oop.text_input_dias.get().strip()
add_vols = self.oop.text_input_vols.get().strip()
add_vols = str(self.oop.spin_vols.get())
add_rma = self.oop.text_input_rma.get().strip()
add_obs = self.oop.text_input_obs.get().strip()
add_expedidor = self.oop.combo_expedidor.get()
Expand Down Expand Up @@ -685,7 +685,7 @@ def add_remessa(self, event):
num = int(add_vols)
except ValueError:
self.oop.status_txt.set("O número de volumes deve ser um valor inteiro.")
self.oop.text_input_vols.focus_set()
self.oop.spin_vols.focus_set()
return

if (add_expedidor not in EXPEDIDORES):
Expand Down Expand Up @@ -718,7 +718,7 @@ def add_remessa(self, event):
num_dias = int(add_dias)
except ValueError:
self.oop.status_txt.set("""O prazo de pagamento deve ser introduzido como "PP" (pronto pagamento) ou indicando o número de dias.""")
self.oop.text_input_vols.focus_set()
self.oop.spin_vols.focus_set()
return
data_dep = calcular_data_deposito(agora, num_dias)
# reunir variáveis que faltam #TODO
Expand Down Expand Up @@ -747,7 +747,7 @@ def add_remessa(self, event):
))
except sqlite3.IntegrityError:
self.oop.status_txt.set("""O objeto com o nº indicado já existe na base de dados.""")
self.oop.text_input_vols.focus_set()
self.oop.spin_vols.focus_set()
return
conn.commit()
c.close()
Expand Down Expand Up @@ -1315,7 +1315,8 @@ def clear_text(self):
self.oop.text_input_destin.delete(0, END)
self.oop.text_input_cobr.delete(0, END)
self.oop.text_input_dias.delete(0, END)
self.oop.text_input_vols.delete(0, END)
self.oop.spin_vols.delete(0, END)
self.oop.spin_vols.insert(0, "1")
self.oop.text_input_rma.delete(0, END)
self.oop.text_input_obs.delete(0, END)
self.oop.combo_expedidor.current(INDEX_EXPEDIDOR_PREDEFINIDO)
Expand Down
12 changes: 6 additions & 6 deletions ctt_tracking/ctt_tracking.py
Original file line number Diff line number Diff line change
Expand Up @@ -227,10 +227,10 @@ def __init__(self, master):
self.dicas.bind(self.text_input_dias, 'Indique o número de dias para pagamento\n(p. ex.: "PP", "30", "15").')

ttk.Label(self.bottomframe, text="Vols.").grid(column=5, row=1, sticky=W+E)
self.text_input_vols = ttk.Entry(self.bottomframe, width=6)
self.text_input_vols.grid(column=5, row=2, sticky=W+E)
self.text_input_vols.bind("<Return>", self.callBacks.add_remessa)
self.dicas.bind(self.text_input_vols, 'Especifique o número de volumes\nque compõem esta remessa.')
self.spin_vols = Spinbox(self.bottomframe, from_=1, to=100, format='%.0f', width=6)
self.spin_vols.grid(column=5, row=2, sticky=W+E)
self.spin_vols.bind("<Return>", self.callBacks.add_remessa)
self.dicas.bind(self.spin_vols, 'Especifique o número de volumes\nque compõem esta remessa.')


ttk.Label(self.bottomframe, text="Expedidor").grid(column=0, row=3, sticky=W+E)
Expand All @@ -252,13 +252,13 @@ def __init__(self, master):
self.dicas.bind(self.text_input_rma, 'Caso este envio seja referente a um processo de garantia,\npode ser indicado aqui o nº de processo, NAR ou RMA do\nfornecedor ou centro técnico.')

self.btn_adicionar = ttk.Button(self.bottomframe, text="Adicionar", default="active", style="Active.TButton", command=lambda: self.callBacks.add_remessa)
self.btn_adicionar.grid(column=6, row=2, sticky=W+E)
self.btn_adicionar.grid(column=6, row=2, sticky=W+E, padx="15 0")
self.dicas.bind(self.btn_adicionar, 'Adicionar à base de dados a informação introduzida. (⏎)')
self.btn_adicionar.bind("<Return>", self.callBacks.add_remessa)
self.btn_adicionar.bind('<Button-1>', self.callBacks.add_remessa)

self.btn_cancelar = ttk.Button(self.bottomframe, text="Cancelar", command=self.callBacks.hide_entryform)
self.btn_cancelar.grid(column=6, row=4, sticky=W+E)
self.btn_cancelar.grid(column=6, row=4, sticky=W+E, padx="15 0")
self.dicas.bind(self.btn_cancelar, 'Fechar este painel, sem guardar,\ne regressar à tabela de remessas. (⎋)')

for col in range(6):
Expand Down

0 comments on commit ee03840

Please sign in to comment.