Add files via upload

Author: domhnallmorr

data_input_checks_tk.py

@@ -45,24 +45,33 @@ def check_combo_input(combo_data):
 		if user_input.strip() == '':
 			combo_good = False
 			combo_msg = 'Must be Entered'			
-	
-	elif 'int greater than' in combo_data[2]:
-		
-		if user_input.strip() == '':
+
+	elif 'int ' or 'float' in combo_data[2]:
+
+		try:
+			float(user_input)
+		except:
 			combo_good = False
-			combo_msg = 'Must be Entered'
-		
+			combo_msg = 'Must be numeric'
+
 		if combo_good:
-			if 'equal' in combo_data[2]: #handle equal greater than or equal to
+			if 'int greater than' in combo_data[2]:
 
-				if int(user_input) < int(combo_data[2].split()[-1]):
-					combo_good = False
-					combo_msg = f'Should be an Integer Greater than or Equal to {int(combo_data[2].split()[-1])}'
-			else:		
-				if int(user_input) <= int(combo_data[2].split()[-1]):
+				if user_input.strip() == '':
 					combo_good = False
-					combo_msg = f'Should be an Integer Greater than {int(combo_data[2].split()[-1])}'
-			
+					combo_msg = 'Must be Entered'
+				
+				if combo_good:
+					if 'equal' in combo_data[2]: #handle equal greater than or equal to
+						
+						if int(user_input) < int(combo_data[2].split()[-1]):
+							combo_good = False
+							combo_msg = f'Should be an Integer Greater than or Equal to {int(combo_data[2].split()[-1])}'
+					else:		
+						if int(user_input) <= int(combo_data[2].split()[-1]):
+							combo_good = False
+							combo_msg = f'Should be an Integer Greater than {int(combo_data[2].split()[-1])}'
+					
 	return combo_good, combo_msg
 def check_entry_input(entry_data):
 
@@ -86,13 +95,17 @@ def check_entry_input(entry_data):
 			entry_good = False
 
 	if 'int ' in entry_data[2]:
+
 		if user_input.strip() != '':
 			try:
 				user_input = int(user_input)
 			except:
 				entry_good = False
+				entry_msg = 'Enter a'
 		else:
 			entry_good = False
+			entry_msg = 'Must be Numeric'
+			
 
 	# If data good to this point, check if it is the right range
 	if entry_good:

eel_comparison_frontend_tk.py

@@ -355,7 +355,8 @@ def gen_final_layout(self):
 				for part in self.w.bom:
 					w.bom[part] = self.w.bom[part]
 
-		self.update_component(w, 'edit')
+		if not canceled:
+			self.update_component(w, 'edit')
 
 	def update_treeviews(self):
 

eel_frontend_tk.py

@@ -365,13 +365,13 @@ def setup_widgets(self):
 		row = 2
 		gui_styles_tk.create_multiple_labels(self.details_frame, labels, row, 2, 20, 2, 2)	
 
-		self.title_entry=Entry(self.details_frame, width=20)		
+		self.title_entry=Entry(self.details_frame, width=60)		
 		self.title_entry.grid(row=2,column=3,padx=2, pady=2,sticky = 'NSEW')
 		self.data_checks['Title'] = ['title', self.title_entry, self.orig_title]
 		if self.mode == 'edit':
 			self.title_entry.insert(0, self.parent_page.backend.title)
 
-		self.description_entry=Entry(self.details_frame, width=20)		
+		self.description_entry=Entry(self.details_frame, width=60)		
 		self.description_entry.grid(row=3,column=3,padx=2, pady=2,sticky = 'NSEW')
 
 		if self.mode == 'edit':

emergency_equip_frontend_tk.py

@@ -448,12 +448,16 @@ def cleanup(self,button):
 
 			if data_good:
 
-				self.attach_type = self.type_combo.get()
-				self.attach_part_no = self.pn_entry.get()
-				self.attach_qty = self.qty_entry.get()
-
-				self.attaching_hardware.append([len(self.attaching_hardware)+1, self.attach_type, self.attach_part_no, self.attach_qty])
-				self.top.destroy()
+				#check part number is entered
+				if self.pn_entry.get() == '':
+					tkinter.messagebox.showerror(master=self.top, title='Error', message='Part Number Must be Entered')
+				else:
+					self.attach_type = self.type_combo.get()
+					self.attach_part_no = self.pn_entry.get()
+					self.attach_qty = self.qty_entry.get()
+
+					self.attaching_hardware.append([len(self.attaching_hardware)+1, self.attach_type, self.attach_part_no, self.attach_qty])
+					self.top.destroy()
 
 			else:
 				tkinter.messagebox.showerror(master=self.top, title='Error', message=msg)

file_menu.py

@@ -29,7 +29,7 @@ def save(event=None, mainapp=None):
 
 def save_as(mainapp):
 
-	mainapp.save_file = r'C:\Users\domhn\Documents\Python\Pycabin_Tkinter\V0.18\test.json'
+	mainapp.save_file = r'C:\Users\domhn\Documents\Python\Pycabin_Tkinter\V0.20\test.json'
 	#mainapp.save_file = r'C:\Users\domhnall.morrisey.WOODGROUP\Downloads\PYCabin_Tk-master\PYCabin_Tk-master\test.json'
 	write_save_file(mainapp)
 
@@ -105,7 +105,7 @@ def write_save_file(mainapp):
 
 def load(event=None, mainapp=None):
 
-	with open(r'C:\Users\domhn\Documents\Python\Pycabin_Tkinter\V0.18\test.json') as f:
+	with open(r'C:\Users\domhn\Documents\Python\Pycabin_Tkinter\V0.20\test.json') as f:
 	#with open(r'C:\Users\domhnall.morrisey.WOODGROUP\Downloads\PYCabin_Tk-master\PYCabin_Tk-master\test.json') as f:
 		data = json.load(f)