'parser' function now able to retrieve all desired columns

Author: Emil Kadermetov

parser.py

@@ -1,4 +1,6 @@
 from openpyxl import load_workbook
+from openpyxl.utils import get_column_letter, column_index_from_string
+
 
 
 def pull_up_files(file_list:list):
@@ -17,52 +19,51 @@ def find_main_data(book, sheet:str):
 		if cell.value == 'date':
 			data_beginning_row = cell.row + 1 
 			if isinstance(page[f'A{data_beginning_row}'].value, float):  # check of row follows next to data_beginng row 
-				# print('begin:', data_beginning_row)
+				## print('begin:', data_beginning_row)
 				continue
 			else:
 				raise ValueError("Error: 'date'-row is found but float-type date-cell don't follow further")
 		if data_beginning_row is not None and type(cell.value) == float:
 			data_range += 1
-			# print('value:', cell.value, cell.row, 'count:', data_range)
+			## print('value:', cell.value, cell.row, 'count:', data_range)
 		elif data_beginning_row is not None and data_range > 1:
-			# print('end of range sirching wiht result:', data_range)
+			## print('end of range sirching wiht result:', data_range)
 			break
 	if data_beginning_row is None:
 		print(f'no main data finded on "{sheet}"')
 		return
-	# print(book, 'len =', data_range, f'range = A{data_beginning_row}:A{data_beginning_row+data_range-1}', sep=',')
+	## print(book, 'len =', data_range, f'range = A{data_beginning_row}:A{data_beginning_row+data_range-1}', sep=',')
 	return data_beginning_row, data_beginning_row + data_range - 1
 
 
-def find_quantity_columns(book, sheet:str):
-		page = book.get_sheet_by_name(sheet) #tmp
-		mainData_range = find_main_data(book, sheet)  
+def find_quantity_columns(book, sheet:str, mainData_range):
+		page = book.get_sheet_by_name(sheet)  
 		data_beginning_row = str(mainData_range[0])
 		beginning = None
 		end = None
 		for cell in page[data_beginning_row]:
-			# print('---ITER---:', cell.value)
-			# print('BEGIN:', beginning)
-			# print('END:', end)
+			## print('---ITER---:', cell.value)
+			## print('BEGIN:', beginning)
+			## print('END:', end)
 			if not isinstance(cell.value, int):
-				# print(cell.value, 'is not int')
+				## print(cell.value, 'is not int')
 				if beginning is not None:
-					# print(f'for {cell.value} beginning {beginning} is not None')
+					## print(f'for {cell.value} beginning {beginning} is not None')
 					if not isinstance(cell.value, str):
-						# print(cell.value, 'is not float, beginning is set to None')
+						## print(cell.value, 'is not float, beginning is set to None')
 						beginning = None
 						continue	
 					elif ',' in cell.value:  #TODO: REG digit-digit-comma-digit-digit
-						# print(f'for {cell.value} else, {cell.row} is end')
-						end = cell.column
+						## print(f'for {cell.value} else, {cell.row} is end')
+						end = cell.column + 1  # +1 is for include 'code' column, that follows quite after amount ( ',' cell.value)
 						break
 				continue
 			elif beginning is None:
-				# print(f'elif: {cell.value} is beginning with N {cell.column}')
+				## print(f'elif: {cell.value} is beginning with N {cell.column}')
 				beginning = cell.column
-		if not end - beginning == 4:
+		if not end - beginning == 5:
 			raise ValueError("Error during defining range of columns containing quantity values")
-		return (beginning, end)
+		return tuple(get_column_letter(i) for i in range(beginning, end+1))
 
 
 def get_column(book, sheet:str, cells):
@@ -85,10 +86,31 @@ def is_varieties_or_costumers(data_list:list):
 	return True
 
 
-def pars(book):
+def correct_priece_format(price:str, book, sheet:str):
+	if not isinstance(price, int):
+		raise ValueError(f'ValueError: while convert to right format value {price}\
+							from column Prise in book {book}, page {sheet}')
+	price = str(price)
+	if len(price) == 3:
+		return f'0,{price}'
+	elif len(price) > 3:
+		return f'{price[:-3]},{price[-3:]}'
+	else:
+		raise ValueError(f'ValueError: while convert to right format value {price}\
+							from column Prise in book {book}, page {sheet}')
+
+
+
+def parse(book):
 	sheets = book.get_sheet_names()[1:]  #list of sheets without title-page
 	varieties = []
 	costumers = []
+	numbers = []
+	pieces = []
+	totals = []
+	prices = []
+	amounts = []
+	codes = []
 
 	for sh in sheets:
 		mainData_range = find_main_data(book, sh)
@@ -104,14 +126,40 @@ def pars(book):
 					raise ValueError(f"Error in column 'costumer' in {book} on page '{sheet}'")
 				costumers += costumer
 
-	return varieties, costumers
+				quantity_colums = find_quantity_columns(book, sh, mainData_range)
+
+				number = get_range_from_column(book, sh, mainData_range, quantity_colums[0])
+				numbers += number
+
+				piece = get_range_from_column(book, sh, mainData_range, quantity_colums[1])
+				pieces += piece
+
+				total = get_range_from_column(book, sh, mainData_range, quantity_colums[2])
+				totals += total
+
+				price = get_range_from_column(book, sh, mainData_range, quantity_colums[3])
+				price = [correct_priece_format(i, book, sh) for i in price]
+				prices += price
+
+				amount = get_range_from_column(book, sh, mainData_range, quantity_colums[4])
+				amounts += amount
+
+				code = get_range_from_column(book, sh, mainData_range, quantity_colums[5])
+				codes += code
+
+
+	return varieties, costumers, numbers, pieces, totals, prices, amounts, codes
 
 
 if __name__ == '__main__':
-	file = '/home/emil/Загрузки/out/pdfFile4.xlsx'
+	file = '/home/emil/Загрузки/out/pdfFile.xlsx'
 	wb = load_workbook(file)
-	sheet = 'Page 2'
+	sheet = wb.get_sheet_by_name('Page 3')
+
 
-	print(find_quantity_columns(wb, sheet))
+
+
+
+